', trim($view));
}
@@ -30,7 +30,35 @@ public function test_rendering_a_dynamic_component()
{
$view = View::make('uses-panel-dynamically', ['name' => 'Taylor'])->render();
- $this->assertEquals('
+ $this->assertSame('
+ Hello Taylor
+
', trim($view));
+ }
+
+ public function test_rendering_the_same_dynamic_component_with_different_attributes()
+ {
+ $view = View::make('varied-dynamic-calls')->render();
+
+ $this->assertSame('
+ Hello Taylor
+
+
+
+ Hello Samuel
+', trim($view));
+ }
+
+ public function test_appendable_attributes()
+ {
+ $view = View::make('uses-appendable-panel', ['name' => 'Taylor', 'withInjectedValue' => true])->render();
+
+ $this->assertSame('
+ Hello Taylor
+
', trim($view));
+
+ $view = View::make('uses-appendable-panel', ['name' => 'Taylor', 'withInjectedValue' => false])->render();
+
+ $this->assertSame('
Hello Taylor
', trim($view));
}
diff --git a/tests/Integration/View/templates/components/appendable-panel.blade.php b/tests/Integration/View/templates/components/appendable-panel.blade.php
new file mode 100644
index 000000000000..d3c86f056748
--- /dev/null
+++ b/tests/Integration/View/templates/components/appendable-panel.blade.php
@@ -0,0 +1,5 @@
+@props(['name'])
+
+
merge(['class' => 'mt-4', 'data-controller' => $attributes->prepends('inside-controller')]) }}>
+ Hello {{ $name }}
+
diff --git a/tests/Integration/View/templates/components/hello-span.blade.php b/tests/Integration/View/templates/components/hello-span.blade.php
new file mode 100644
index 000000000000..fac695a4acbf
--- /dev/null
+++ b/tests/Integration/View/templates/components/hello-span.blade.php
@@ -0,0 +1,7 @@
+@props([
+ 'name',
+])
+
+
+ Hello {{ $name }}
+
diff --git a/tests/Integration/View/templates/uses-appendable-panel.blade.php b/tests/Integration/View/templates/uses-appendable-panel.blade.php
new file mode 100644
index 000000000000..4e1744d2be94
--- /dev/null
+++ b/tests/Integration/View/templates/uses-appendable-panel.blade.php
@@ -0,0 +1,9 @@
+@if ($withInjectedValue)
+
+ Panel contents
+
+@else
+
+ Panel contents
+
+@endif
diff --git a/tests/Integration/View/templates/varied-dynamic-calls.blade.php b/tests/Integration/View/templates/varied-dynamic-calls.blade.php
new file mode 100644
index 000000000000..5b267ca4d906
--- /dev/null
+++ b/tests/Integration/View/templates/varied-dynamic-calls.blade.php
@@ -0,0 +1,2 @@
+
+
diff --git a/tests/Mail/MailMailerTest.php b/tests/Mail/MailMailerTest.php
index bbbbd68cfac0..b14b9ba285cd 100755
--- a/tests/Mail/MailMailerTest.php
+++ b/tests/Mail/MailMailerTest.php
@@ -26,7 +26,7 @@ protected function tearDown(): void
public function testMailerSendSendsMessageWithProperViewContent()
{
unset($_SERVER['__mailer.test']);
- $mailer = $this->getMockBuilder(Mailer::class)->setMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
+ $mailer = $this->getMockBuilder(Mailer::class)->onlyMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
$message = m::mock(Swift_Mime_SimpleMessage::class);
$mailer->expects($this->once())->method('createMessage')->willReturn($message);
$view = m::mock(stdClass::class);
@@ -46,7 +46,7 @@ public function testMailerSendSendsMessageWithProperViewContent()
public function testMailerSendSendsMessageWithProperViewContentUsingHtmlStrings()
{
unset($_SERVER['__mailer.test']);
- $mailer = $this->getMockBuilder(Mailer::class)->setMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
+ $mailer = $this->getMockBuilder(Mailer::class)->onlyMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
$message = m::mock(Swift_Mime_SimpleMessage::class);
$mailer->expects($this->once())->method('createMessage')->willReturn($message);
$view = m::mock(stdClass::class);
@@ -67,7 +67,7 @@ public function testMailerSendSendsMessageWithProperViewContentUsingHtmlStrings(
public function testMailerSendSendsMessageWithProperViewContentUsingHtmlMethod()
{
unset($_SERVER['__mailer.test']);
- $mailer = $this->getMockBuilder(Mailer::class)->setMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
+ $mailer = $this->getMockBuilder(Mailer::class)->onlyMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
$message = m::mock(Swift_Mime_SimpleMessage::class);
$mailer->expects($this->once())->method('createMessage')->willReturn($message);
$view = m::mock(stdClass::class);
@@ -87,7 +87,7 @@ public function testMailerSendSendsMessageWithProperViewContentUsingHtmlMethod()
public function testMailerSendSendsMessageWithProperPlainViewContent()
{
unset($_SERVER['__mailer.test']);
- $mailer = $this->getMockBuilder(Mailer::class)->setMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
+ $mailer = $this->getMockBuilder(Mailer::class)->onlyMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
$message = m::mock(Swift_Mime_SimpleMessage::class);
$mailer->expects($this->once())->method('createMessage')->willReturn($message);
$view = m::mock(stdClass::class);
@@ -109,7 +109,7 @@ public function testMailerSendSendsMessageWithProperPlainViewContent()
public function testMailerSendSendsMessageWithProperPlainViewContentWhenExplicit()
{
unset($_SERVER['__mailer.test']);
- $mailer = $this->getMockBuilder(Mailer::class)->setMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
+ $mailer = $this->getMockBuilder(Mailer::class)->onlyMethods(['createMessage'])->setConstructorArgs($this->getMocks())->getMock();
$message = m::mock(Swift_Mime_SimpleMessage::class);
$mailer->expects($this->once())->method('createMessage')->willReturn($message);
$view = m::mock(stdClass::class);
diff --git a/tests/Mail/MailMessageTest.php b/tests/Mail/MailMessageTest.php
index 5ecec53a1f5a..fa752a960c16 100755
--- a/tests/Mail/MailMessageTest.php
+++ b/tests/Mail/MailMessageTest.php
@@ -101,7 +101,7 @@ public function testGetSwiftMessageMethod()
public function testBasicAttachment()
{
$swift = m::mock(stdClass::class);
- $message = $this->getMockBuilder(Message::class)->setMethods(['createAttachmentFromPath'])->setConstructorArgs([$swift])->getMock();
+ $message = $this->getMockBuilder(Message::class)->onlyMethods(['createAttachmentFromPath'])->setConstructorArgs([$swift])->getMock();
$attachment = m::mock(stdClass::class);
$message->expects($this->once())->method('createAttachmentFromPath')->with($this->equalTo('foo.jpg'))->willReturn($attachment);
$swift->shouldReceive('attach')->once()->with($attachment);
@@ -113,7 +113,7 @@ public function testBasicAttachment()
public function testDataAttachment()
{
$swift = m::mock(stdClass::class);
- $message = $this->getMockBuilder(Message::class)->setMethods(['createAttachmentFromData'])->setConstructorArgs([$swift])->getMock();
+ $message = $this->getMockBuilder(Message::class)->onlyMethods(['createAttachmentFromData'])->setConstructorArgs([$swift])->getMock();
$attachment = m::mock(stdClass::class);
$message->expects($this->once())->method('createAttachmentFromData')->with($this->equalTo('foo'), $this->equalTo('name'))->willReturn($attachment);
$swift->shouldReceive('attach')->once()->with($attachment);
diff --git a/tests/Mail/MailSesTransportTest.php b/tests/Mail/MailSesTransportTest.php
index 3e32c55d3646..ff787fb7b53b 100644
--- a/tests/Mail/MailSesTransportTest.php
+++ b/tests/Mail/MailSesTransportTest.php
@@ -46,13 +46,13 @@ public function testSend()
$message->setBcc('you@example.com');
$client = $this->getMockBuilder(SesClient::class)
- ->setMethods(['sendRawEmail'])
+ ->addMethods(['sendRawEmail'])
->disableOriginalConstructor()
->getMock();
$transport = new SesTransport($client);
// Generate a messageId for our mock to return to ensure that the post-sent message
- // has X-SES-Message-ID in its headers
+ // has X-Message-ID in its headers
$messageId = Str::random(32);
$sendRawEmailMock = new sendRawEmailMock($messageId);
$client->expects($this->once())
@@ -64,6 +64,8 @@ public function testSend()
->willReturn($sendRawEmailMock);
$transport->send($message);
+
+ $this->assertEquals($messageId, $message->getHeaders()->get('X-Message-ID')->getFieldBody());
$this->assertEquals($messageId, $message->getHeaders()->get('X-SES-Message-ID')->getFieldBody());
}
}
diff --git a/tests/Mail/MailableQueuedTest.php b/tests/Mail/MailableQueuedTest.php
index 99571405f590..99854f82ce81 100644
--- a/tests/Mail/MailableQueuedTest.php
+++ b/tests/Mail/MailableQueuedTest.php
@@ -29,7 +29,7 @@ public function testQueuedMailableSent()
$queueFake = new QueueFake(new Application);
$mailer = $this->getMockBuilder(Mailer::class)
->setConstructorArgs($this->getMocks())
- ->setMethods(['createMessage', 'to'])
+ ->onlyMethods(['createMessage', 'to'])
->getMock();
$mailer->setQueue($queueFake);
$mailable = new MailableQueableStub;
@@ -43,7 +43,7 @@ public function testQueuedMailableWithAttachmentSent()
$queueFake = new QueueFake(new Application);
$mailer = $this->getMockBuilder(Mailer::class)
->setConstructorArgs($this->getMocks())
- ->setMethods(['createMessage'])
+ ->onlyMethods(['createMessage'])
->getMock();
$mailer->setQueue($queueFake);
$mailable = new MailableQueableStub;
@@ -72,7 +72,7 @@ public function testQueuedMailableWithAttachmentFromDiskSent()
$queueFake = new QueueFake($app);
$mailer = $this->getMockBuilder(Mailer::class)
->setConstructorArgs($this->getMocks())
- ->setMethods(['createMessage'])
+ ->onlyMethods(['createMessage'])
->getMock();
$mailer->setQueue($queueFake);
$mailable = new MailableQueableStub;
diff --git a/tests/Notifications/NotificationBroadcastChannelTest.php b/tests/Notifications/NotificationBroadcastChannelTest.php
index 033cf3f8b3f3..e4cae95c3219 100644
--- a/tests/Notifications/NotificationBroadcastChannelTest.php
+++ b/tests/Notifications/NotificationBroadcastChannelTest.php
@@ -88,6 +88,21 @@ public function testNotificationIsBroadcastedNow()
$channel = new BroadcastChannel($events);
$channel->send($notifiable, $notification);
}
+
+ public function testNotificationIsBroadcastedWithCustomAdditionalPayload()
+ {
+ $notification = new CustomBroadcastWithTestNotification;
+ $notification->id = 1;
+ $notifiable = m::mock();
+
+ $event = new BroadcastNotificationCreated(
+ $notifiable, $notification, $notification->toArray($notifiable)
+ );
+
+ $data = $event->broadcastWith();
+
+ $this->assertArrayHasKey('additional', $data);
+ }
}
class NotificationBroadcastChannelTestNotification extends Notification
@@ -136,3 +151,16 @@ public function toBroadcast()
return (new BroadcastMessage([]))->onConnection('sync');
}
}
+
+class CustomBroadcastWithTestNotification extends Notification
+{
+ public function toArray($notifiable)
+ {
+ return ['invoice_id' => 1];
+ }
+
+ public function broadcastWith()
+ {
+ return ['id' => 1, 'type' => 'custom', 'additional' => 'custom'];
+ }
+}
diff --git a/tests/Notifications/NotificationMailMessageTest.php b/tests/Notifications/NotificationMailMessageTest.php
index 87c5e3f46558..f86949a5a369 100644
--- a/tests/Notifications/NotificationMailMessageTest.php
+++ b/tests/Notifications/NotificationMailMessageTest.php
@@ -132,4 +132,122 @@ public function testCallbackIsSetCorrectly()
$this->assertSame([$callback], $message->callbacks);
}
+
+ public function testWhenCallback()
+ {
+ $callback = function (MailMessage $mailMessage, $condition) {
+ $this->assertTrue($condition);
+
+ $mailMessage->cc('cc@example.com');
+ };
+
+ $message = new MailMessage();
+ $message->when(true, $callback);
+ $this->assertSame([['cc@example.com', null]], $message->cc);
+
+ $message = new MailMessage();
+ $message->when(false, $callback);
+ $this->assertSame([], $message->cc);
+ }
+
+ public function testWhenCallbackWithReturn()
+ {
+ $callback = function (MailMessage $mailMessage, $condition) {
+ $this->assertTrue($condition);
+
+ return $mailMessage->cc('cc@example.com');
+ };
+
+ $message = new MailMessage();
+ $message->when(true, $callback)->bcc('bcc@example.com');
+ $this->assertSame([['cc@example.com', null]], $message->cc);
+ $this->assertSame([['bcc@example.com', null]], $message->bcc);
+
+ $message = new MailMessage();
+ $message->when(false, $callback)->bcc('bcc@example.com');
+ $this->assertSame([], $message->cc);
+ $this->assertSame([['bcc@example.com', null]], $message->bcc);
+ }
+
+ public function testWhenCallbackWithDefault()
+ {
+ $callback = function (MailMessage $mailMessage, $condition) {
+ $this->assertEquals('truthy', $condition);
+
+ $mailMessage->cc('truthy@example.com');
+ };
+
+ $default = function (MailMessage $mailMessage, $condition) {
+ $this->assertEquals(0, $condition);
+
+ $mailMessage->cc('zero@example.com');
+ };
+
+ $message = new MailMessage();
+ $message->when('truthy', $callback, $default);
+ $this->assertSame([['truthy@example.com', null]], $message->cc);
+
+ $message = new MailMessage();
+ $message->when(0, $callback, $default);
+ $this->assertSame([['zero@example.com', null]], $message->cc);
+ }
+
+ public function testUnlessCallback()
+ {
+ $callback = function (MailMessage $mailMessage, $condition) {
+ $this->assertFalse($condition);
+
+ $mailMessage->cc('test@example.com');
+ };
+
+ $message = new MailMessage();
+ $message->unless(false, $callback);
+ $this->assertSame([['test@example.com', null]], $message->cc);
+
+ $message = new MailMessage();
+ $message->unless(true, $callback);
+ $this->assertSame([], $message->cc);
+ }
+
+ public function testUnlessCallbackWithReturn()
+ {
+ $callback = function (MailMessage $mailMessage, $condition) {
+ $this->assertFalse($condition);
+
+ return $mailMessage->cc('cc@example.com');
+ };
+
+ $message = new MailMessage();
+ $message->unless(false, $callback)->bcc('bcc@example.com');
+ $this->assertSame([['cc@example.com', null]], $message->cc);
+ $this->assertSame([['bcc@example.com', null]], $message->bcc);
+
+ $message = new MailMessage();
+ $message->unless(true, $callback)->bcc('bcc@example.com');
+ $this->assertSame([], $message->cc);
+ $this->assertSame([['bcc@example.com', null]], $message->bcc);
+ }
+
+ public function testUnlessCallbackWithDefault()
+ {
+ $callback = function (MailMessage $mailMessage, $condition) {
+ $this->assertEquals(0, $condition);
+
+ $mailMessage->cc('zero@example.com');
+ };
+
+ $default = function (MailMessage $mailMessage, $condition) {
+ $this->assertEquals('truthy', $condition);
+
+ $mailMessage->cc('truthy@example.com');
+ };
+
+ $message = new MailMessage();
+ $message->unless(0, $callback, $default);
+ $this->assertSame([['zero@example.com', null]], $message->cc);
+
+ $message = new MailMessage();
+ $message->unless('truthy', $callback, $default);
+ $this->assertSame([['truthy@example.com', null]], $message->cc);
+ }
}
diff --git a/tests/Pagination/PaginatorTest.php b/tests/Pagination/PaginatorTest.php
index af427010494d..aa1011af5100 100644
--- a/tests/Pagination/PaginatorTest.php
+++ b/tests/Pagination/PaginatorTest.php
@@ -62,4 +62,17 @@ public function testPaginatorReturnsPath()
$this->assertSame($p->path(), 'http://website.com/test');
}
+
+ public function testCanTransformPaginatorItems()
+ {
+ $p = new Paginator($array = ['item1', 'item2', 'item3'], 3, 1,
+ ['path' => 'http://website.com/test']);
+
+ $p->through(function ($item) {
+ return substr($item, 4, 1);
+ });
+
+ $this->assertInstanceOf(Paginator::class, $p);
+ $this->assertSame(['1', '2', '3'], $p->items());
+ }
}
diff --git a/tests/Queue/QueueDatabaseQueueUnitTest.php b/tests/Queue/QueueDatabaseQueueUnitTest.php
index 59400146b4d1..6fa35eca5708 100644
--- a/tests/Queue/QueueDatabaseQueueUnitTest.php
+++ b/tests/Queue/QueueDatabaseQueueUnitTest.php
@@ -26,12 +26,12 @@ public function testPushProperlyPushesJobOntoDatabase()
return $uuid;
});
- $queue = $this->getMockBuilder(DatabaseQueue::class)->setMethods(['currentTime'])->setConstructorArgs([$database = m::mock(Connection::class), 'table', 'default'])->getMock();
+ $queue = $this->getMockBuilder(DatabaseQueue::class)->onlyMethods(['currentTime'])->setConstructorArgs([$database = m::mock(Connection::class), 'table', 'default'])->getMock();
$queue->expects($this->any())->method('currentTime')->willReturn('time');
$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']);
- $this->assertEquals(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
+ $this->assertSame(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
$this->assertEquals(0, $array['attempts']);
$this->assertNull($array['reserved_at']);
$this->assertIsInt($array['available_at']);
@@ -51,7 +51,7 @@ public function testDelayedPushProperlyPushesJobOntoDatabase()
});
$queue = $this->getMockBuilder(
- DatabaseQueue::class)->setMethods(
+ DatabaseQueue::class)->onlyMethods(
['currentTime'])->setConstructorArgs(
[$database = m::mock(Connection::class), 'table', 'default']
)->getMock();
@@ -59,7 +59,7 @@ public function testDelayedPushProperlyPushesJobOntoDatabase()
$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']);
- $this->assertEquals(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
+ $this->assertSame(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
$this->assertEquals(0, $array['attempts']);
$this->assertNull($array['reserved_at']);
$this->assertIsInt($array['available_at']);
@@ -112,7 +112,7 @@ public function testBulkBatchPushesOntoDatabase()
});
$database = m::mock(Connection::class);
- $queue = $this->getMockBuilder(DatabaseQueue::class)->setMethods(['currentTime', 'availableAt'])->setConstructorArgs([$database, 'table', 'default'])->getMock();
+ $queue = $this->getMockBuilder(DatabaseQueue::class)->onlyMethods(['currentTime', 'availableAt'])->setConstructorArgs([$database, 'table', 'default'])->getMock();
$queue->expects($this->any())->method('currentTime')->willReturn('created');
$queue->expects($this->any())->method('availableAt')->willReturn('available');
$database->shouldReceive('table')->with('table')->andReturn($query = m::mock(stdClass::class));
diff --git a/tests/Queue/QueueRedisQueueTest.php b/tests/Queue/QueueRedisQueueTest.php
index 269f767f5e6a..2060772d78a8 100644
--- a/tests/Queue/QueueRedisQueueTest.php
+++ b/tests/Queue/QueueRedisQueueTest.php
@@ -26,7 +26,7 @@ public function testPushProperlyPushesJobOntoRedis()
return $uuid;
});
- $queue = $this->getMockBuilder(RedisQueue::class)->setMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+ $queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$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]));
@@ -45,7 +45,7 @@ public function testPushProperlyPushesJobOntoRedisWithCustomPayloadHook()
return $uuid;
});
- $queue = $this->getMockBuilder(RedisQueue::class)->setMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+ $queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$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]));
@@ -70,7 +70,7 @@ public function testPushProperlyPushesJobOntoRedisWithTwoCustomPayloadHook()
return $uuid;
});
- $queue = $this->getMockBuilder(RedisQueue::class)->setMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+ $queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$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]));
@@ -99,7 +99,7 @@ public function testDelayedPushProperlyPushesJobOntoRedis()
return $uuid;
});
- $queue = $this->getMockBuilder(RedisQueue::class)->setMethods(['availableAt', 'getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+ $queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['availableAt', 'getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$queue->expects($this->once())->method('availableAt')->with(1)->willReturn(2);
@@ -125,7 +125,7 @@ public function testDelayedPushWithDateTimeProperlyPushesJobOntoRedis()
});
$date = Carbon::now();
- $queue = $this->getMockBuilder(RedisQueue::class)->setMethods(['availableAt', 'getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+ $queue = $this->getMockBuilder(RedisQueue::class)->onlyMethods(['availableAt', 'getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$queue->expects($this->once())->method('availableAt')->with($date)->willReturn(2);
diff --git a/tests/Queue/QueueSqsJobTest.php b/tests/Queue/QueueSqsJobTest.php
index 135345080d0c..105d58749d37 100644
--- a/tests/Queue/QueueSqsJobTest.php
+++ b/tests/Queue/QueueSqsJobTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
// Get a mock of the SqsClient
$this->mockedSqsClient = $this->getMockBuilder(SqsClient::class)
- ->setMethods(['deleteMessage'])
+ ->addMethods(['deleteMessage'])
->disableOriginalConstructor()
->getMock();
@@ -66,10 +66,10 @@ public function testFireProperlyCallsTheJobHandler()
public function testDeleteRemovesTheJobFromSqs()
{
$this->mockedSqsClient = $this->getMockBuilder(SqsClient::class)
- ->setMethods(['deleteMessage'])
+ ->addMethods(['deleteMessage'])
->disableOriginalConstructor()
->getMock();
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['getQueue'])->setConstructorArgs([$this->mockedSqsClient, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['getQueue'])->setConstructorArgs([$this->mockedSqsClient, $this->queueName, $this->account])->getMock();
$queue->setContainer($this->mockedContainer);
$job = $this->getJob();
$job->getSqs()->expects($this->once())->method('deleteMessage')->with(['QueueUrl' => $this->queueUrl, 'ReceiptHandle' => $this->mockedReceiptHandle]);
@@ -79,10 +79,10 @@ public function testDeleteRemovesTheJobFromSqs()
public function testReleaseProperlyReleasesTheJobOntoSqs()
{
$this->mockedSqsClient = $this->getMockBuilder(SqsClient::class)
- ->setMethods(['changeMessageVisibility'])
+ ->addMethods(['changeMessageVisibility'])
->disableOriginalConstructor()
->getMock();
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['getQueue'])->setConstructorArgs([$this->mockedSqsClient, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['getQueue'])->setConstructorArgs([$this->mockedSqsClient, $this->queueName, $this->account])->getMock();
$queue->setContainer($this->mockedContainer);
$job = $this->getJob();
$job->getSqs()->expects($this->once())->method('changeMessageVisibility')->with(['QueueUrl' => $this->queueUrl, 'ReceiptHandle' => $this->mockedReceiptHandle, 'VisibilityTimeout' => $this->releaseDelay]);
diff --git a/tests/Queue/QueueSqsQueueTest.php b/tests/Queue/QueueSqsQueueTest.php
index 66e95d1cb962..789084515b0d 100755
--- a/tests/Queue/QueueSqsQueueTest.php
+++ b/tests/Queue/QueueSqsQueueTest.php
@@ -70,7 +70,7 @@ protected function setUp(): void
public function testPopProperlyPopsJobOffOfSqs()
{
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
$queue->setContainer(m::mock(Container::class));
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('receiveMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'AttributeNames' => ['ApproximateReceiveCount']])->andReturn($this->mockedReceiveMessageResponseModel);
@@ -80,7 +80,7 @@ public function testPopProperlyPopsJobOffOfSqs()
public function testPopProperlyHandlesEmptyMessage()
{
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
$queue->setContainer(m::mock(Container::class));
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('receiveMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'AttributeNames' => ['ApproximateReceiveCount']])->andReturn($this->mockedReceiveEmptyMessageResponseModel);
@@ -91,7 +91,7 @@ public function testPopProperlyHandlesEmptyMessage()
public function testDelayedPushWithDateTimeProperlyPushesJobOntoSqs()
{
$now = Carbon::now();
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['createPayload', 'secondsUntil', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['createPayload', 'secondsUntil', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
$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);
@@ -102,7 +102,7 @@ public function testDelayedPushWithDateTimeProperlyPushesJobOntoSqs()
public function testDelayedPushProperlyPushesJobOntoSqs()
{
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['createPayload', 'secondsUntil', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['createPayload', 'secondsUntil', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
$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);
@@ -113,7 +113,7 @@ public function testDelayedPushProperlyPushesJobOntoSqs()
public function testPushProperlyPushesJobOntoSqs()
{
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['createPayload', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['createPayload', 'getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
$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);
@@ -123,11 +123,11 @@ public function testPushProperlyPushesJobOntoSqs()
public function testSizeProperlyReadsSqsQueueSize()
{
- $queue = $this->getMockBuilder(SqsQueue::class)->setMethods(['getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+ $queue = $this->getMockBuilder(SqsQueue::class)->onlyMethods(['getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('getQueueAttributes')->once()->with(['QueueUrl' => $this->queueUrl, 'AttributeNames' => ['ApproximateNumberOfMessages']])->andReturn($this->mockedQueueAttributesResponseModel);
$size = $queue->size($this->queueName);
- $this->assertEquals($size, 1);
+ $this->assertEquals(1, $size);
}
public function testGetQueueProperlyResolvesUrlWithPrefix()
diff --git a/tests/Queue/RedisQueueIntegrationTest.php b/tests/Queue/RedisQueueIntegrationTest.php
index 3381e03fee4d..0380988bd4e1 100644
--- a/tests/Queue/RedisQueueIntegrationTest.php
+++ b/tests/Queue/RedisQueueIntegrationTest.php
@@ -431,6 +431,7 @@ public function testClear($driver)
$this->assertEquals(2, $this->queue->clear(null));
$this->assertEquals(0, $this->queue->size());
+ $this->assertEquals(0, $this->redis[$driver]->connection()->llen('queues:default:notify'));
}
/**
diff --git a/tests/Redis/ConcurrentLimiterTest.php b/tests/Redis/ConcurrentLimiterTest.php
index 78a6792274a5..35e5e64d2ea0 100644
--- a/tests/Redis/ConcurrentLimiterTest.php
+++ b/tests/Redis/ConcurrentLimiterTest.php
@@ -2,6 +2,7 @@
namespace Illuminate\Tests\Redis;
+use Error;
use Illuminate\Contracts\Redis\LimiterTimeoutException;
use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
use Illuminate\Redis\Limiters\ConcurrencyLimiter;
@@ -140,6 +141,27 @@ public function testItFailsAfterRetryTimeout()
$this->assertEquals([1], $store);
}
+ public function testItReleasesIfErrorIsThrown()
+ {
+ $store = [];
+
+ $lock = new ConcurrencyLimiter($this->redis(), 'key', 1, 5);
+
+ try {
+ $lock->block(1, function () {
+ throw new Error();
+ });
+ } catch (Error $e) {
+ }
+
+ $lock = new ConcurrencyLimiter($this->redis(), 'key', 1, 5);
+ $lock->block(1, function () use (&$store) {
+ $store[] = 1;
+ });
+
+ $this->assertEquals([1], $store);
+ }
+
private function redis()
{
return $this->redis['phpredis']->connection();
diff --git a/tests/Redis/RedisConnectorTest.php b/tests/Redis/RedisConnectorTest.php
index 599fa2f2aad3..ff5f93470e8d 100644
--- a/tests/Redis/RedisConnectorTest.php
+++ b/tests/Redis/RedisConnectorTest.php
@@ -34,13 +34,14 @@ public function testDefaultConfiguration()
$predisClient = $this->redis['predis']->connection()->client();
$parameters = $predisClient->getConnection()->getParameters();
- $this->assertEquals('tcp', $parameters->scheme);
+ $this->assertSame('tcp', $parameters->scheme);
$this->assertEquals($host, $parameters->host);
$this->assertEquals($port, $parameters->port);
$phpRedisClient = $this->redis['phpredis']->connection()->client();
$this->assertEquals($host, $phpRedisClient->getHost());
$this->assertEquals($port, $phpRedisClient->getPort());
+ $this->assertEquals('default', $phpRedisClient->client('GETNAME'));
}
public function testUrl()
@@ -61,7 +62,7 @@ public function testUrl()
]);
$predisClient = $predis->connection()->client();
$parameters = $predisClient->getConnection()->getParameters();
- $this->assertEquals('tcp', $parameters->scheme);
+ $this->assertSame('tcp', $parameters->scheme);
$this->assertEquals($host, $parameters->host);
$this->assertEquals($port, $parameters->port);
@@ -77,7 +78,7 @@ public function testUrl()
],
]);
$phpRedisClient = $phpRedis->connection()->client();
- $this->assertEquals("tcp://{$host}", $phpRedisClient->getHost());
+ $this->assertSame("tcp://{$host}", $phpRedisClient->getHost());
$this->assertEquals($port, $phpRedisClient->getPort());
}
@@ -99,7 +100,7 @@ public function testUrlWithScheme()
]);
$predisClient = $predis->connection()->client();
$parameters = $predisClient->getConnection()->getParameters();
- $this->assertEquals('tls', $parameters->scheme);
+ $this->assertSame('tls', $parameters->scheme);
$this->assertEquals($host, $parameters->host);
$this->assertEquals($port, $parameters->port);
@@ -115,7 +116,7 @@ public function testUrlWithScheme()
],
]);
$phpRedisClient = $phpRedis->connection()->client();
- $this->assertEquals("tcp://{$host}", $phpRedisClient->getHost());
+ $this->assertSame("tcp://{$host}", $phpRedisClient->getHost());
$this->assertEquals($port, $phpRedisClient->getPort());
}
@@ -139,7 +140,7 @@ public function testScheme()
]);
$predisClient = $predis->connection()->client();
$parameters = $predisClient->getConnection()->getParameters();
- $this->assertEquals('tls', $parameters->scheme);
+ $this->assertSame('tls', $parameters->scheme);
$this->assertEquals($host, $parameters->host);
$this->assertEquals($port, $parameters->port);
@@ -157,7 +158,7 @@ public function testScheme()
],
]);
$phpRedisClient = $phpRedis->connection()->client();
- $this->assertEquals("tcp://{$host}", $phpRedisClient->getHost());
+ $this->assertSame("tcp://{$host}", $phpRedisClient->getHost());
$this->assertEquals($port, $phpRedisClient->getPort());
}
}
diff --git a/tests/Routing/ImplicitRouteBindingTest.php b/tests/Routing/ImplicitRouteBindingTest.php
new file mode 100644
index 000000000000..81b536f44d56
--- /dev/null
+++ b/tests/Routing/ImplicitRouteBindingTest.php
@@ -0,0 +1,35 @@
+ function (ImplicitRouteBindingUser $user) {
+ return $user;
+ }];
+
+ $route = new Route('GET', '/test', $action);
+ $route->parameters = ['user' => new ImplicitRouteBindingUser];
+
+ $route->prepareForSerialization();
+
+ $container = Container::getInstance();
+
+ ImplicitRouteBinding::resolveForRoute($container, $route);
+
+ $this->assertTrue(true);
+ }
+}
+
+class ImplicitRouteBindingUser extends Model
+{
+ //
+}
diff --git a/tests/Routing/RouteActionTest.php b/tests/Routing/RouteActionTest.php
new file mode 100644
index 000000000000..4b256ff68183
--- /dev/null
+++ b/tests/Routing/RouteActionTest.php
@@ -0,0 +1,29 @@
+ serialize(new SerializableClosure(function (RouteActionUser $user) {
+ return $user;
+ }))];
+
+ $this->assertTrue(RouteAction::containsSerializedClosure($action));
+
+ $action = ['uses' => 'FooController@index'];
+
+ $this->assertFalse(RouteAction::containsSerializedClosure($action));
+ }
+}
+
+class RouteActionUser extends Model
+{
+ //
+}
diff --git a/tests/Routing/RouteRegistrarTest.php b/tests/Routing/RouteRegistrarTest.php
index a6bc297aa40d..47fcb2aa31e5 100644
--- a/tests/Routing/RouteRegistrarTest.php
+++ b/tests/Routing/RouteRegistrarTest.php
@@ -149,6 +149,25 @@ public function testCanRegisterRouteWithControllerActionArray()
$this->seeMiddleware('controller-middleware');
}
+ public function testCanRegisterNamespacedGroupRouteWithControllerActionArray()
+ {
+ $this->router->group(['namespace' => 'WhatEver'], function () {
+ $this->router->middleware('controller-middleware')
+ ->get('users', [RouteRegistrarControllerStub::class, 'index']);
+ });
+
+ $this->seeResponse('controller', Request::create('users', 'GET'));
+ $this->seeMiddleware('controller-middleware');
+
+ $this->router->group(['namespace' => 'WhatEver'], function () {
+ $this->router->middleware('controller-middleware')
+ ->get('users', ['\\'.RouteRegistrarControllerStub::class, 'index']);
+ });
+
+ $this->seeResponse('controller', Request::create('users', 'GET'));
+ $this->seeMiddleware('controller-middleware');
+ }
+
public function testCanRegisterRouteWithArrayAndControllerAction()
{
$this->router->middleware('controller-middleware')->put('users', [
@@ -575,6 +594,44 @@ public function testResourceWheres()
}
}
+ public function testWhereNumberRegistration()
+ {
+ $wheres = ['foo' => '[0-9]+', 'bar' => '[0-9]+'];
+
+ $this->router->get('/{foo}/{bar}')->whereNumber(['foo', 'bar']);
+ $this->router->get('/api/{bar}/{foo}')->whereNumber(['bar', 'foo']);
+
+ /** @var \Illuminate\Routing\Route $route */
+ foreach ($this->router->getRoutes() as $route) {
+ $this->assertEquals($wheres, $route->wheres);
+ }
+ }
+
+ public function testWhereAlphaRegistration()
+ {
+ $wheres = ['foo' => '[a-zA-Z]+', 'bar' => '[a-zA-Z]+'];
+
+ $this->router->get('/{foo}/{bar}')->whereAlpha(['foo', 'bar']);
+ $this->router->get('/api/{bar}/{foo}')->whereAlpha(['bar', 'foo']);
+
+ /** @var \Illuminate\Routing\Route $route */
+ foreach ($this->router->getRoutes() as $route) {
+ $this->assertEquals($wheres, $route->wheres);
+ }
+ }
+
+ public function testWhereAlphaNumericRegistration()
+ {
+ $wheres = ['1a2b3c' => '[a-zA-Z0-9]+'];
+
+ $this->router->get('/{foo}')->whereAlphaNumeric(['1a2b3c']);
+
+ /** @var \Illuminate\Routing\Route $route */
+ foreach ($this->router->getRoutes() as $route) {
+ $this->assertEquals($wheres, $route->wheres);
+ }
+ }
+
public function testCanSetRouteName()
{
$this->router->as('users.index')->get('users', function () {
diff --git a/tests/Routing/RouteSignatureParametersTest.php b/tests/Routing/RouteSignatureParametersTest.php
new file mode 100644
index 000000000000..8edee56cffd7
--- /dev/null
+++ b/tests/Routing/RouteSignatureParametersTest.php
@@ -0,0 +1,29 @@
+ serialize(new SerializableClosure($callable = function (SignatureParametersUser $user) {
+ return $user;
+ }))];
+
+ $parameters = RouteSignatureParameters::fromAction($action);
+
+ $this->assertContainsOnlyInstancesOf(ReflectionParameter::class, $parameters);
+ $this->assertSame('user', $parameters[0]->getName());
+ }
+}
+
+class SignatureParametersUser extends Model
+{
+ //
+}
diff --git a/tests/Routing/RoutingRedirectorTest.php b/tests/Routing/RoutingRedirectorTest.php
index e67ef646f780..ec86d0ab5e94 100644
--- a/tests/Routing/RoutingRedirectorTest.php
+++ b/tests/Routing/RoutingRedirectorTest.php
@@ -182,7 +182,6 @@ public function testItSetsValidIntendedUrl()
{
$this->session->shouldReceive('put')->once()->with('url.intended', 'http://foo.com/bar');
- $result = $this->redirect->setIntendedUrl('http://foo.com/bar');
- $this->assertNull($result);
+ $this->redirect->setIntendedUrl('http://foo.com/bar');
}
}
diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
index 5750a5761a8f..9a9f76e8123f 100644
--- a/tests/Routing/RoutingRouteTest.php
+++ b/tests/Routing/RoutingRouteTest.php
@@ -202,7 +202,7 @@ public function testMiddlewareCanBeSkipped()
return 'hello';
}])->withoutMiddleware(RoutingTestMiddlewareGroupTwo::class);
- $this->assertEquals('hello', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());
+ $this->assertSame('hello', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());
}
public function testMiddlewareCanBeSkippedFromResources()
@@ -214,7 +214,7 @@ public function testMiddlewareCanBeSkippedFromResources()
->middleware('web')
->withoutMiddleware(RoutingTestMiddlewareGroupTwo::class);
- $this->assertEquals('Hello World', $router->dispatch(Request::create('foo', 'GET'))->getContent());
+ $this->assertSame('Hello World', $router->dispatch(Request::create('foo', 'GET'))->getContent());
}
public function testMiddlewareWorksIfControllerThrowsHttpResponseException()
@@ -1831,7 +1831,7 @@ public function testRouteRedirectStripsMissingStartingForwardSlash()
public function testRouteRedirectExceptionWhenMissingExpectedParameters()
{
$this->expectException(UrlGenerationException::class);
- $this->expectExceptionMessage('Missing required parameters for [Route: laravel_route_redirect_destination] [URI: users/{user}].');
+ $this->expectExceptionMessage('Missing required parameter for [Route: laravel_route_redirect_destination] [URI: users/{user}] [Missing parameter: user].');
$container = new Container;
$router = new Router(new Dispatcher, $container);
diff --git a/tests/Routing/RoutingUrlGeneratorTest.php b/tests/Routing/RoutingUrlGeneratorTest.php
index b7663b686b17..676f609b15fa 100755
--- a/tests/Routing/RoutingUrlGeneratorTest.php
+++ b/tests/Routing/RoutingUrlGeneratorTest.php
@@ -550,6 +550,61 @@ public function testUrlGenerationForControllersRequiresPassingOfRequiredParamete
$this->assertSame('http://www.foo.com:8080/foo?test=123', $url->route('foo', $parameters));
}
+ public function provideParametersAndExpectedMeaningfulExceptionMessages()
+ {
+ return [
+ 'Missing parameters "one", "two" and "three"' => [
+ [],
+ 'Missing required parameters for [Route: foo] [URI: foo/{one}/{two}/{three}/{four?}] [Missing parameters: one, two, three].',
+ ],
+ 'Missing parameters "two" and "three"' => [
+ ['one' => '123'],
+ 'Missing required parameters for [Route: foo] [URI: foo/{one}/{two}/{three}/{four?}] [Missing parameters: two, three].',
+ ],
+ 'Missing parameters "one" and "three"' => [
+ ['two' => '123'],
+ 'Missing required parameters for [Route: foo] [URI: foo/{one}/{two}/{three}/{four?}] [Missing parameters: one, three].',
+ ],
+ 'Missing parameters "one" and "two"' => [
+ ['three' => '123'],
+ 'Missing required parameters for [Route: foo] [URI: foo/{one}/{two}/{three}/{four?}] [Missing parameters: one, two].',
+ ],
+ 'Missing parameter "three"' => [
+ ['one' => '123', 'two' => '123'],
+ 'Missing required parameter for [Route: foo] [URI: foo/{one}/{two}/{three}/{four?}] [Missing parameter: three].',
+ ],
+ 'Missing parameter "two"' => [
+ ['one' => '123', 'three' => '123'],
+ 'Missing required parameter for [Route: foo] [URI: foo/{one}/{two}/{three}/{four?}] [Missing parameter: two].',
+ ],
+ 'Missing parameter "one"' => [
+ ['two' => '123', 'three' => '123'],
+ 'Missing required parameter for [Route: foo] [URI: foo/{one}/{two}/{three}/{four?}] [Missing parameter: one].',
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideParametersAndExpectedMeaningfulExceptionMessages
+ */
+ public function testUrlGenerationThrowsExceptionForMissingParametersWithMeaningfulMessage($parameters, $expectedMeaningfulExceptionMessage)
+ {
+ $this->expectException(UrlGenerationException::class);
+ $this->expectExceptionMessage($expectedMeaningfulExceptionMessage);
+
+ $url = new UrlGenerator(
+ $routes = new RouteCollection,
+ Request::create('http://www.foo.com:8080/')
+ );
+
+ $route = new Route(['GET'], 'foo/{one}/{two}/{three}/{four?}', ['as' => 'foo', function () {
+ //
+ }]);
+ $routes->add($route);
+
+ $url->route('foo', $parameters);
+ }
+
public function testForceRootUrl()
{
$url = new UrlGenerator(
diff --git a/tests/Session/SessionStoreTest.php b/tests/Session/SessionStoreTest.php
index 1a825a8e7f87..5871cc657a85 100644
--- a/tests/Session/SessionStoreTest.php
+++ b/tests/Session/SessionStoreTest.php
@@ -433,7 +433,7 @@ public function testName()
$session = $this->getSession();
$this->assertEquals($session->getName(), $this->getSessionName());
$session->setName('foo');
- $this->assertEquals($session->getName(), 'foo');
+ $this->assertSame('foo', $session->getName());
}
public function testKeyExists()
diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php
index 3ee0cb81b8bd..7356c4378d03 100644
--- a/tests/Support/SupportArrTest.php
+++ b/tests/Support/SupportArrTest.php
@@ -110,7 +110,7 @@ public function testDot()
$this->assertEquals(['foo.bar' => []], $array);
$array = Arr::dot(['name' => 'taylor', 'languages' => ['php' => true]]);
- $this->assertEquals($array, ['name' => 'taylor', 'languages.php' => true]);
+ $this->assertEquals(['name' => 'taylor', 'languages.php' => true], $array);
}
public function testExcept()
@@ -903,4 +903,57 @@ public function testWrap()
$this->assertEquals([$obj], Arr::wrap($obj));
$this->assertSame($obj, Arr::wrap($obj)[0]);
}
+
+ public function testSortByMany()
+ {
+ $unsorted = [
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 3]],
+ ['name' => 'John', 'age' => 10, 'meta' => ['key' => 5]],
+ ['name' => 'Dave', 'age' => 10, 'meta' => ['key' => 3]],
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 2]],
+ ];
+
+ // sort using keys
+ $sorted = array_values(Arr::sort($unsorted, [
+ 'name',
+ 'age',
+ 'meta.key',
+ ]));
+ $this->assertEquals([
+ ['name' => 'Dave', 'age' => 10, 'meta' => ['key' => 3]],
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 2]],
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 3]],
+ ['name' => 'John', 'age' => 10, 'meta' => ['key' => 5]],
+ ], $sorted);
+
+ // sort with order
+ $sortedWithOrder = array_values(Arr::sort($unsorted, [
+ 'name',
+ ['age', false],
+ ['meta.key', true],
+ ]));
+ $this->assertEquals([
+ ['name' => 'Dave', 'age' => 10, 'meta' => ['key' => 3]],
+ ['name' => 'John', 'age' => 10, 'meta' => ['key' => 5]],
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 2]],
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 3]],
+ ], $sortedWithOrder);
+
+ // sort using callable
+ $sortedWithCallable = array_values(Arr::sort($unsorted, [
+ function ($a, $b) {
+ return $a['name'] <=> $b['name'];
+ },
+ function ($a, $b) {
+ return $b['age'] <=> $a['age'];
+ },
+ ['meta.key', true],
+ ]));
+ $this->assertEquals([
+ ['name' => 'Dave', 'age' => 10, 'meta' => ['key' => 3]],
+ ['name' => 'John', 'age' => 10, 'meta' => ['key' => 5]],
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 2]],
+ ['name' => 'John', 'age' => 8, 'meta' => ['key' => 3]],
+ ], $sortedWithCallable);
+ }
}
diff --git a/tests/Support/SupportCapsuleManagerTraitTest.php b/tests/Support/SupportCapsuleManagerTraitTest.php
index 6c51ea1109c0..1b503ea591c0 100644
--- a/tests/Support/SupportCapsuleManagerTraitTest.php
+++ b/tests/Support/SupportCapsuleManagerTraitTest.php
@@ -23,7 +23,7 @@ public function testSetupContainerForCapsule()
$this->container = null;
$app = new Container;
- $this->assertNull($this->setupContainer($app));
+ $this->setupContainer($app);
$this->assertEquals($app, $this->getContainer());
$this->assertInstanceOf(Fluent::class, $app['config']);
}
@@ -34,7 +34,7 @@ public function testSetupContainerForCapsuleWhenConfigIsBound()
$app = new Container;
$app['config'] = m::mock(Repository::class);
- $this->assertNull($this->setupContainer($app));
+ $this->setupContainer($app);
$this->assertEquals($app, $this->getContainer());
$this->assertInstanceOf(Repository::class, $app['config']);
}
diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
index b40e2411193c..b622884fe6c1 100755
--- a/tests/Support/SupportCollectionTest.php
+++ b/tests/Support/SupportCollectionTest.php
@@ -144,7 +144,7 @@ public function testShiftReturnsAndRemovesFirstItemInCollection()
$this->assertSame('Taylor', $data->shift());
$this->assertSame('Otwell', $data->first());
$this->assertSame('Otwell', $data->shift());
- $this->assertEquals(null, $data->first());
+ $this->assertNull($data->first());
}
/**
@@ -375,7 +375,7 @@ public function testJsonSerializeCallsToArrayOrJsonSerializeOnEachItemInCollecti
*/
public function testToJsonEncodesTheJsonSerializeResult($collection)
{
- $c = $this->getMockBuilder($collection)->setMethods(['jsonSerialize'])->getMock();
+ $c = $this->getMockBuilder($collection)->onlyMethods(['jsonSerialize'])->getMock();
$c->expects($this->once())->method('jsonSerialize')->willReturn('foo');
$results = $c->toJson();
$this->assertJsonStringEqualsJsonString(json_encode('foo'), $results);
@@ -386,7 +386,7 @@ public function testToJsonEncodesTheJsonSerializeResult($collection)
*/
public function testCastingToStringJsonEncodesTheToArrayResult($collection)
{
- $c = $this->getMockBuilder($collection)->setMethods(['jsonSerialize'])->getMock();
+ $c = $this->getMockBuilder($collection)->onlyMethods(['jsonSerialize'])->getMock();
$c->expects($this->once())->method('jsonSerialize')->willReturn('foo');
$this->assertJsonStringEqualsJsonString(json_encode('foo'), (string) $c);
@@ -1645,6 +1645,22 @@ public function testChunkWhenGivenLessThanZero($collection)
);
}
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testSplitIn($collection)
+ {
+ $data = new $collection([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+ $data = $data->splitIn(3);
+
+ $this->assertInstanceOf($collection, $data);
+ $this->assertInstanceOf($collection, $data->first());
+ $this->assertCount(3, $data);
+ $this->assertEquals([1, 2, 3, 4], $data->get(0)->values()->toArray());
+ $this->assertEquals([5, 6, 7, 8], $data->get(1)->values()->toArray());
+ $this->assertEquals([9, 10], $data->get(2)->values()->toArray());
+ }
+
/**
* @dataProvider collectionClassProvider
*/
@@ -3576,6 +3592,20 @@ public function testReduce($collection)
}));
}
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testReduceWithKeys($collection)
+ {
+ $data = new $collection([
+ 'foo' => 'bar',
+ 'baz' => 'qux',
+ ]);
+ $this->assertEquals('foobarbazqux', $data->reduceWithKeys(function ($carry, $element, $key) {
+ return $carry .= $key.$element;
+ }));
+ }
+
/**
* @dataProvider collectionClassProvider
*/
@@ -3599,6 +3629,20 @@ public function testPipe($collection)
}));
}
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testPipeInto($collection)
+ {
+ $data = new $collection([
+ 'first', 'second',
+ ]);
+
+ $instance = $data->pipeInto(TestCollectionMapIntoObject::class);
+
+ $this->assertSame($data, $instance->value);
+ }
+
/**
* @dataProvider collectionClassProvider
*/
@@ -4014,27 +4058,27 @@ public function testPartitionWithOperators($collection)
[$tims, $others] = $data->partition('name', 'Tim')->all();
- $this->assertEquals($tims->values()->all(), [
+ $this->assertEquals([
['name' => 'Tim', 'age' => 17],
['name' => 'Tim', 'age' => 41],
- ]);
+ ], $tims->values()->all());
- $this->assertEquals($others->values()->all(), [
+ $this->assertEquals([
['name' => 'Agatha', 'age' => 62],
['name' => 'Kristina', 'age' => 33],
- ]);
+ ], $others->values()->all());
[$adults, $minors] = $data->partition('age', '>=', 18)->all();
- $this->assertEquals($adults->values()->all(), [
+ $this->assertEquals([
['name' => 'Agatha', 'age' => 62],
['name' => 'Kristina', 'age' => 33],
['name' => 'Tim', 'age' => 41],
- ]);
+ ], $adults->values()->all());
- $this->assertEquals($minors->values()->all(), [
+ $this->assertEquals([
['name' => 'Tim', 'age' => 17],
- ]);
+ ], $minors->values()->all());
}
/**
diff --git a/tests/Support/SupportComposerTest.php b/tests/Support/SupportComposerTest.php
index 3d2134882012..273f51c468a2 100755
--- a/tests/Support/SupportComposerTest.php
+++ b/tests/Support/SupportComposerTest.php
@@ -59,7 +59,7 @@ private function mockComposer(array $expectedProcessArguments, $customComposerPh
$process->shouldReceive('run')->once();
$composer = $this->getMockBuilder(Composer::class)
- ->setMethods(['getProcess'])
+ ->onlyMethods(['getProcess'])
->setConstructorArgs([$files, $directory])
->getMock();
$composer->expects($this->once())
diff --git a/tests/Support/SupportFluentTest.php b/tests/Support/SupportFluentTest.php
index ffd137df6775..d3dbf0af70b9 100755
--- a/tests/Support/SupportFluentTest.php
+++ b/tests/Support/SupportFluentTest.php
@@ -64,7 +64,7 @@ public function testArrayAccessToAttributes()
$fluent = new Fluent(['attributes' => '1']);
$this->assertTrue(isset($fluent['attributes']));
- $this->assertEquals($fluent['attributes'], 1);
+ $this->assertEquals(1, $fluent['attributes']);
$fluent->attributes();
@@ -107,7 +107,7 @@ public function testToArrayReturnsAttribute()
public function testToJsonEncodesTheToArrayResult()
{
- $fluent = $this->getMockBuilder(Fluent::class)->setMethods(['toArray'])->getMock();
+ $fluent = $this->getMockBuilder(Fluent::class)->onlyMethods(['toArray'])->getMock();
$fluent->expects($this->once())->method('toArray')->willReturn('foo');
$results = $fluent->toJson();
diff --git a/tests/Support/SupportHtmlStringTest.php b/tests/Support/SupportHtmlStringTest.php
index 6610e6340479..8ed846e17bfb 100644
--- a/tests/Support/SupportHtmlStringTest.php
+++ b/tests/Support/SupportHtmlStringTest.php
@@ -20,4 +20,14 @@ public function testToString()
$html = new HtmlString('
foo
');
$this->assertEquals($str, (string) $html);
}
+
+ public function testIsEmpty()
+ {
+ $this->assertTrue((new HtmlString(''))->isEmpty());
+ }
+
+ public function testIsNotEmpty()
+ {
+ $this->assertTrue((new HtmlString('foo'))->isNotEmpty());
+ }
}
diff --git a/tests/Support/SupportNamespacedItemResolverTest.php b/tests/Support/SupportNamespacedItemResolverTest.php
index 0295a1e483fd..c87d04ca3f35 100755
--- a/tests/Support/SupportNamespacedItemResolverTest.php
+++ b/tests/Support/SupportNamespacedItemResolverTest.php
@@ -19,7 +19,7 @@ public function testResolution()
public function testParsedItemsAreCached()
{
- $r = $this->getMockBuilder(NamespacedItemResolver::class)->setMethods(['parseBasicSegments', 'parseNamespacedSegments'])->getMock();
+ $r = $this->getMockBuilder(NamespacedItemResolver::class)->onlyMethods(['parseBasicSegments', 'parseNamespacedSegments'])->getMock();
$r->setParsedKey('foo.bar', ['foo']);
$r->expects($this->never())->method('parseBasicSegments');
$r->expects($this->never())->method('parseNamespacedSegments');
diff --git a/tests/Support/SupportReflectorTest.php b/tests/Support/SupportReflectorTest.php
index 55c4940f7543..df5b3e414e46 100644
--- a/tests/Support/SupportReflectorTest.php
+++ b/tests/Support/SupportReflectorTest.php
@@ -57,6 +57,20 @@ public function testUnionTypeName()
$this->assertNull(Reflector::getParameterClassName($method->getParameters()[0]));
}
+
+ public function testIsCallable()
+ {
+ $this->assertTrue(Reflector::isCallable(function () {
+ }));
+ $this->assertTrue(Reflector::isCallable([B::class, 'f']));
+ $this->assertFalse(Reflector::isCallable([TestClassWithCall::class, 'f']));
+ $this->assertTrue(Reflector::isCallable([new TestClassWithCall, 'f']));
+ $this->assertTrue(Reflector::isCallable([TestClassWithCallStatic::class, 'f']));
+ $this->assertFalse(Reflector::isCallable([new TestClassWithCallStatic, 'f']));
+ $this->assertFalse(Reflector::isCallable([new TestClassWithCallStatic]));
+ $this->assertFalse(Reflector::isCallable(['TotallyMissingClass', 'foo']));
+ $this->assertTrue(Reflector::isCallable(['TotallyMissingClass', 'foo'], true));
+ }
}
class A
@@ -82,3 +96,17 @@ public function f(A|Model $x)
}'
);
}
+
+class TestClassWithCall
+{
+ public function __call($method, $parameters)
+ {
+ }
+}
+
+class TestClassWithCallStatic
+{
+ public static function __callStatic($method, $parameters)
+ {
+ }
+}
diff --git a/tests/Support/SupportStringableTest.php b/tests/Support/SupportStringableTest.php
index f742dfba6753..1986d050de9c 100644
--- a/tests/Support/SupportStringableTest.php
+++ b/tests/Support/SupportStringableTest.php
@@ -2,6 +2,7 @@
namespace Illuminate\Tests\Support;
+use Illuminate\Support\Collection;
use Illuminate\Support\Stringable;
use PHPUnit\Framework\TestCase;
@@ -16,6 +17,14 @@ protected function stringable($string = '')
return new Stringable($string);
}
+ public function testClassBasename()
+ {
+ $this->assertEquals(
+ class_basename(static::class),
+ $this->stringable(static::class)->classBasename()
+ );
+ }
+
public function testIsAscii()
{
$this->assertTrue($this->stringable('A')->isAscii());
@@ -528,4 +537,12 @@ public function testPadRight()
$this->assertSame('Alien-----', (string) $this->stringable('Alien')->padRight(10, '-'));
$this->assertSame('Alien ', (string) $this->stringable('Alien')->padRight(10));
}
+
+ public function testChunk()
+ {
+ $chunks = $this->stringable('foobarbaz')->split(3);
+
+ $this->assertInstanceOf(Collection::class, $chunks);
+ $this->assertSame(['foo', 'bar', 'baz'], $chunks->all());
+ }
}
diff --git a/tests/Support/SupportTestingEventFakeTest.php b/tests/Support/SupportTestingEventFakeTest.php
index 3a9ccc6cdd3b..d51562d10c58 100644
--- a/tests/Support/SupportTestingEventFakeTest.php
+++ b/tests/Support/SupportTestingEventFakeTest.php
@@ -118,6 +118,21 @@ function ($event, $payload) {
$fake->assertDispatched('Bar');
$fake->assertNotDispatched('Baz');
}
+
+ public function testAssertNothingDispatched()
+ {
+ $this->fake->assertNothingDispatched();
+
+ $this->fake->dispatch(EventStub::class);
+ $this->fake->dispatch(EventStub::class);
+
+ try {
+ $this->fake->assertNothingDispatched();
+ $this->fail();
+ } catch (ExpectationFailedException $e) {
+ $this->assertThat($e, new ExceptionMessage('2 unexpected events were dispatched.'));
+ }
+ }
}
class EventStub
diff --git a/tests/Testing/TestResponseTest.php b/tests/Testing/TestResponseTest.php
index 89bfa46b272d..a231783eb804 100644
--- a/tests/Testing/TestResponseTest.php
+++ b/tests/Testing/TestResponseTest.php
@@ -2,8 +2,11 @@
namespace Illuminate\Tests\Foundation;
+use Illuminate\Container\Container;
use Illuminate\Contracts\View\View;
+use Illuminate\Cookie\CookieValuePrefix;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Encryption\Encrypter;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Http\Response;
use Illuminate\Testing\TestResponse;
@@ -13,6 +16,7 @@
use PHPUnit\Framework\ExpectationFailedException;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Cookie;
class TestResponseTest extends TestCase
{
@@ -130,6 +134,50 @@ public function testAssertViewMissingNested()
$response->assertViewMissing('foo.baz');
}
+ public function testAssertSee()
+ {
+ $response = $this->makeMockResponse([
+ 'render' => '
',
+ ]);
+
+ $response->assertSee('foo');
+ $response->assertSee(['baz', 'bar']);
+ }
+
+ public function testAssertSeeCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => '
',
+ ]);
+
+ $response->assertSee('item');
+ $response->assertSee(['not', 'found']);
+ }
+
+ public function testAssertSeeEscaped()
+ {
+ $response = $this->makeMockResponse([
+ 'render' => 'laravel & php & friends',
+ ]);
+
+ $response->assertSee('laravel & php');
+ $response->assertSee(['php & friends', 'laravel & php']);
+ }
+
+ public function testAssertSeeEscapedCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => 'laravel & php & friends',
+ ]);
+
+ $response->assertSee('foo & bar');
+ $response->assertSee(['bar & baz', 'baz & qux']);
+ }
+
public function testAssertSeeInOrder()
{
$response = $this->makeMockResponse([
@@ -166,19 +214,45 @@ public function testAssertSeeInOrderCanFail2()
public function testAssertSeeText()
{
$response = $this->makeMockResponse([
- 'render' => 'foo
bar',
+ 'render' => 'foo
barbaz
qux',
]);
$response->assertSeeText('foobar');
+ $response->assertSeeText(['bazqux', 'foobar']);
+ }
+
+ public function testAssertSeeTextCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => 'foo
bar',
+ ]);
+
+ $response->assertSeeText('bazfoo');
+ $response->assertSeeText(['bazfoo', 'barqux']);
}
public function testAssertSeeTextEscaped()
{
$response = $this->makeMockResponse([
- 'render' => 'laravel & php',
+ 'render' => 'laravel & php & friends',
]);
$response->assertSeeText('laravel & php');
+ $response->assertSeeText(['php & friends', 'laravel & php']);
+ }
+
+ public function testAssertSeeTextEscapedCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => 'laravel & php & friends',
+ ]);
+
+ $response->assertSeeText('foo & bar');
+ $response->assertSeeText(['foo & bar', 'bar & baz']);
}
public function testAssertSeeTextInOrder()
@@ -223,6 +297,94 @@ public function testAssertSeeTextInOrderCanFail2()
$response->assertSeeTextInOrder(['foobar', 'qux', 'baz']);
}
+ public function testAssertDontSee()
+ {
+ $response = $this->makeMockResponse([
+ 'render' => '
',
+ ]);
+
+ $response->assertDontSee('laravel');
+ $response->assertDontSee(['php', 'friends']);
+ }
+
+ public function testAssertDontSeeCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => '
',
+ ]);
+
+ $response->assertDontSee('foo');
+ $response->assertDontSee(['baz', 'bar']);
+ }
+
+ public function testAssertDontSeeEscaped()
+ {
+ $response = $this->makeMockResponse([
+ 'render' => 'laravel & php & friends',
+ ]);
+
+ $response->assertDontSee('foo & bar');
+ $response->assertDontSee(['bar & baz', 'foo & bar']);
+ }
+
+ public function testAssertDontSeeEscapedCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => 'laravel & php & friends',
+ ]);
+
+ $response->assertDontSee('laravel & php');
+ $response->assertDontSee(['php & friends', 'laravel & php']);
+ }
+
+ public function testAssertDontSeeText()
+ {
+ $response = $this->makeMockResponse([
+ 'render' => 'foo
barbaz
qux',
+ ]);
+
+ $response->assertDontSeeText('laravelphp');
+ $response->assertDontSeeText(['phpfriends', 'laravelphp']);
+ }
+
+ public function testAssertDontSeeTextCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => 'foo
barbaz
qux',
+ ]);
+
+ $response->assertDontSeeText('foobar');
+ $response->assertDontSeeText(['bazqux', 'foobar']);
+ }
+
+ public function testAssertDontSeeTextEscaped()
+ {
+ $response = $this->makeMockResponse([
+ 'render' => 'laravel & php & friends',
+ ]);
+
+ $response->assertDontSeeText('foo & bar');
+ $response->assertDontSeeText(['bar & baz', 'foo & bar']);
+ }
+
+ public function testAssertDontSeeTextEscapedCanFail()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $response = $this->makeMockResponse([
+ 'render' => 'laravel & php & friends',
+ ]);
+
+ $response->assertDontSeeText('laravel & php');
+ $response->assertDontSeeText(['php & friends', 'laravel & php']);
+ }
+
public function testAssertOk()
{
$statusCode = 500;
@@ -996,6 +1158,79 @@ public function testItCanBeTapped()
})->assertStatus(418);
}
+ public function testAssertPlainCookie()
+ {
+ $response = TestResponse::fromBaseResponse(
+ (new Response())->withCookie(new Cookie('cookie-name', 'cookie-value'))
+ );
+
+ $response->assertPlainCookie('cookie-name', 'cookie-value');
+ }
+
+ public function testAssertCookie()
+ {
+ $container = Container::getInstance();
+ $encrypter = new Encrypter(str_repeat('a', 16));
+ $container->singleton('encrypter', function () use ($encrypter) {
+ return $encrypter;
+ });
+
+ $cookieName = 'cookie-name';
+ $cookieValue = 'cookie-value';
+ $encryptedValue = $encrypter->encrypt(CookieValuePrefix::create($cookieName, $encrypter->getKey()).$cookieValue, false);
+
+ $response = TestResponse::fromBaseResponse(
+ (new Response())->withCookie(new Cookie($cookieName, $encryptedValue))
+ );
+
+ $response->assertCookie($cookieName, $cookieValue);
+ }
+
+ public function testAssertCookieExpired()
+ {
+ $response = TestResponse::fromBaseResponse(
+ (new Response())->withCookie(new Cookie('cookie-name', 'cookie-value', time() - 5000))
+ );
+
+ $response->assertCookieExpired('cookie-name');
+ }
+
+ public function testAssertSessionCookieExpiredDoesNotTriggerOnSessionCookies()
+ {
+ $response = TestResponse::fromBaseResponse(
+ (new Response())->withCookie(new Cookie('cookie-name', 'cookie-value', 0))
+ );
+
+ $this->expectException(ExpectationFailedException::class);
+
+ $response->assertCookieExpired('cookie-name');
+ }
+
+ public function testAssertCookieNotExpired()
+ {
+ $response = TestResponse::fromBaseResponse(
+ (new Response())->withCookie(new Cookie('cookie-name', 'cookie-value', time() + 5000))
+ );
+
+ $response->assertCookieNotExpired('cookie-name');
+ }
+
+ public function testAssertSessionCookieNotExpired()
+ {
+ $response = TestResponse::fromBaseResponse(
+ (new Response())->withCookie(new Cookie('cookie-name', 'cookie-value', 0))
+ );
+
+ $response->assertCookieNotExpired('cookie-name');
+ }
+
+ public function testAssertCookieMissing()
+ {
+ $response = TestResponse::fromBaseResponse(new Response());
+
+ $response->assertCookieMissing('cookie-name');
+ }
+
private function makeMockResponse($content)
{
$baseResponse = tap(new Response, function ($response) use ($content) {
@@ -1028,7 +1263,7 @@ public function jsonSerialize()
],
'barfoo' => [
['bar' => ['bar' => 'foo 0']],
- ['bar' => ['bar' => 'foo 0', 'bar' => 'foo 0']],
+ ['bar' => ['bar' => 'foo 0', 'foo' => 'foo 0']],
['bar' => ['foo' => 'bar 0', 'bar' => 'foo 0', 'rab' => 'rab 0']],
],
'numeric_keys' => [
diff --git a/tests/Translation/TranslationTranslatorTest.php b/tests/Translation/TranslationTranslatorTest.php
index a660c8e864aa..d52f4c46147b 100755
--- a/tests/Translation/TranslationTranslatorTest.php
+++ b/tests/Translation/TranslationTranslatorTest.php
@@ -18,19 +18,19 @@ protected function tearDown(): void
public function testHasMethodReturnsFalseWhenReturnedTranslationIsNull()
{
- $t = $this->getMockBuilder(Translator::class)->setMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
+ $t = $this->getMockBuilder(Translator::class)->onlyMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
$t->expects($this->once())->method('get')->with($this->equalTo('foo'), $this->equalTo([]), $this->equalTo('bar'))->willReturn('foo');
$this->assertFalse($t->has('foo', 'bar'));
- $t = $this->getMockBuilder(Translator::class)->setMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en', 'sp'])->getMock();
+ $t = $this->getMockBuilder(Translator::class)->onlyMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en', 'sp'])->getMock();
$t->expects($this->once())->method('get')->with($this->equalTo('foo'), $this->equalTo([]), $this->equalTo('bar'))->willReturn('bar');
$this->assertTrue($t->has('foo', 'bar'));
- $t = $this->getMockBuilder(Translator::class)->setMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
+ $t = $this->getMockBuilder(Translator::class)->onlyMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
$t->expects($this->once())->method('get')->with($this->equalTo('foo'), $this->equalTo([]), $this->equalTo('bar'), false)->willReturn('bar');
$this->assertTrue($t->hasForLocale('foo', 'bar'));
- $t = $this->getMockBuilder(Translator::class)->setMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
+ $t = $this->getMockBuilder(Translator::class)->onlyMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
$t->expects($this->once())->method('get')->with($this->equalTo('foo'), $this->equalTo([]), $this->equalTo('bar'), false)->willReturn('foo');
$this->assertFalse($t->hasForLocale('foo', 'bar'));
@@ -76,7 +76,7 @@ public function testTransMethodProperlyLoadsAndRetrievesItemWithHTMLInTheMessage
public function testGetMethodProperlyLoadsAndRetrievesItemWithCapitalization()
{
- $t = $this->getMockBuilder(Translator::class)->setMethods(null)->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
+ $t = $this->getMockBuilder(Translator::class)->onlyMethods([])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
$t->getLoader()->shouldReceive('load')->once()->with('en', '*', '*')->andReturn([]);
$t->getLoader()->shouldReceive('load')->once()->with('en', 'bar', 'foo')->andReturn(['foo' => 'foo', 'baz' => 'breeze :Foo :BAR']);
$this->assertSame('breeze Bar FOO', $t->get('foo::bar.baz', ['foo' => 'bar', 'bar' => 'foo'], 'en'));
@@ -114,7 +114,7 @@ public function testGetMethodProperlyLoadsAndRetrievesItemForGlobalNamespace()
public function testChoiceMethodProperlyLoadsAndRetrievesItem()
{
- $t = $this->getMockBuilder(Translator::class)->setMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
+ $t = $this->getMockBuilder(Translator::class)->onlyMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
$t->expects($this->once())->method('get')->with($this->equalTo('foo'), $this->equalTo(['replace']), $this->equalTo('en'))->willReturn('line');
$t->setSelector($selector = m::mock(MessageSelector::class));
$selector->shouldReceive('choose')->once()->with('line', 10, 'en')->andReturn('choiced');
@@ -124,7 +124,7 @@ public function testChoiceMethodProperlyLoadsAndRetrievesItem()
public function testChoiceMethodProperlyCountsCollectionsAndLoadsAndRetrievesItem()
{
- $t = $this->getMockBuilder(Translator::class)->setMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
+ $t = $this->getMockBuilder(Translator::class)->onlyMethods(['get'])->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
$t->expects($this->exactly(2))->method('get')->with($this->equalTo('foo'), $this->equalTo(['replace']), $this->equalTo('en'))->willReturn('line');
$t->setSelector($selector = m::mock(MessageSelector::class));
$selector->shouldReceive('choose')->twice()->with('line', 3, 'en')->andReturn('choiced');
diff --git a/tests/Validation/ValidationFactoryTest.php b/tests/Validation/ValidationFactoryTest.php
index 5a3019a411fa..a309bebdab30 100755
--- a/tests/Validation/ValidationFactoryTest.php
+++ b/tests/Validation/ValidationFactoryTest.php
@@ -73,7 +73,7 @@ public function testValidateCallsValidateOnTheValidator()
['foo' => 'required']
);
- $this->assertEquals($validated, ['foo' => 'bar']);
+ $this->assertEquals(['foo' => 'bar'], $validated);
}
public function testCustomResolverIsCalled()
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
index 826aeef296c3..3a97c0c962d1 100755
--- a/tests/Validation/ValidationValidatorTest.php
+++ b/tests/Validation/ValidationValidatorTest.php
@@ -61,7 +61,7 @@ public function testNestedErrorMessagesAreRetrievedFromLocalArray()
]);
$this->assertFalse($v->passes());
- $this->assertEquals('post name is required', $v->errors()->all()[0]);
+ $this->assertSame('post name is required', $v->errors()->all()[0]);
}
public function testSometimesWorksOnNestedArrays()
@@ -1301,9 +1301,9 @@ public function testGreaterThan()
$v = new Validator($trans, ['lhs' => ['string'], 'rhs' => [1, 'string']], ['lhs' => 'gt:rhs']);
$this->assertTrue($v->fails());
- $fileOne = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileOne = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileOne->expects($this->any())->method('getSize')->willReturn(5472);
- $fileTwo = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileTwo = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileTwo->expects($this->any())->method('getSize')->willReturn(3151);
$v = new Validator($trans, ['lhs' => $fileOne, 'rhs' => $fileTwo], ['lhs' => 'gt:rhs']);
$this->assertTrue($v->passes());
@@ -1342,9 +1342,9 @@ public function testLessThan()
$v = new Validator($trans, ['lhs' => ['string'], 'rhs' => [1, 'string']], ['lhs' => 'lt:rhs']);
$this->assertTrue($v->passes());
- $fileOne = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileOne = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileOne->expects($this->any())->method('getSize')->willReturn(5472);
- $fileTwo = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileTwo = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileTwo->expects($this->any())->method('getSize')->willReturn(3151);
$v = new Validator($trans, ['lhs' => $fileOne, 'rhs' => $fileTwo], ['lhs' => 'lt:rhs']);
$this->assertTrue($v->fails());
@@ -1383,9 +1383,9 @@ public function testGreaterThanOrEqual()
$v = new Validator($trans, ['lhs' => ['string'], 'rhs' => [1, 'string']], ['lhs' => 'gte:rhs']);
$this->assertTrue($v->fails());
- $fileOne = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileOne = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileOne->expects($this->any())->method('getSize')->willReturn(5472);
- $fileTwo = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileTwo = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileTwo->expects($this->any())->method('getSize')->willReturn(5472);
$v = new Validator($trans, ['lhs' => $fileOne, 'rhs' => $fileTwo], ['lhs' => 'gte:rhs']);
$this->assertTrue($v->passes());
@@ -1424,9 +1424,9 @@ public function testLessThanOrEqual()
$v = new Validator($trans, ['lhs' => ['string'], 'rhs' => [1, 'string']], ['lhs' => 'lte:rhs']);
$this->assertTrue($v->passes());
- $fileOne = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileOne = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileOne->expects($this->any())->method('getSize')->willReturn(5472);
- $fileTwo = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $fileTwo = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$fileTwo->expects($this->any())->method('getSize')->willReturn(5472);
$v = new Validator($trans, ['lhs' => $fileOne, 'rhs' => $fileTwo], ['lhs' => 'lte:rhs']);
$this->assertTrue($v->passes());
@@ -1553,6 +1553,10 @@ public function testValidateJson()
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['foo' => '{"name":"John","age":"34"}'], ['foo' => 'json']);
$this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => ['array']], ['foo' => 'json']);
+ $this->assertFalse($v->passes());
}
public function testValidateBoolean()
@@ -1727,12 +1731,12 @@ public function testValidateSize()
$v = new Validator($trans, ['foo' => [1, 2, 3]], ['foo' => 'Array|Size:4']);
$this->assertFalse($v->passes());
- $file = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(3072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Size:3']);
$this->assertTrue($v->passes());
- $file = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Size:3']);
$this->assertFalse($v->passes());
@@ -1765,12 +1769,12 @@ public function testValidateBetween()
$v = new Validator($trans, ['foo' => [1, 2, 3]], ['foo' => 'Array|Between:1,2']);
$this->assertFalse($v->passes());
- $file = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(3072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Between:1,5']);
$this->assertTrue($v->passes());
- $file = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Between:1,2']);
$this->assertFalse($v->passes());
@@ -1797,12 +1801,12 @@ public function testValidateMin()
$v = new Validator($trans, ['foo' => [1, 2]], ['foo' => 'Array|Min:3']);
$this->assertFalse($v->passes());
- $file = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(3072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Min:2']);
$this->assertTrue($v->passes());
- $file = $this->getMockBuilder(File::class)->setMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(File::class)->onlyMethods(['getSize'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Min:10']);
$this->assertFalse($v->passes());
@@ -1829,24 +1833,112 @@ public function testValidateMax()
$v = new Validator($trans, ['foo' => [1, 2, 3]], ['foo' => 'Array|Max:2']);
$this->assertFalse($v->passes());
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['isValid', 'getSize'])->setConstructorArgs([__FILE__, basename(__FILE__)])->getMock();
- $file->expects($this->any())->method('isValid')->willReturn(true);
- $file->expects($this->at(1))->method('getSize')->willReturn(3072);
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['isValid', 'getSize'])->setConstructorArgs([__FILE__, basename(__FILE__)])->getMock();
+ $file->method('isValid')->willReturn(true);
+ $file->method('getSize')->willReturn(3072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Max:10']);
$this->assertTrue($v->passes());
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['isValid', 'getSize'])->setConstructorArgs([__FILE__, basename(__FILE__)])->getMock();
- $file->expects($this->at(0))->method('isValid')->willReturn(true);
- $file->expects($this->at(1))->method('getSize')->willReturn(4072);
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['isValid', 'getSize'])->setConstructorArgs([__FILE__, basename(__FILE__)])->getMock();
+ $file->method('isValid')->willReturn(true);
+ $file->method('getSize')->willReturn(4072);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Max:2']);
$this->assertFalse($v->passes());
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['isValid'])->setConstructorArgs([__FILE__, basename(__FILE__)])->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['isValid'])->setConstructorArgs([__FILE__, basename(__FILE__)])->getMock();
$file->expects($this->any())->method('isValid')->willReturn(false);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Max:10']);
$this->assertFalse($v->passes());
}
+ /**
+ * @param mixed $input
+ * @param mixed $allowed
+ * @param bool $passes
+ *
+ * @dataProvider multipleOfDataProvider
+ */
+ public function testValidateMutlpleOf($input, $allowed, $passes)
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+ $trans->addLines(['validation.multiple_of' => 'The :attribute must be a multiple of :value'], 'en');
+
+ $v = new Validator($trans, ['foo' => $input], ['foo' => "multiple_of:{$allowed}"]);
+
+ $this->assertSame($passes, $v->passes());
+ if ($v->fails()) {
+ $this->assertSame("The foo must be a multiple of {$allowed}", $v->messages()->first('foo'));
+ } else {
+ $this->assertSame('', $v->messages()->first('foo'));
+ }
+ }
+
+ public function multipleOfDataProvider()
+ {
+ return [
+ [0, 0, false], // zero (same)
+ [0, 10, true], // zero + integer
+ [10, 0, false],
+ [0, 10.1, true], // zero + float
+ [10.1, 0, false],
+ [0, -10, true], // zero + -integer
+ [-10, 0, false],
+ [0, -10.1, true], // zero + -float
+ [-10.1, 0, false],
+ [10, 10, true], // integer (same)
+ [10, 5, true], // integer + integer
+ [10, 4, false],
+ [20, 10, true],
+ [5, 10, false],
+ [10, -5, true], // integer + -integer
+ [10, -4, false],
+ [-20, 10, true],
+ [-5, 10, false],
+ [-10, -10, true], // -integer (same)
+ [-10, -5, true], // -integer + -integer
+ [-10, -4, false],
+ [-20, -10, true],
+ [-5, -10, false],
+ [10, 10.0, true], // integer + float (same)
+ [10, 5.0, true], // integer + float
+ [10, 4.0, false],
+ [20.0, 10, true],
+ [5.0, 10, false],
+ [10.0, -10.0, true], // integer + -float (same)
+ [10, -5.0, true], // integer + -float
+ [10, -4.0, false],
+ [-20.0, 10, true],
+ [-5.0, 10, false],
+ [10.0, -10.0, true], // -integer + float (same)
+ [-10, 5.0, true], // -integer + float
+ [-10, 4.0, false],
+ [20.0, -10, true],
+ [5.0, -10, false],
+ [10.5, 10.5, true], // float (same)
+ [10.5, 0.5, true], // float + float
+ [10.5, 0.3, true], // 10.5/.3 = 35, tricky for floating point division
+ [31.5, 10.5, true],
+ [31.6, 10.5, false],
+ [10.5, -0.5, true], // float + -float
+ [10.5, -0.3, true], // 10.5/.3 = 35, tricky for floating point division
+ [-31.5, 10.5, true],
+ [-31.6, 10.5, false],
+ [-10.5, -10.5, true], // -float (same)
+ [-10.5, -0.5, true], // -float + -float
+ [-10.5, -0.3, true], // 10.5/.3 = 35, tricky for floating point division
+ [-31.5, -10.5, true],
+ [-31.6, -10.5, false],
+ [2, .1, true], // fmod does this "wrong", it should be 0, but fmod(2, .1) = .1
+ [.75, .05, true], // fmod does this "wrong", it should be 0, but fmod(.75, .05) = .05
+ [.9, .3, true], // .9/.3 = 3, tricky for floating point division
+ ['foo', 1, false], // invalid values
+ [1, 'foo', false],
+ ['foo', 'foo', false],
+ [1, '', false],
+ [1, null, false],
+ ];
+ }
+
public function testProperMessagesAreReturnedForSizes()
{
$trans = $this->getIlluminateArrayTranslator();
@@ -1861,7 +1953,7 @@ public function testProperMessagesAreReturnedForSizes()
$v->messages()->setFormat(':message');
$this->assertSame('string', $v->messages()->first('name'));
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$file->expects($this->any())->method('isValid')->willReturn(true);
$v = new Validator($trans, ['photo' => $file], ['photo' => 'Max:3']);
@@ -1897,10 +1989,10 @@ public function testValidateGtPlaceHolderIsReplacedProperly()
$v->messages()->setFormat(':message');
$this->assertSame('minimum value', $v->messages()->first('max'));
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$file->expects($this->any())->method('isValid')->willReturn(true);
- $biggerFile = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $biggerFile = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$biggerFile->expects($this->any())->method('getSize')->willReturn(5120);
$biggerFile->expects($this->any())->method('isValid')->willReturn(true);
$v = new Validator($trans, ['photo' => $file, 'bigger' => $biggerFile], ['photo' => 'file|gt:bigger']);
@@ -1939,10 +2031,10 @@ public function testValidateLtPlaceHolderIsReplacedProperly()
$v->messages()->setFormat(':message');
$this->assertSame('maximum value', $v->messages()->first('min'));
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$file->expects($this->any())->method('isValid')->willReturn(true);
- $smallerFile = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $smallerFile = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$smallerFile->expects($this->any())->method('getSize')->willReturn(2048);
$smallerFile->expects($this->any())->method('isValid')->willReturn(true);
$v = new Validator($trans, ['photo' => $file, 'smaller' => $smallerFile], ['photo' => 'file|lt:smaller']);
@@ -1981,10 +2073,10 @@ public function testValidateGtePlaceHolderIsReplacedProperly()
$v->messages()->setFormat(':message');
$this->assertSame('minimum value', $v->messages()->first('max'));
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$file->expects($this->any())->method('isValid')->willReturn(true);
- $biggerFile = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $biggerFile = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$biggerFile->expects($this->any())->method('getSize')->willReturn(5120);
$biggerFile->expects($this->any())->method('isValid')->willReturn(true);
$v = new Validator($trans, ['photo' => $file, 'bigger' => $biggerFile], ['photo' => 'file|gte:bigger']);
@@ -2023,10 +2115,10 @@ public function testValidateLtePlaceHolderIsReplacedProperly()
$v->messages()->setFormat(':message');
$this->assertSame('maximum value', $v->messages()->first('min'));
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$file->expects($this->any())->method('getSize')->willReturn(4072);
$file->expects($this->any())->method('isValid')->willReturn(true);
- $smallerFile = $this->getMockBuilder(UploadedFile::class)->setMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
+ $smallerFile = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['getSize', 'isValid'])->setConstructorArgs([__FILE__, false])->getMock();
$smallerFile->expects($this->any())->method('getSize')->willReturn(2048);
$smallerFile->expects($this->any())->method('isValid')->willReturn(true);
$v = new Validator($trans, ['photo' => $file, 'smaller' => $smallerFile], ['photo' => 'file|lte:smaller']);
@@ -2742,47 +2834,66 @@ public function testValidateImage()
$trans = $this->getIlluminateArrayTranslator();
$uploadedFile = [__FILE__, '', null, null, true];
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file->expects($this->any())->method('guessExtension')->willReturn('php');
$file->expects($this->any())->method('getClientOriginalExtension')->willReturn('php');
- $v = new Validator($trans, ['x' => $file], ['x' => 'Image']);
+ $v = new Validator($trans, ['x' => $file], ['x' => 'image']);
$this->assertFalse($v->passes());
- $file2 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file2->expects($this->any())->method('guessExtension')->willReturn('jpeg');
$file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpeg');
- $v = new Validator($trans, ['x' => $file2], ['x' => 'Image']);
+ $v = new Validator($trans, ['x' => $file2], ['x' => 'image']);
$this->assertTrue($v->passes());
- $file3 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file2->expects($this->any())->method('guessExtension')->willReturn('jpg');
+ $file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
+ $v = new Validator($trans, ['x' => $file2], ['x' => 'image']);
+ $this->assertTrue($v->passes());
+
+ $file2 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file2->expects($this->any())->method('guessExtension')->willReturn('jpg');
+ $file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
+ $v = new Validator($trans, ['x' => $file2], ['x' => 'image']);
+ $this->assertTrue($v->passes());
+
+ $file3 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file3->expects($this->any())->method('guessExtension')->willReturn('gif');
$file3->expects($this->any())->method('getClientOriginalExtension')->willReturn('gif');
- $v = new Validator($trans, ['x' => $file3], ['x' => 'Image']);
+ $v = new Validator($trans, ['x' => $file3], ['x' => 'image']);
$this->assertTrue($v->passes());
- $file4 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file4 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file4->expects($this->any())->method('guessExtension')->willReturn('bmp');
$file4->expects($this->any())->method('getClientOriginalExtension')->willReturn('bmp');
- $v = new Validator($trans, ['x' => $file4], ['x' => 'Image']);
+ $v = new Validator($trans, ['x' => $file4], ['x' => 'image']);
$this->assertTrue($v->passes());
- $file5 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file5 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file5->expects($this->any())->method('guessExtension')->willReturn('png');
$file5->expects($this->any())->method('getClientOriginalExtension')->willReturn('png');
- $v = new Validator($trans, ['x' => $file5], ['x' => 'Image']);
+ $v = new Validator($trans, ['x' => $file5], ['x' => 'image']);
$this->assertTrue($v->passes());
- $file6 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file6 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file6->expects($this->any())->method('guessExtension')->willReturn('svg');
$file6->expects($this->any())->method('getClientOriginalExtension')->willReturn('svg');
- $v = new Validator($trans, ['x' => $file6], ['x' => 'Image']);
+ $v = new Validator($trans, ['x' => $file6], ['x' => 'image']);
$this->assertTrue($v->passes());
- $file7 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file7 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file7->expects($this->any())->method('guessExtension')->willReturn('webp');
$file7->expects($this->any())->method('getClientOriginalExtension')->willReturn('webp');
+
$v = new Validator($trans, ['x' => $file7], ['x' => 'Image']);
$this->assertTrue($v->passes());
+
+ $file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file2->expects($this->any())->method('guessExtension')->willReturn('jpg');
+ $file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
+ $v = new Validator($trans, ['x' => $file2], ['x' => 'Image']);
+ $this->assertTrue($v->passes());
}
public function testValidateImageDoesNotAllowPhpExtensionsOnImageMime()
@@ -2790,10 +2901,10 @@ public function testValidateImageDoesNotAllowPhpExtensionsOnImageMime()
$trans = $this->getIlluminateArrayTranslator();
$uploadedFile = [__FILE__, '', null, null, true];
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file->expects($this->any())->method('guessExtension')->willReturn('jpeg');
$file->expects($this->any())->method('getClientOriginalExtension')->willReturn('php');
- $v = new Validator($trans, ['x' => $file], ['x' => 'Image']);
+ $v = new Validator($trans, ['x' => $file], ['x' => 'image']);
$this->assertFalse($v->passes());
}
@@ -2906,20 +3017,30 @@ public function testValidateImageDimensions()
$this->assertFalse($v->passes());
}
- /**
- * @requires extension fileinfo
- */
- public function testValidatePhpMimetypes()
+ public function testValidateMimetypes()
{
$trans = $this->getIlluminateArrayTranslator();
+
$uploadedFile = [__DIR__.'/ValidationRuleTest.php', '', null, null, true];
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file->expects($this->any())->method('guessExtension')->willReturn('rtf');
$file->expects($this->any())->method('getClientOriginalExtension')->willReturn('rtf');
+ $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getMimeType'])->setConstructorArgs($uploadedFile)->getMock();
+ $file->expects($this->any())->method('getMimeType')->willReturn('text/rtf');
$v = new Validator($trans, ['x' => $file], ['x' => 'mimetypes:text/*']);
$this->assertTrue($v->passes());
+
+ $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getMimeType'])->setConstructorArgs($uploadedFile)->getMock();
+ $file->expects($this->any())->method('getMimeType')->willReturn('application/pdf');
+ $v = new Validator($trans, ['x' => $file], ['x' => 'mimetypes:text/rtf']);
+ $this->assertFalse($v->passes());
+
+ $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['getMimeType'])->setConstructorArgs($uploadedFile)->getMock();
+ $file->expects($this->any())->method('getMimeType')->willReturn('image/jpeg');
+ $v = new Validator($trans, ['x' => $file], ['x' => 'mimetypes:image/jpeg']);
+ $this->assertTrue($v->passes());
}
public function testValidateMime()
@@ -2927,17 +3048,29 @@ public function testValidateMime()
$trans = $this->getIlluminateArrayTranslator();
$uploadedFile = [__FILE__, '', null, null, true];
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file->expects($this->any())->method('guessExtension')->willReturn('pdf');
$file->expects($this->any())->method('getClientOriginalExtension')->willReturn('pdf');
$v = new Validator($trans, ['x' => $file], ['x' => 'mimes:pdf']);
$this->assertTrue($v->passes());
- $file2 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'isValid'])->setConstructorArgs($uploadedFile)->getMock();
+ $file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'isValid'])->setConstructorArgs($uploadedFile)->getMock();
$file2->expects($this->any())->method('guessExtension')->willReturn('pdf');
$file2->expects($this->any())->method('isValid')->willReturn(false);
$v = new Validator($trans, ['x' => $file2], ['x' => 'mimes:pdf']);
$this->assertFalse($v->passes());
+
+ $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file->expects($this->any())->method('guessExtension')->willReturn('jpg');
+ $file->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
+ $v = new Validator($trans, ['x' => $file], ['x' => 'mimes:jpeg']);
+ $this->assertTrue($v->passes());
+
+ $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file->expects($this->any())->method('guessExtension')->willReturn('jpg');
+ $file->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpeg');
+ $v = new Validator($trans, ['x' => $file], ['x' => 'mimes:jpg']);
+ $this->assertTrue($v->passes());
}
public function testValidateMimeEnforcesPhpCheck()
@@ -2945,13 +3078,13 @@ public function testValidateMimeEnforcesPhpCheck()
$trans = $this->getIlluminateArrayTranslator();
$uploadedFile = [__FILE__, '', null, null, true];
- $file = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file->expects($this->any())->method('guessExtension')->willReturn('pdf');
$file->expects($this->any())->method('getClientOriginalExtension')->willReturn('php');
$v = new Validator($trans, ['x' => $file], ['x' => 'mimes:pdf']);
$this->assertFalse($v->passes());
- $file2 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+ $file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file2->expects($this->any())->method('guessExtension')->willReturn('php');
$file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('php');
$v = new Validator($trans, ['x' => $file2], ['x' => 'mimes:pdf,php']);
@@ -4602,19 +4735,19 @@ public function testParsingTablesFromModels()
$v = new Validator($trans, [], []);
$implicit_no_connection = $v->parseTable(ImplicitTableModel::class);
- $this->assertEquals(null, $implicit_no_connection[0]);
+ $this->assertNull($implicit_no_connection[0]);
$this->assertSame('implicit_table_models', $implicit_no_connection[1]);
$explicit_no_connection = $v->parseTable(ExplicitTableModel::class);
- $this->assertEquals(null, $explicit_no_connection[0]);
+ $this->assertNull($explicit_no_connection[0]);
$this->assertSame('explicits', $explicit_no_connection[1]);
$noneloquent_no_connection = $v->parseTable(NonEloquentModel::class);
- $this->assertEquals(null, $noneloquent_no_connection[0]);
+ $this->assertNull($noneloquent_no_connection[0]);
$this->assertEquals(NonEloquentModel::class, $noneloquent_no_connection[1]);
$raw_no_connection = $v->parseTable('table');
- $this->assertEquals(null, $raw_no_connection[0]);
+ $this->assertNull($raw_no_connection[0]);
$this->assertSame('table', $raw_no_connection[1]);
$implicit_connection = $v->parseTable('connection.'.ImplicitTableModel::class);
@@ -4665,10 +4798,13 @@ public function testInvalidMethod()
'*.name' => 'required',
]);
- $this->assertEquals($v->invalid(), [
- 1 => ['name' => null],
- 2 => ['name' => ''],
- ]);
+ $this->assertEquals(
+ [
+ 1 => ['name' => null],
+ 2 => ['name' => ''],
+ ],
+ $v->invalid()
+ );
$v = new Validator($trans,
[
@@ -4678,9 +4814,12 @@ public function testInvalidMethod()
'name' => 'required',
]);
- $this->assertEquals($v->invalid(), [
- 'name' => '',
- ]);
+ $this->assertEquals(
+ [
+ 'name' => '',
+ ],
+ $v->invalid()
+ );
}
public function testValidMethod()
@@ -4698,10 +4837,13 @@ public function testValidMethod()
'*.name' => 'required',
]);
- $this->assertEquals($v->valid(), [
- 0 => ['name' => 'John'],
- 3 => ['name' => 'Doe'],
- ]);
+ $this->assertEquals(
+ [
+ 0 => ['name' => 'John'],
+ 3 => ['name' => 'Doe'],
+ ],
+ $v->valid()
+ );
$v = new Validator($trans,
[
@@ -4715,10 +4857,13 @@ public function testValidMethod()
'age' => 'required|int',
]);
- $this->assertEquals($v->valid(), [
- 'name' => 'Carlos',
- 'gender' => 'male',
- ]);
+ $this->assertEquals(
+ [
+ 'name' => 'Carlos',
+ 'gender' => 'male',
+ ],
+ $v->valid()
+ );
}
public function testNestedInvalidMethod()
@@ -4741,12 +4886,15 @@ public function testNestedInvalidMethod()
'regex:/[A-F]{3}[0-9]{3}/',
],
]);
- $this->assertEquals($v->invalid(), [
- 'testinvalid' => '',
- 'records' => [
- 3 => 'ADCD23',
+ $this->assertEquals(
+ [
+ 'testinvalid' => '',
+ 'records' => [
+ 3 => 'ADCD23',
+ ],
],
- ]);
+ $v->invalid()
+ );
}
public function testMultipleFileUploads()
diff --git a/tests/View/Blade/BladeComponentTagCompilerTest.php b/tests/View/Blade/BladeComponentTagCompilerTest.php
index 6872d38ae4a1..b84030c13d2b 100644
--- a/tests/View/Blade/BladeComponentTagCompilerTest.php
+++ b/tests/View/Blade/BladeComponentTagCompilerTest.php
@@ -13,7 +13,7 @@
class BladeComponentTagCompilerTest extends AbstractBladeTestCase
{
- public function tearDown(): void
+ protected function tearDown(): void
{
Mockery::close();
}
diff --git a/tests/View/ComponentTest.php b/tests/View/ComponentTest.php
index 124d954d454e..8049c7aa5bc5 100644
--- a/tests/View/ComponentTest.php
+++ b/tests/View/ComponentTest.php
@@ -19,7 +19,7 @@ class ComponentTest extends TestCase
protected $viewFactory;
protected $config;
- public function setUp(): void
+ protected function setUp(): void
{
$this->config = m::mock(Config::class);
diff --git a/tests/View/ViewComponentTest.php b/tests/View/ViewComponentTest.php
index d72c84383028..8ce0b90349f1 100644
--- a/tests/View/ViewComponentTest.php
+++ b/tests/View/ViewComponentTest.php
@@ -25,7 +25,7 @@ public function testAttributeParentInheritance()
$component->withAttributes(['class' => 'foo', 'attributes' => new ComponentAttributeBag(['class' => 'bar', 'type' => 'button'])]);
- $this->assertEquals('class="foo bar" type="button"', (string) $component->attributes);
+ $this->assertSame('class="foo bar" type="button"', (string) $component->attributes);
}
public function testPublicMethodsWithNoArgsAreConvertedToStringableCallablesInvokedAndNotCached()
diff --git a/tests/View/ViewFactoryTest.php b/tests/View/ViewFactoryTest.php
index 52061422074e..ab003c3b9f9d 100755
--- a/tests/View/ViewFactoryTest.php
+++ b/tests/View/ViewFactoryTest.php
@@ -7,6 +7,7 @@
use Illuminate\Container\Container;
use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
use Illuminate\Contracts\View\Engine;
+use Illuminate\Contracts\View\View as ViewContract;
use Illuminate\Events\Dispatcher;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\HtmlString;
@@ -87,6 +88,7 @@ public function testFirstCreatesNewViewInstanceWithProperPath()
$factory->addExtension('php', 'php');
$view = $factory->first(['bar', 'view'], ['foo' => 'bar'], ['baz' => 'boom']);
+ $this->assertInstanceOf(ViewContract::class, $view);
$this->assertSame($engine, $view->getEngine());
$this->assertSame($_SERVER['__test.view'], $view);
diff --git a/tests/View/ViewTest.php b/tests/View/ViewTest.php
index d6e360f22b97..d4a3047a38de 100755
--- a/tests/View/ViewTest.php
+++ b/tests/View/ViewTest.php
@@ -127,12 +127,12 @@ public function testViewAcceptsArrayableImplementations()
public function testViewGettersSetters()
{
$view = $this->getView(['foo' => 'bar']);
- $this->assertEquals($view->name(), 'view');
- $this->assertEquals($view->getPath(), 'path');
+ $this->assertEquals('view', $view->name());
+ $this->assertEquals('path', $view->getPath());
$data = $view->getData();
- $this->assertEquals($data['foo'], 'bar');
+ $this->assertEquals('bar', $data['foo']);
$view->setPath('newPath');
- $this->assertEquals($view->getPath(), 'newPath');
+ $this->assertEquals('newPath', $view->getPath());
}
public function testViewArrayAccess()
@@ -140,9 +140,9 @@ public function testViewArrayAccess()
$view = $this->getView(['foo' => 'bar']);
$this->assertInstanceOf(ArrayAccess::class, $view);
$this->assertTrue($view->offsetExists('foo'));
- $this->assertEquals($view->offsetGet('foo'), 'bar');
+ $this->assertEquals('bar', $view->offsetGet('foo'));
$view->offsetSet('foo', 'baz');
- $this->assertEquals($view->offsetGet('foo'), 'baz');
+ $this->assertEquals('baz', $view->offsetGet('foo'));
$view->offsetUnset('foo');
$this->assertFalse($view->offsetExists('foo'));
}
@@ -152,9 +152,9 @@ public function testViewConstructedWithObjectData()
$view = $this->getView(new DataObjectStub);
$this->assertInstanceOf(ArrayAccess::class, $view);
$this->assertTrue($view->offsetExists('foo'));
- $this->assertEquals($view->offsetGet('foo'), 'bar');
+ $this->assertEquals('bar', $view->offsetGet('foo'));
$view->offsetSet('foo', 'baz');
- $this->assertEquals($view->offsetGet('foo'), 'baz');
+ $this->assertEquals('baz', $view->offsetGet('foo'));
$view->offsetUnset('foo');
$this->assertFalse($view->offsetExists('foo'));
}
@@ -163,9 +163,9 @@ public function testViewMagicMethods()
{
$view = $this->getView(['foo' => 'bar']);
$this->assertTrue(isset($view->foo));
- $this->assertEquals($view->foo, 'bar');
+ $this->assertEquals('bar', $view->foo);
$view->foo = 'baz';
- $this->assertEquals($view->foo, 'baz');
+ $this->assertEquals('baz', $view->foo);
$this->assertEquals($view['foo'], $view->foo);
unset($view->foo);
$this->assertFalse(isset($view->foo));
@@ -208,8 +208,8 @@ public function testViewRenderSections()
$view->getFactory()->shouldReceive('getSections')->once()->andReturn(['foo', 'bar']);
$sections = $view->renderSections();
- $this->assertEquals($sections[0], 'foo');
- $this->assertEquals($sections[1], 'bar');
+ $this->assertEquals('foo', $sections[0]);
+ $this->assertEquals('bar', $sections[1]);
}
public function testWithErrors()
@@ -219,18 +219,18 @@ public function testWithErrors()
$this->assertSame($view, $view->withErrors($errors));
$this->assertInstanceOf(ViewErrorBag::class, $view->errors);
$foo = $view->errors->get('foo');
- $this->assertEquals($foo[0], 'bar');
+ $this->assertEquals('bar', $foo[0]);
$qu = $view->errors->get('qu');
- $this->assertEquals($qu[0], 'ux');
+ $this->assertEquals('ux', $qu[0]);
$data = ['foo' => 'baz'];
$this->assertSame($view, $view->withErrors(new MessageBag($data)));
$foo = $view->errors->get('foo');
- $this->assertEquals($foo[0], 'baz');
+ $this->assertEquals('baz', $foo[0]);
$foo = $view->errors->getBag('default')->get('foo');
- $this->assertEquals($foo[0], 'baz');
+ $this->assertEquals('baz', $foo[0]);
$this->assertSame($view, $view->withErrors(new MessageBag($data), 'login'));
$foo = $view->errors->getBag('login')->get('foo');
- $this->assertEquals($foo[0], 'baz');
+ $this->assertEquals('baz', $foo[0]);
}
protected function getView($data = [])
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
-
-
-
+