diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 3ab00165cccc..42350000b97c 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -1,6 +1,21 @@
# Release Notes for 6.x
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.10...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.13...6.x)
+
+
+## [v6.20.13 (2021-01-19)](https://github.com/laravel/framework/compare/v6.20.12...v6.20.13)
+
+### Fixed
+- Fixed empty html mail ([#35941](https://github.com/laravel/framework/pull/35941))
+
+
+## [v6.20.12 (2021-01-13)](https://github.com/laravel/framework/compare/v6.20.11...v6.20.12)
+
+
+## [v6.20.11 (2021-01-13)](https://github.com/laravel/framework/compare/v6.20.10...v6.20.11)
+
+### Fixed
+- Limit expected bindings ([#35865](https://github.com/laravel/framework/pull/35865))
## [v6.20.10 (2021-01-12)](https://github.com/laravel/framework/compare/v6.20.9...v6.20.10)
diff --git a/CHANGELOG-8.x.md b/CHANGELOG-8.x.md
index 6879551e0a1e..f1e61cd5215f 100644
--- a/CHANGELOG-8.x.md
+++ b/CHANGELOG-8.x.md
@@ -1,6 +1,34 @@
# Release Notes for 8.x
-## [Unreleased](https://github.com/laravel/framework/compare/v8.22.0...8.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v8.23.1...8.x)
+
+
+## [v8.23.1 (2021-01-19)](https://github.com/laravel/framework/compare/v8.23.0...v8.23.1)
+
+### Fixed
+- Fixed empty html mail ([#35941](https://github.com/laravel/framework/pull/35941))
+
+
+## [v8.23.0 (2021-01-19)](https://github.com/laravel/framework/compare/v8.22.1...v8.23.0)
+
+### Added
+- Added `Illuminate\Database\Concerns\BuildsQueries::sole()` ([#35869](https://github.com/laravel/framework/pull/35869), [29c7dae](https://github.com/laravel/framework/commit/29c7dae9b32af2abffa7489f4758fd67905683c3), [#35908](https://github.com/laravel/framework/pull/35908), [#35902](https://github.com/laravel/framework/pull/35902), [#35912](https://github.com/laravel/framework/pull/35912))
+- Added default parameter to throw_if / throw_unless ([#35890](https://github.com/laravel/framework/pull/35890))
+- Added validation support for TeamSpeak3 URI scheme ([#35933](https://github.com/laravel/framework/pull/35933))
+
+### Fixed
+- Fixed extra space on blade class components that are inline ([#35874](https://github.com/laravel/framework/pull/35874))
+- Fixed serialization of rate limited middleware ([f3d4dcb](https://github.com/laravel/framework/commit/f3d4dcb21dc66824611fdde95c8075b694825bf5), [#35916](https://github.com/laravel/framework/pull/35916))
+
+### Changed
+- Allow a specific seeder to be used in tests in `Illuminate\Foundation\Testing\RefreshDatabase::migrateFreshUsing()` ([#35864](https://github.com/laravel/framework/pull/35864))
+- Pass $key to closure in Collection and LazyCollection's reduce method as well ([#35878](https://github.com/laravel/framework/pull/35878))
+
+
+## [v8.22.1 (2021-01-13)](https://github.com/laravel/framework/compare/v8.22.0...v8.22.1)
+
+### Fixed
+- Limit expected bindings ([#35865](https://github.com/laravel/framework/pull/35865))
## [v8.22.0 (2021-01-12)](https://github.com/laravel/framework/compare/v8.21.0...v8.22.0)
diff --git a/src/Illuminate/Cache/Lock.php b/src/Illuminate/Cache/Lock.php
index 271cba50fc58..eb035161ba87 100644
--- a/src/Illuminate/Cache/Lock.php
+++ b/src/Illuminate/Cache/Lock.php
@@ -105,7 +105,7 @@ public function get($callback = null)
*
* @param int $seconds
* @param callable|null $callback
- * @return bool
+ * @return mixed
*
* @throws \Illuminate\Contracts\Cache\LockTimeoutException
*/
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
index e4549d03ed11..beaac46fe280 100644
--- a/src/Illuminate/Collections/Collection.php
+++ b/src/Illuminate/Collections/Collection.php
@@ -1168,7 +1168,7 @@ protected function sortByMany(array $comparisons = [])
if (is_callable($prop)) {
$result = $prop($a, $b);
} else {
- $values = [Arr::get($a, $prop), Arr::get($b, $prop)];
+ $values = [data_get($a, $prop), data_get($b, $prop)];
if (! $ascending) {
$values = array_reverse($values);
diff --git a/src/Illuminate/Contracts/Cache/Lock.php b/src/Illuminate/Contracts/Cache/Lock.php
index 7f01b1be3f33..03f633a07a21 100644
--- a/src/Illuminate/Contracts/Cache/Lock.php
+++ b/src/Illuminate/Contracts/Cache/Lock.php
@@ -17,7 +17,7 @@ public function get($callback = null);
*
* @param int $seconds
* @param callable|null $callback
- * @return bool
+ * @return mixed
*/
public function block($seconds, $callback = null);
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index b39618d51ff3..175a9062f45b 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -752,7 +752,7 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
);
if (! $value instanceof Expression) {
- $this->addBinding(is_array($value) ? head($value) : $value, 'where');
+ $this->addBinding($this->flattenValue($value), 'where');
}
return $this;
@@ -1121,7 +1121,7 @@ public function whereBetween($column, array $values, $boolean = 'and', $not = fa
$this->wheres[] = compact('type', 'column', 'values', 'boolean', 'not');
- $this->addBinding(array_slice($this->cleanBindings($values), 0, 2), 'where');
+ $this->addBinding(array_slice($this->cleanBindings(Arr::flatten($values)), 0, 2), 'where');
return $this;
}
@@ -1244,7 +1244,7 @@ public function whereDate($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
- $value = is_array($value) ? head($value) : $value;
+ $value = $this->flattenValue($value);
if ($value instanceof DateTimeInterface) {
$value = $value->format('Y-m-d');
@@ -1285,7 +1285,7 @@ public function whereTime($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
- $value = is_array($value) ? head($value) : $value;
+ $value = $this->flattenValue($value);
if ($value instanceof DateTimeInterface) {
$value = $value->format('H:i:s');
@@ -1326,7 +1326,7 @@ public function whereDay($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
- $value = is_array($value) ? head($value) : $value;
+ $value = $this->flattenValue($value);
if ($value instanceof DateTimeInterface) {
$value = $value->format('d');
@@ -1371,7 +1371,7 @@ public function whereMonth($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
- $value = is_array($value) ? head($value) : $value;
+ $value = $this->flattenValue($value);
if ($value instanceof DateTimeInterface) {
$value = $value->format('m');
@@ -1416,7 +1416,7 @@ public function whereYear($column, $operator, $value = null, $boolean = 'and')
$value, $operator, func_num_args() === 2
);
- $value = is_array($value) ? head($value) : $value;
+ $value = $this->flattenValue($value);
if ($value instanceof DateTimeInterface) {
$value = $value->format('Y');
@@ -1726,7 +1726,7 @@ public function whereJsonLength($column, $operator, $value = null, $boolean = 'a
$this->wheres[] = compact('type', 'column', 'operator', 'value', 'boolean');
if (! $value instanceof Expression) {
- $this->addBinding((int) $value);
+ $this->addBinding((int) $this->flattenValue($value));
}
return $this;
@@ -1875,7 +1875,7 @@ public function having($column, $operator = null, $value = null, $boolean = 'and
$this->havings[] = compact('type', 'column', 'operator', 'value', 'boolean');
if (! $value instanceof Expression) {
- $this->addBinding(is_array($value) ? head($value) : $value, 'having');
+ $this->addBinding($this->flattenValue($value), 'having');
}
return $this;
@@ -1913,7 +1913,7 @@ public function havingBetween($column, array $values, $boolean = 'and', $not = f
$this->havings[] = compact('type', 'column', 'values', 'boolean', 'not');
- $this->addBinding($this->cleanBindings($values), 'having');
+ $this->addBinding(array_slice($this->cleanBindings(Arr::flatten($values)), 0, 2), 'having');
return $this;
}
@@ -3178,6 +3178,17 @@ public function cleanBindings(array $bindings)
}));
}
+ /**
+ * Get a scalar type value from an unknown type of input.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function flattenValue($value)
+ {
+ return is_array($value) ? head(Arr::flatten($value)) : $value;
+ }
+
/**
* Get the default key name of the table.
*
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
index 0dab37cd18dc..4fdb7059931c 100755
--- a/src/Illuminate/Foundation/Application.php
+++ b/src/Illuminate/Foundation/Application.php
@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
*
* @var string
*/
- const VERSION = '8.23.1';
+ const VERSION = '8.24.0';
/**
* The base path for the Laravel installation.
diff --git a/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php b/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
index f938bf48492f..faf25d92e081 100644
--- a/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
+++ b/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
@@ -13,7 +13,7 @@ trait InteractsWithContentTypes
*/
public function isJson()
{
- return Str::contains($this->header('CONTENT_TYPE'), ['/json', '+json']);
+ return Str::contains($this->header('CONTENT_TYPE') ?? '', ['/json', '+json']);
}
/**
diff --git a/src/Illuminate/Queue/Events/JobQueued.php b/src/Illuminate/Queue/Events/JobQueued.php
new file mode 100644
index 000000000000..c91d14095963
--- /dev/null
+++ b/src/Illuminate/Queue/Events/JobQueued.php
@@ -0,0 +1,42 @@
+connectionName = $connectionName;
+ $this->id = $id;
+ $this->job = $job;
+ }
+}
diff --git a/src/Illuminate/Queue/Middleware/RateLimitedWithRedis.php b/src/Illuminate/Queue/Middleware/RateLimitedWithRedis.php
index 7000e9d55307..af1eac1aa7ff 100644
--- a/src/Illuminate/Queue/Middleware/RateLimitedWithRedis.php
+++ b/src/Illuminate/Queue/Middleware/RateLimitedWithRedis.php
@@ -88,4 +88,17 @@ protected function getTimeUntilNextRetry($key)
{
return ($this->decaysAt[$key] - $this->currentTime()) + 3;
}
+
+ /**
+ * Prepare the object after unserialization.
+ *
+ * @param array $data
+ * @return void
+ */
+ public function __unserialize(array $data)
+ {
+ parent::__unserialize($data);
+
+ $this->redis = Container::getInstance()->make(Redis::class);
+ }
}
diff --git a/src/Illuminate/Queue/Queue.php b/src/Illuminate/Queue/Queue.php
index b22ed51cd446..f036f2a871c5 100755
--- a/src/Illuminate/Queue/Queue.php
+++ b/src/Illuminate/Queue/Queue.php
@@ -7,6 +7,7 @@
use Illuminate\Container\Container;
use Illuminate\Contracts\Encryption\Encrypter;
use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Queue\Events\JobQueued;
use Illuminate\Support\Arr;
use Illuminate\Support\InteractsWithTime;
use Illuminate\Support\Str;
@@ -284,13 +285,17 @@ protected function enqueueUsing($job, $payload, $queue, $delay, $callback)
if ($this->shouldDispatchAfterCommit($job) &&
$this->container->bound('db.transactions')) {
return $this->container->make('db.transactions')->addCallback(
- function () use ($payload, $queue, $delay, $callback) {
- return $callback($payload, $queue, $delay);
+ function () use ($payload, $queue, $delay, $callback, $job) {
+ return tap($callback($payload, $queue, $delay), function ($jobId) use ($job) {
+ $this->raiseJobQueuedEvent($jobId, $job);
+ });
}
);
}
- return $callback($payload, $queue, $delay);
+ return tap($callback($payload, $queue, $delay), function ($jobId) use ($job) {
+ $this->raiseJobQueuedEvent($jobId, $job);
+ });
}
/**
@@ -312,6 +317,20 @@ protected function shouldDispatchAfterCommit($job)
return false;
}
+ /**
+ * Raise the job queued event.
+ *
+ * @param string|int|null $jobId
+ * @param \Closure|string|object $job
+ * @return void
+ */
+ protected function raiseJobQueuedEvent($jobId, $job)
+ {
+ if ($this->container->bound('events')) {
+ $this->container['events']->dispatch(new JobQueued($this->connectionName, $jobId, $job));
+ }
+ }
+
/**
* Get the connection name for the queue.
*
diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
index 8c010346525b..55b02d9b5ae8 100755
--- a/tests/Database/DatabaseQueryBuilderTest.php
+++ b/tests/Database/DatabaseQueryBuilderTest.php
@@ -319,6 +319,11 @@ public function testWheresWithArrayValue()
$builder->select('*')->from('users')->where('id', '<>', [12, 30]);
$this->assertSame('select * from "users" where "id" <> ?', $builder->toSql());
$this->assertEquals([0 => 12], $builder->getBindings());
+
+ $builder = $this->getBuilder();
+ $builder->select('*')->from('users')->where('id', '=', [[12, 30]]);
+ $this->assertSame('select * from "users" where "id" = ?', $builder->toSql());
+ $this->assertEquals([0 => 12], $builder->getBindings());
}
public function testMySqlWrappingProtectsQuotationMarks()
@@ -649,6 +654,16 @@ public function testWhereBetweens()
$this->assertSame('select * from "users" where "id" between ? and ?', $builder->toSql());
$this->assertEquals([0 => 1, 1 => 2], $builder->getBindings());
+ $builder = $this->getBuilder();
+ $builder->select('*')->from('users')->whereBetween('id', [[1, 2, 3]]);
+ $this->assertSame('select * from "users" where "id" between ? and ?', $builder->toSql());
+ $this->assertEquals([0 => 1, 1 => 2], $builder->getBindings());
+
+ $builder = $this->getBuilder();
+ $builder->select('*')->from('users')->whereBetween('id', [[1], [2, 3]]);
+ $this->assertSame('select * from "users" where "id" between ? and ?', $builder->toSql());
+ $this->assertEquals([0 => 1, 1 => 2], $builder->getBindings());
+
$builder = $this->getBuilder();
$builder->select('*')->from('users')->whereNotBetween('id', [1, 2]);
$this->assertSame('select * from "users" where "id" not between ? and ?', $builder->toSql());
@@ -1244,10 +1259,19 @@ public function testHavings()
$builder = $this->getBuilder();
$builder->select(['category', new Raw('count(*) as "total"')])->from('item')->where('department', '=', 'popular')->groupBy('category')->having('total', '>', 3);
$this->assertSame('select "category", count(*) as "total" from "item" where "department" = ? group by "category" having "total" > ?', $builder->toSql());
+ }
+ public function testHavingBetweens()
+ {
$builder = $this->getBuilder();
- $builder->select('*')->from('users')->havingBetween('last_login_date', ['2018-11-16', '2018-12-16']);
- $this->assertSame('select * from "users" having "last_login_date" between ? and ?', $builder->toSql());
+ $builder->select('*')->from('users')->havingBetween('id', [1, 2, 3]);
+ $this->assertSame('select * from "users" having "id" between ? and ?', $builder->toSql());
+ $this->assertEquals([0 => 1, 1 => 2], $builder->getBindings());
+
+ $builder = $this->getBuilder();
+ $builder->select('*')->from('users')->havingBetween('id', [[1, 2], [3, 4]]);
+ $this->assertSame('select * from "users" having "id" between ? and ?', $builder->toSql());
+ $this->assertEquals([0 => 1, 1 => 2], $builder->getBindings());
}
public function testHavingShortcut()
diff --git a/tests/Queue/QueueBeanstalkdQueueTest.php b/tests/Queue/QueueBeanstalkdQueueTest.php
index 7134917a2369..534a16141381 100755
--- a/tests/Queue/QueueBeanstalkdQueueTest.php
+++ b/tests/Queue/QueueBeanstalkdQueueTest.php
@@ -13,6 +13,16 @@
class QueueBeanstalkdQueueTest extends TestCase
{
+ /**
+ * @var BeanstalkdQueue
+ */
+ private $queue;
+
+ /**
+ * @var Container|m\LegacyMockInterface|m\MockInterface
+ */
+ private $container;
+
protected function tearDown(): void
{
m::close();
@@ -26,14 +36,16 @@ public function testPushProperlyPushesJobOntoBeanstalkd()
return $uuid;
});
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('useTube')->once()->with('stack')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), 1024, 0, 60);
- $queue->push('foo', ['data'], 'stack');
- $queue->push('foo', ['data']);
+ $this->queue->push('foo', ['data'], 'stack');
+ $this->queue->push('foo', ['data']);
+
+ $this->container->shouldHaveReceived('bound')->with('events')->times(2);
Str::createUuidsNormally();
}
@@ -46,53 +58,68 @@ public function testDelayedPushProperlyPushesJobOntoBeanstalkd()
return $uuid;
});
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('useTube')->once()->with('stack')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), Pheanstalk::DEFAULT_PRIORITY, 5, Pheanstalk::DEFAULT_TTR);
- $queue->later(5, 'foo', ['data'], 'stack');
- $queue->later(5, 'foo', ['data']);
+ $this->queue->later(5, 'foo', ['data'], 'stack');
+ $this->queue->later(5, 'foo', ['data']);
+
+ $this->container->shouldHaveReceived('bound')->with('events')->times(2);
Str::createUuidsNormally();
}
public function testPopProperlyPopsJobOffOfBeanstalkd()
{
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $queue->setContainer(m::mock(Container::class));
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('watchOnly')->once()->with('default')->andReturn($pheanstalk);
$job = m::mock(Job::class);
$pheanstalk->shouldReceive('reserveWithTimeout')->once()->with(0)->andReturn($job);
- $result = $queue->pop();
+ $result = $this->queue->pop();
$this->assertInstanceOf(BeanstalkdJob::class, $result);
}
public function testBlockingPopProperlyPopsJobOffOfBeanstalkd()
{
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60, 60);
- $queue->setContainer(m::mock(Container::class));
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60, 60);
+
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('watchOnly')->once()->with('default')->andReturn($pheanstalk);
$job = m::mock(Job::class);
$pheanstalk->shouldReceive('reserveWithTimeout')->once()->with(60)->andReturn($job);
- $result = $queue->pop();
+ $result = $this->queue->pop();
$this->assertInstanceOf(BeanstalkdJob::class, $result);
}
public function testDeleteProperlyRemoveJobsOffBeanstalkd()
{
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('delete')->once()->with(m::type(Job::class));
- $queue->deleteMessage('default', 1);
+ $this->queue->deleteMessage('default', 1);
+ }
+
+ /**
+ * @param string $default
+ * @param int $timeToRun
+ * @param int $blockFor
+ */
+ private function setQueue($default, $timeToRun, $blockFor = 0)
+ {
+ $this->queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), $default, $timeToRun, $blockFor);
+ $this->container = m::spy(Container::class);
+ $this->queue->setContainer($this->container);
}
}
diff --git a/tests/Queue/QueueDatabaseQueueUnitTest.php b/tests/Queue/QueueDatabaseQueueUnitTest.php
index 6fa35eca5708..c87dc754545b 100644
--- a/tests/Queue/QueueDatabaseQueueUnitTest.php
+++ b/tests/Queue/QueueDatabaseQueueUnitTest.php
@@ -2,6 +2,7 @@
namespace Illuminate\Tests\Queue;
+use Illuminate\Container\Container;
use Illuminate\Database\Connection;
use Illuminate\Queue\DatabaseQueue;
use Illuminate\Queue\Queue;
@@ -28,6 +29,7 @@ public function testPushProperlyPushesJobOntoDatabase()
$queue = $this->getMockBuilder(DatabaseQueue::class)->onlyMethods(['currentTime'])->setConstructorArgs([$database = m::mock(Connection::class), 'table', 'default'])->getMock();
$queue->expects($this->any())->method('currentTime')->willReturn('time');
+ $queue->setContainer($container = m::spy(Container::class));
$database->shouldReceive('table')->with('table')->andReturn($query = m::mock(stdClass::class));
$query->shouldReceive('insertGetId')->once()->andReturnUsing(function ($array) use ($uuid) {
$this->assertSame('default', $array['queue']);
@@ -39,6 +41,8 @@ public function testPushProperlyPushesJobOntoDatabase()
$queue->push('foo', ['data']);
+ $container->shouldHaveReceived('bound')->with('events')->once();
+
Str::createUuidsNormally();
}
@@ -56,6 +60,7 @@ public function testDelayedPushProperlyPushesJobOntoDatabase()
[$database = m::mock(Connection::class), 'table', 'default']
)->getMock();
$queue->expects($this->any())->method('currentTime')->willReturn('time');
+ $queue->setContainer($container = m::spy(Container::class));
$database->shouldReceive('table')->with('table')->andReturn($query = m::mock(stdClass::class));
$query->shouldReceive('insertGetId')->once()->andReturnUsing(function ($array) use ($uuid) {
$this->assertSame('default', $array['queue']);
@@ -67,6 +72,8 @@ public function testDelayedPushProperlyPushesJobOntoDatabase()
$queue->later(10, 'foo', ['data']);
+ $container->shouldHaveReceived('bound')->with('events')->once();
+
Str::createUuidsNormally();
}
diff --git a/tests/Queue/QueueRedisQueueTest.php b/tests/Queue/QueueRedisQueueTest.php
index 2060772d78a8..952384b7f200 100644
--- a/tests/Queue/QueueRedisQueueTest.php
+++ b/tests/Queue/QueueRedisQueueTest.php
@@ -2,6 +2,7 @@
namespace Illuminate\Tests\Queue;
+use Illuminate\Container\Container;
use Illuminate\Contracts\Redis\Factory;
use Illuminate\Queue\LuaScripts;
use Illuminate\Queue\Queue;
@@ -28,11 +29,13 @@ public function testPushProperlyPushesJobOntoRedis()
$queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
+ $queue->setContainer($container = m::spy(Container::class));
$redis->shouldReceive('connection')->once()->andReturn($redis);
$redis->shouldReceive('eval')->once()->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0]));
$id = $queue->push('foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Str::createUuidsNormally();
}
@@ -47,6 +50,7 @@ public function testPushProperlyPushesJobOntoRedisWithCustomPayloadHook()
$queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
+ $queue->setContainer($container = m::spy(Container::class));
$redis->shouldReceive('connection')->once()->andReturn($redis);
$redis->shouldReceive('eval')->once()->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'id' => 'foo', 'attempts' => 0]));
@@ -56,6 +60,7 @@ public function testPushProperlyPushesJobOntoRedisWithCustomPayloadHook()
$id = $queue->push('foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Queue::createPayloadUsing(null);
@@ -72,6 +77,7 @@ public function testPushProperlyPushesJobOntoRedisWithTwoCustomPayloadHook()
$queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
+ $queue->setContainer($container = m::spy(Container::class));
$redis->shouldReceive('connection')->once()->andReturn($redis);
$redis->shouldReceive('eval')->once()->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'bar' => 'foo', 'id' => 'foo', 'attempts' => 0]));
@@ -85,6 +91,7 @@ public function testPushProperlyPushesJobOntoRedisWithTwoCustomPayloadHook()
$id = $queue->push('foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Queue::createPayloadUsing(null);
@@ -100,6 +107,7 @@ public function testDelayedPushProperlyPushesJobOntoRedis()
});
$queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['availableAt', 'getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+ $queue->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$queue->expects($this->once())->method('availableAt')->with(1)->willReturn(2);
@@ -112,6 +120,7 @@ public function testDelayedPushProperlyPushesJobOntoRedis()
$id = $queue->later(1, 'foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Str::createUuidsNormally();
}
@@ -126,6 +135,7 @@ public function testDelayedPushWithDateTimeProperlyPushesJobOntoRedis()
$date = Carbon::now();
$queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['availableAt', 'getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+ $queue->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$queue->expects($this->once())->method('availableAt')->with($date)->willReturn(2);
@@ -137,6 +147,7 @@ public function testDelayedPushWithDateTimeProperlyPushesJobOntoRedis()
);
$queue->later($date, 'foo', ['data']);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Str::createUuidsNormally();
}
diff --git a/tests/Queue/QueueSqsQueueTest.php b/tests/Queue/QueueSqsQueueTest.php
index 789084515b0d..60e02b161ebb 100755
--- a/tests/Queue/QueueSqsQueueTest.php
+++ b/tests/Queue/QueueSqsQueueTest.php
@@ -92,33 +92,39 @@ public function testDelayedPushWithDateTimeProperlyPushesJobOntoSqs()
{
$now = Carbon::now();
$queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['createPayload', 'secondsUntil', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('createPayload')->with($this->mockedJob, $this->queueName, $this->mockedData)->willReturn($this->mockedPayload);
$queue->expects($this->once())->method('secondsUntil')->with($now)->willReturn(5);
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('sendMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'MessageBody' => $this->mockedPayload, 'DelaySeconds' => 5])->andReturn($this->mockedSendMessageResponseModel);
$id = $queue->later($now->addSeconds(5), $this->mockedJob, $this->mockedData, $this->queueName);
$this->assertEquals($this->mockedMessageId, $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
}
public function testDelayedPushProperlyPushesJobOntoSqs()
{
$queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['createPayload', 'secondsUntil', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('createPayload')->with($this->mockedJob, $this->queueName, $this->mockedData)->willReturn($this->mockedPayload);
$queue->expects($this->once())->method('secondsUntil')->with($this->mockedDelay)->willReturn($this->mockedDelay);
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('sendMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'MessageBody' => $this->mockedPayload, 'DelaySeconds' => $this->mockedDelay])->andReturn($this->mockedSendMessageResponseModel);
$id = $queue->later($this->mockedDelay, $this->mockedJob, $this->mockedData, $this->queueName);
$this->assertEquals($this->mockedMessageId, $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
}
public function testPushProperlyPushesJobOntoSqs()
{
$queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['createPayload', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('createPayload')->with($this->mockedJob, $this->queueName, $this->mockedData)->willReturn($this->mockedPayload);
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('sendMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'MessageBody' => $this->mockedPayload])->andReturn($this->mockedSendMessageResponseModel);
$id = $queue->push($this->mockedJob, $this->mockedData, $this->queueName);
$this->assertEquals($this->mockedMessageId, $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
}
public function testSizeProperlyReadsSqsQueueSize()
diff --git a/tests/Queue/RedisQueueIntegrationTest.php b/tests/Queue/RedisQueueIntegrationTest.php
index 0380988bd4e1..5fbad9311dd4 100644
--- a/tests/Queue/RedisQueueIntegrationTest.php
+++ b/tests/Queue/RedisQueueIntegrationTest.php
@@ -3,7 +3,9 @@
namespace Illuminate\Tests\Queue;
use Illuminate\Container\Container;
+use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
+use Illuminate\Queue\Events\JobQueued;
use Illuminate\Queue\Jobs\RedisJob;
use Illuminate\Queue\RedisQueue;
use Illuminate\Support\Carbon;
@@ -21,6 +23,11 @@ class RedisQueueIntegrationTest extends TestCase
*/
private $queue;
+ /**
+ * @var \Mockery\MockInterface|\Mockery\LegacyMockInterface
+ */
+ private $container;
+
protected function setUp(): void
{
Carbon::setTestNow(Carbon::now());
@@ -57,6 +64,8 @@ public function testExpiredJobsArePopped($driver)
$this->queue->later(-300, $jobs[2]);
$this->queue->later(-100, $jobs[3]);
+ $this->container->shouldHaveReceived('bound')->with('events')->times(4);
+
$this->assertEquals($jobs[2], unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
$this->assertEquals($jobs[1], unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
$this->assertEquals($jobs[3], unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
@@ -183,13 +192,14 @@ public function testPopProperlyPopsDelayedJobOffOfRedis($driver)
*/
public function testPopPopsDelayedJobOffOfRedisWhenExpireNull($driver)
{
- $this->queue = new RedisQueue($this->redis[$driver], 'default', null, null);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->setQueue($driver, 'default', null, null);
// Push an item into queue
$job = new RedisQueueIntegrationTestJob(10);
$this->queue->later(-10, $job);
+ $this->container->shouldHaveReceived('bound')->with('events')->once();
+
// Pop and check it is popped correctly
$before = $this->currentTime();
$this->assertEquals($job, unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
@@ -264,12 +274,13 @@ public function testBlockingPopProperlyPopsExpiredJobs($driver)
*/
public function testNotExpireJobsWhenExpireNull($driver)
{
- $this->queue = new RedisQueue($this->redis[$driver], 'default', null, null);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->setQueue($driver, 'default', null, null);
// Make an expired reserved job
$failed = new RedisQueueIntegrationTestJob(-20);
$this->queue->push($failed);
+ $this->container->shouldHaveReceived('bound')->with('events')->once();
+
$beforeFailPop = $this->currentTime();
$this->queue->pop();
$afterFailPop = $this->currentTime();
@@ -277,6 +288,7 @@ public function testNotExpireJobsWhenExpireNull($driver)
// Push an item into queue
$job = new RedisQueueIntegrationTestJob(10);
$this->queue->push($job);
+ $this->container->shouldHaveReceived('bound')->with('events')->times(2);
// Pop and check it is popped correctly
$before = $this->currentTime();
@@ -309,12 +321,12 @@ public function testNotExpireJobsWhenExpireNull($driver)
*/
public function testExpireJobsWhenExpireSet($driver)
{
- $this->queue = new RedisQueue($this->redis[$driver], 'default', null, 30);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->setQueue($driver, 'default', null, 30);
// Push an item into queue
$job = new RedisQueueIntegrationTestJob(10);
$this->queue->push($job);
+ $this->container->shouldHaveReceived('bound')->with('events')->once();
// Pop and check it is popped correctly
$before = $this->currentTime();
@@ -455,17 +467,67 @@ public function testSize($driver)
$this->assertEquals(2, $this->queue->size());
}
+ /**
+ * @dataProvider redisDriverProvider
+ *
+ * @param string $driver
+ */
+ public function testPushJobQueuedEvent($driver)
+ {
+ $events = m::mock(Dispatcher::class);
+ $events->shouldReceive('dispatch')->withArgs(function (JobQueued $jobQueued) {
+ $this->assertInstanceOf(RedisQueueIntegrationTestJob::class, $jobQueued->job);
+ $this->assertIsString(RedisQueueIntegrationTestJob::class, $jobQueued->id);
+
+ return true;
+ })->andReturnNull()->once();
+
+ $container = m::mock(Container::class);
+ $container->shouldReceive('bound')->with('events')->andReturn(true)->once();
+ $container->shouldReceive('offsetGet')->with('events')->andReturn($events)->once();
+
+ $queue = new RedisQueue($this->redis[$driver]);
+ $queue->setContainer($container);
+
+ $queue->push(new RedisQueueIntegrationTestJob(5));
+ }
+
+ /**
+ * @dataProvider redisDriverProvider
+ *
+ * @param string $driver
+ */
+ public function testBulkJobQueuedEvent($driver)
+ {
+ $events = m::mock(Dispatcher::class);
+ $events->shouldReceive('dispatch')->with(m::type(JobQueued::class))->andReturnNull()->times(3);
+
+ $container = m::mock(Container::class);
+ $container->shouldReceive('bound')->with('events')->andReturn(true)->times(3);
+ $container->shouldReceive('offsetGet')->with('events')->andReturn($events)->times(3);
+
+ $queue = new RedisQueue($this->redis[$driver]);
+ $queue->setContainer($container);
+
+ $queue->bulk([
+ new RedisQueueIntegrationTestJob(5),
+ new RedisQueueIntegrationTestJob(10),
+ new RedisQueueIntegrationTestJob(15),
+ ]);
+ }
+
/**
* @param string $driver
* @param string $default
- * @param string $connection
+ * @param string|null $connection
* @param int $retryAfter
* @param int|null $blockFor
*/
private function setQueue($driver, $default = 'default', $connection = null, $retryAfter = 60, $blockFor = null)
{
$this->queue = new RedisQueue($this->redis[$driver], $default, $connection, $retryAfter, $blockFor);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->container = m::spy(Container::class);
+ $this->queue->setContainer($this->container);
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy