Commit 873a7a5

committed

laravel-queue-replaceable For Laravel 5.7+

1 parent 1be0935 commit 873a7a5Copy full SHA for 873a7a5

File tree

+11

-10

lines changed

+11

-10

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,13 @@ class DatabaseQueue extends BaseDatabaseQueue`
`19`	`19`	`*/`
`20`	`20`	`public function bulk($jobs, $data = '', $queue = null)`
`21`	`21`	`{`
`22`		`- $payloads = collect((array)$jobs)->map(function($job) use($data)`
	`22`	`+ $queueName = $this->getQueue($queue);`
	`23`	`+ $payloads = collect((array)$jobs)->map(function($job) use($queueName,$data)`
`23`	`24`	`{`
`24`		`- return $this->createPayload($job,$data);`
	`25`	`+ return $this->createPayload($job,$queueName,$data);`
`25`	`26`	`})->all();`
`26`	`27`	`$this->database->table($this->table)`
`27`		`- ->where('queue',$this->getQueue($queue))`
	`28`	`+ ->where('queue',$queueName)`
`28`	`29`	`->whereIn('payload',$payloads)`
`29`	`30`	`->delete();`
`30`	`31`	`return parent::bulk($jobs,$data,$queue);`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,14 @@`
`5`	`5`	`trait QueueReplaceable`
`6`	`6`	`{`
`7`	`7`
`8`		`- protected function createPayload($job,$data = '',$queue = null)`
	`8`	`+ protected function createPayload($job,$queue,$data = '')`
`9`	`9`	`{`
`10`		`- return parent::createPayload($this->getReplaceableJob($job),$data,$queue);`
	`10`	`+ return parent::createPayload($this->getReplaceableJob($job),$queue,$data);`
`11`	`11`	`}`
`12`	`12`
`13`		`- protected function createPayloadArray($job,$data = '',$queue = null)`
	`13`	`+ protected function createPayloadArray($job,$queue,$data = '')`
`14`	`14`	`{`
`15`		`- return $this->createPayloadArrayReplaceable($job,$data,$queue);`
	`15`	`+ return $this->createPayloadArrayReplaceable($job,$queue,$data);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public function getJobReplaceableId($job,$data = '',$queue = null)`
`@@ -29,9 +29,9 @@ public function getJobReplaceableId($job,$data = '',$queue = null)`
`29`	`29`	`return $replaceableId;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function createPayloadArrayReplaceable($job,$data = '',$queue = null)`
	`32`	`+ public function createPayloadArrayReplaceable($job,$queue,$data = '')`
`33`	`33`	`{`
`34`		`- $payload = parent::createPayloadArray($job,$data,$queue);`
	`34`	`+ $payload = parent::createPayloadArray($job,$queue,$data);`
`35`	`35`	`if($replaceableId = $this->getJobReplaceableId($job,$data,$queue))`
`36`	`36`	`{`
`37`	`37`	`data_set($payload,'id',$replaceableId);`

Comments

(0)