', trim($view));
}
@@ -30,11 +30,52 @@ 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_inline_link_type_attributes_dont_add_extra_spacing_at_end()
+ {
+ $view = View::make('uses-link')->render();
+
+ $this->assertSame('This is a sentence with a
link.', 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));
+ }
+
+ public function tested_nested_anonymous_attribute_proxying_works_correctly()
+ {
+ $view = View::make('uses-child-input')->render();
+
+ $this->assertSame('
', trim($view));
+ }
+
protected function getEnvironmentSetUp($app)
{
$app['config']->set('view.paths', [__DIR__.'/templates']);
diff --git a/tests/Integration/View/RenderableViewExceptionTest.php b/tests/Integration/View/RenderableViewExceptionTest.php
new file mode 100644
index 000000000000..93c91cb31387
--- /dev/null
+++ b/tests/Integration/View/RenderableViewExceptionTest.php
@@ -0,0 +1,36 @@
+get('/');
+
+ $response->assertSee('This is a renderable exception.');
+ }
+
+ protected function getEnvironmentSetUp($app)
+ {
+ $app['config']->set('view.paths', [__DIR__.'/templates']);
+ }
+}
+
+class RenderableException extends Exception
+{
+ public function render($request)
+ {
+ return new Response('This is a renderable exception.');
+ }
+}
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/base-input.blade.php b/tests/Integration/View/templates/components/base-input.blade.php
new file mode 100644
index 000000000000..4d8f09367c55
--- /dev/null
+++ b/tests/Integration/View/templates/components/base-input.blade.php
@@ -0,0 +1,11 @@
+@props(['disabled' => false])
+
+@php
+if ($disabled) {
+ $class = 'disabled-class';
+} else {
+ $class = 'not-disabled-class';
+}
+@endphp
+
+
merge(['class' => $class]) }} {{ $disabled ? 'disabled' : '' }} />
\ No newline at end of file
diff --git a/tests/Integration/View/templates/components/child-input.blade.php b/tests/Integration/View/templates/components/child-input.blade.php
new file mode 100644
index 000000000000..711e20d4e613
--- /dev/null
+++ b/tests/Integration/View/templates/components/child-input.blade.php
@@ -0,0 +1 @@
+
\ No newline at end of file
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/components/link.blade.php b/tests/Integration/View/templates/components/link.blade.php
new file mode 100644
index 000000000000..74b8835393b6
--- /dev/null
+++ b/tests/Integration/View/templates/components/link.blade.php
@@ -0,0 +1,3 @@
+@props(['href'])
+
+
{{ $slot }}
\ No newline at end of file
diff --git a/tests/Integration/View/templates/renderable-exception.blade.php b/tests/Integration/View/templates/renderable-exception.blade.php
new file mode 100644
index 000000000000..28649eefa7f9
--- /dev/null
+++ b/tests/Integration/View/templates/renderable-exception.blade.php
@@ -0,0 +1,3 @@
+@php
+ throw new Illuminate\Tests\Integration\View\RenderableException;
+@endphp
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/uses-child-input.blade.php b/tests/Integration/View/templates/uses-child-input.blade.php
new file mode 100644
index 000000000000..bc5bdade5d89
--- /dev/null
+++ b/tests/Integration/View/templates/uses-child-input.blade.php
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/tests/Integration/View/templates/uses-link.blade.php b/tests/Integration/View/templates/uses-link.blade.php
new file mode 100644
index 000000000000..53a67cf64e30
--- /dev/null
+++ b/tests/Integration/View/templates/uses-link.blade.php
@@ -0,0 +1 @@
+This is a sentence with a
link.
\ No newline at end of file
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/Log/LogManagerTest.php b/tests/Log/LogManagerTest.php
index f365c9f701c0..65cd162d76ad 100755
--- a/tests/Log/LogManagerTest.php
+++ b/tests/Log/LogManagerTest.php
@@ -327,7 +327,7 @@ public function testLogManagerCreateSyslogDriverWithConfiguredFormatter()
$this->assertSame('Y/m/d--test', $dateFormat->getValue($formatter));
}
- public function testLogMnagerPurgeResolvedChannels()
+ public function testLogManagerPurgeResolvedChannels()
{
$manager = new LogManager($this->app);
diff --git a/tests/Mail/MailLogTransportTest.php b/tests/Mail/MailLogTransportTest.php
index 644ee64c5827..5848734d2eec 100644
--- a/tests/Mail/MailLogTransportTest.php
+++ b/tests/Mail/MailLogTransportTest.php
@@ -36,7 +36,7 @@ public function testGetLogTransportWithConfiguredChannel()
public function testGetLogTransportWithPsrLogger()
{
$this->app['config']->set('mail.driver', 'log');
- $logger = $this->app->instance('log', new NullLogger());
+ $logger = $this->app->instance('log', new NullLogger);
$transportLogger = app('mailer')->getSwiftMailer()->getTransport()->logger();
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/MailManagerTest.php b/tests/Mail/MailManagerTest.php
index 9a67d4c2d9ca..e7610ffe1cdd 100644
--- a/tests/Mail/MailManagerTest.php
+++ b/tests/Mail/MailManagerTest.php
@@ -2,6 +2,7 @@
namespace Illuminate\Tests\Mail;
+use InvalidArgumentException;
use Orchestra\Testbench\TestCase;
class MailManagerTest extends TestCase
@@ -21,7 +22,7 @@ public function testEmptyTransportConfig($transport)
'timeout' => null,
]);
- $this->expectException(\InvalidArgumentException::class);
+ $this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage("Unsupported mail transport [{$transport}]");
$this->app['mail.manager']->mailer('custom_smtp');
}
diff --git a/tests/Mail/MailMarkdownTest.php b/tests/Mail/MailMarkdownTest.php
index 7878174ac43b..19341fde67a0 100644
--- a/tests/Mail/MailMarkdownTest.php
+++ b/tests/Mail/MailMarkdownTest.php
@@ -20,7 +20,7 @@ public function testRenderFunctionReturnsHtml()
$markdown = new Markdown($viewFactory);
$viewFactory->shouldReceive('flushFinderCache')->once();
$viewFactory->shouldReceive('replaceNamespace')->once()->with('mail', $markdown->htmlComponentPaths())->andReturnSelf();
- $viewFactory->shouldReceive('exists')->with('default')->andReturn(false);
+ $viewFactory->shouldReceive('exists')->with('mail.default')->andReturn(false);
$viewFactory->shouldReceive('make')->with('view', [])->andReturnSelf();
$viewFactory->shouldReceive('make')->with('mail::themes.default', [])->andReturnSelf();
$viewFactory->shouldReceive('render')->twice()->andReturn('', 'body {}');
@@ -37,9 +37,26 @@ public function testRenderFunctionReturnsHtmlWithCustomTheme()
$markdown->theme('yaz');
$viewFactory->shouldReceive('flushFinderCache')->once();
$viewFactory->shouldReceive('replaceNamespace')->once()->with('mail', $markdown->htmlComponentPaths())->andReturnSelf();
- $viewFactory->shouldReceive('exists')->with('yaz')->andReturn(true);
+ $viewFactory->shouldReceive('exists')->with('mail.yaz')->andReturn(true);
$viewFactory->shouldReceive('make')->with('view', [])->andReturnSelf();
- $viewFactory->shouldReceive('make')->with('yaz', [])->andReturnSelf();
+ $viewFactory->shouldReceive('make')->with('mail.yaz', [])->andReturnSelf();
+ $viewFactory->shouldReceive('render')->twice()->andReturn('', 'body {}');
+
+ $result = $markdown->render('view', []);
+
+ $this->assertNotFalse(strpos($result, ''));
+ }
+
+ public function testRenderFunctionReturnsHtmlWithCustomThemeWithMailPrefix()
+ {
+ $viewFactory = m::mock(Factory::class);
+ $markdown = new Markdown($viewFactory);
+ $markdown->theme('mail.yaz');
+ $viewFactory->shouldReceive('flushFinderCache')->once();
+ $viewFactory->shouldReceive('replaceNamespace')->once()->with('mail', $markdown->htmlComponentPaths())->andReturnSelf();
+ $viewFactory->shouldReceive('exists')->with('mail.yaz')->andReturn(true);
+ $viewFactory->shouldReceive('make')->with('view', [])->andReturnSelf();
+ $viewFactory->shouldReceive('make')->with('mail.yaz', [])->andReturnSelf();
$viewFactory->shouldReceive('render')->twice()->andReturn('', 'body {}');
$result = $markdown->render('view', []);
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..5d1d8f1fe885 100644
--- a/tests/Mail/MailSesTransportTest.php
+++ b/tests/Mail/MailSesTransportTest.php
@@ -16,7 +16,7 @@ class MailSesTransportTest extends TestCase
/** @group Foo */
public function testGetTransport()
{
- $container = new Container();
+ $container = new Container;
$container->singleton('config', function () {
return new Repository([
@@ -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..47b93429e62e 100644
--- a/tests/Mail/MailableQueuedTest.php
+++ b/tests/Mail/MailableQueuedTest.php
@@ -29,10 +29,10 @@ 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;
+ $mailable = new MailableQueueableStub;
$queueFake->assertNothingPushed();
$mailer->send($mailable);
$queueFake->assertPushedOn(null, SendQueuedMailable::class);
@@ -43,10 +43,10 @@ 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;
+ $mailable = new MailableQueueableStub;
$attachmentOption = ['mime' => 'image/jpeg', 'as' => 'bar.jpg'];
$mailable->attach('foo.jpg', $attachmentOption);
$this->assertIsArray($mailable->attachments);
@@ -72,10 +72,10 @@ 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;
+ $mailable = new MailableQueueableStub;
$attachmentOption = ['mime' => 'image/jpeg', 'as' => 'bar.jpg'];
$mailable->attachFromStorage('/', 'foo.jpg', $attachmentOption);
@@ -95,7 +95,7 @@ protected function getMocks()
}
}
-class MailableQueableStub extends Mailable implements ShouldQueue
+class MailableQueueableStub extends Mailable implements ShouldQueue
{
use Queueable;
diff --git a/tests/Notifications/NotificationBroadcastChannelTest.php b/tests/Notifications/NotificationBroadcastChannelTest.php
index 033cf3f8b3f3..51c9401671fa 100644
--- a/tests/Notifications/NotificationBroadcastChannelTest.php
+++ b/tests/Notifications/NotificationBroadcastChannelTest.php
@@ -83,11 +83,26 @@ public function testNotificationIsBroadcastedNow()
$events = m::mock(Dispatcher::class);
$events->shouldReceive('dispatch')->once()->with(m::on(function ($event) {
- return $event->connection == 'sync';
+ return $event->connection === 'sync';
}));
$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..ba31b96df353 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->assertSame('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->assertSame('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/Notifications/NotificationSendQueuedNotificationTest.php b/tests/Notifications/NotificationSendQueuedNotificationTest.php
index bdd1f5e197a6..3068d8130fe4 100644
--- a/tests/Notifications/NotificationSendQueuedNotificationTest.php
+++ b/tests/Notifications/NotificationSendQueuedNotificationTest.php
@@ -36,7 +36,7 @@ public function testSerializationOfNotifiableModel()
$identifier = new ModelIdentifier(NotifiableUser::class, [null], [], null);
$serializedIdentifier = serialize($identifier);
- $job = new SendQueuedNotifications(new NotifiableUser(), 'notification');
+ $job = new SendQueuedNotifications(new NotifiableUser, 'notification');
$serialized = serialize($job);
$this->assertStringContainsString($serializedIdentifier, $serialized);
@@ -44,7 +44,7 @@ public function testSerializationOfNotifiableModel()
public function testSerializationOfNormalNotifiable()
{
- $notifiable = new AnonymousNotifiable();
+ $notifiable = new AnonymousNotifiable;
$serializedNotifiable = serialize($notifiable);
$job = new SendQueuedNotifications($notifiable, 'notification');
diff --git a/tests/Notifications/NotificationSenderTest.php b/tests/Notifications/NotificationSenderTest.php
index 6c5a6aaf849d..5c8674a45db8 100644
--- a/tests/Notifications/NotificationSenderTest.php
+++ b/tests/Notifications/NotificationSenderTest.php
@@ -33,7 +33,7 @@ public function testItCanSendQueuedNotificationsWithAStringVia()
$sender = new NotificationSender($manager, $bus, $events);
- $sender->send($notifiable, new DummyQueuedNotificationWithStringVia());
+ $sender->send($notifiable, new DummyQueuedNotificationWithStringVia);
}
public function testItCanSendNotificationsWithAnEmptyStringVia()
@@ -46,7 +46,7 @@ public function testItCanSendNotificationsWithAnEmptyStringVia()
$sender = new NotificationSender($manager, $bus, $events);
- $sender->sendNow($notifiable, new DummyNotificationWithEmptyStringVia());
+ $sender->sendNow($notifiable, new DummyNotificationWithEmptyStringVia);
}
public function testItCannotSendNotificationsViaDatabaseForAnonymousNotifiables()
@@ -59,7 +59,7 @@ public function testItCannotSendNotificationsViaDatabaseForAnonymousNotifiables(
$sender = new NotificationSender($manager, $bus, $events);
- $sender->sendNow($notifiable, new DummyNotificationWithDatabaseVia());
+ $sender->sendNow($notifiable, new DummyNotificationWithDatabaseVia);
}
}
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/Pipeline/PipelineTest.php b/tests/Pipeline/PipelineTest.php
index da7038fb9ef5..f057e2c765f6 100644
--- a/tests/Pipeline/PipelineTest.php
+++ b/tests/Pipeline/PipelineTest.php
@@ -28,8 +28,7 @@ public function testPipelineBasicUsage()
$this->assertSame('foo', $_SERVER['__test.pipe.one']);
$this->assertSame('foo', $_SERVER['__test.pipe.two']);
- unset($_SERVER['__test.pipe.one']);
- unset($_SERVER['__test.pipe.two']);
+ unset($_SERVER['__test.pipe.one'], $_SERVER['__test.pipe.two']);
}
public function testPipelineUsageWithObjects()
diff --git a/tests/Queue/QueueBeanstalkdQueueTest.php b/tests/Queue/QueueBeanstalkdQueueTest.php
index 7134917a2369..87a779f638ef 100755
--- a/tests/Queue/QueueBeanstalkdQueueTest.php
+++ b/tests/Queue/QueueBeanstalkdQueueTest.php
@@ -13,6 +13,16 @@
class QueueBeanstalkdQueueTest extends TestCase
{
+ /**
+ * @var BeanstalkdQueue
+ */
+ private $queue;
+
+ /**
+ * @var Container|m\LegacyMockInterface|m\MockInterface
+ */
+ private $container;
+
protected function tearDown(): void
{
m::close();
@@ -26,14 +36,16 @@ public function testPushProperlyPushesJobOntoBeanstalkd()
return $uuid;
});
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('useTube')->once()->with('stack')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), 1024, 0, 60);
- $queue->push('foo', ['data'], 'stack');
- $queue->push('foo', ['data']);
+ $this->queue->push('foo', ['data'], 'stack');
+ $this->queue->push('foo', ['data']);
+
+ $this->container->shouldHaveReceived('bound')->with('events')->times(2);
Str::createUuidsNormally();
}
@@ -46,53 +58,68 @@ public function testDelayedPushProperlyPushesJobOntoBeanstalkd()
return $uuid;
});
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('useTube')->once()->with('stack')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), Pheanstalk::DEFAULT_PRIORITY, 5, Pheanstalk::DEFAULT_TTR);
- $queue->later(5, 'foo', ['data'], 'stack');
- $queue->later(5, 'foo', ['data']);
+ $this->queue->later(5, 'foo', ['data'], 'stack');
+ $this->queue->later(5, 'foo', ['data']);
+
+ $this->container->shouldHaveReceived('bound')->with('events')->times(2);
Str::createUuidsNormally();
}
public function testPopProperlyPopsJobOffOfBeanstalkd()
{
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $queue->setContainer(m::mock(Container::class));
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('watchOnly')->once()->with('default')->andReturn($pheanstalk);
$job = m::mock(Job::class);
$pheanstalk->shouldReceive('reserveWithTimeout')->once()->with(0)->andReturn($job);
- $result = $queue->pop();
+ $result = $this->queue->pop();
$this->assertInstanceOf(BeanstalkdJob::class, $result);
}
public function testBlockingPopProperlyPopsJobOffOfBeanstalkd()
{
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60, 60);
- $queue->setContainer(m::mock(Container::class));
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60, 60);
+
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('watchOnly')->once()->with('default')->andReturn($pheanstalk);
$job = m::mock(Job::class);
$pheanstalk->shouldReceive('reserveWithTimeout')->once()->with(60)->andReturn($job);
- $result = $queue->pop();
+ $result = $this->queue->pop();
$this->assertInstanceOf(BeanstalkdJob::class, $result);
}
public function testDeleteProperlyRemoveJobsOffBeanstalkd()
{
- $queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), 'default', 60);
- $pheanstalk = $queue->getPheanstalk();
+ $this->setQueue('default', 60);
+
+ $pheanstalk = $this->queue->getPheanstalk();
$pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
$pheanstalk->shouldReceive('delete')->once()->with(m::type(Job::class));
- $queue->deleteMessage('default', 1);
+ $this->queue->deleteMessage('default', 1);
+ }
+
+ /**
+ * @param string $default
+ * @param int $timeToRun
+ * @param int $blockFor
+ */
+ private function setQueue($default, $timeToRun, $blockFor = 0)
+ {
+ $this->queue = new BeanstalkdQueue(m::mock(Pheanstalk::class), $default, $timeToRun, $blockFor);
+ $this->container = m::spy(Container::class);
+ $this->queue->setContainer($this->container);
}
}
diff --git a/tests/Queue/QueueDatabaseQueueUnitTest.php b/tests/Queue/QueueDatabaseQueueUnitTest.php
index 59400146b4d1..c87dc754545b 100644
--- a/tests/Queue/QueueDatabaseQueueUnitTest.php
+++ b/tests/Queue/QueueDatabaseQueueUnitTest.php
@@ -2,6 +2,7 @@
namespace Illuminate\Tests\Queue;
+use Illuminate\Container\Container;
use Illuminate\Database\Connection;
use Illuminate\Queue\DatabaseQueue;
use Illuminate\Queue\Queue;
@@ -26,12 +27,13 @@ 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');
+ $queue->setContainer($container = m::spy(Container::class));
$database->shouldReceive('table')->with('table')->andReturn($query = m::mock(stdClass::class));
$query->shouldReceive('insertGetId')->once()->andReturnUsing(function ($array) use ($uuid) {
$this->assertSame('default', $array['queue']);
- $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']);
@@ -39,6 +41,8 @@ public function testPushProperlyPushesJobOntoDatabase()
$queue->push('foo', ['data']);
+ $container->shouldHaveReceived('bound')->with('events')->once();
+
Str::createUuidsNormally();
}
@@ -51,15 +55,16 @@ public function testDelayedPushProperlyPushesJobOntoDatabase()
});
$queue = $this->getMockBuilder(
- DatabaseQueue::class)->setMethods(
+ DatabaseQueue::class)->onlyMethods(
['currentTime'])->setConstructorArgs(
[$database = m::mock(Connection::class), 'table', 'default']
)->getMock();
$queue->expects($this->any())->method('currentTime')->willReturn('time');
+ $queue->setContainer($container = m::spy(Container::class));
$database->shouldReceive('table')->with('table')->andReturn($query = m::mock(stdClass::class));
$query->shouldReceive('insertGetId')->once()->andReturnUsing(function ($array) use ($uuid) {
$this->assertSame('default', $array['queue']);
- $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']);
@@ -67,6 +72,8 @@ public function testDelayedPushProperlyPushesJobOntoDatabase()
$queue->later(10, 'foo', ['data']);
+ $container->shouldHaveReceived('bound')->with('events')->once();
+
Str::createUuidsNormally();
}
@@ -112,7 +119,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..952384b7f200 100644
--- a/tests/Queue/QueueRedisQueueTest.php
+++ b/tests/Queue/QueueRedisQueueTest.php
@@ -2,6 +2,7 @@
namespace Illuminate\Tests\Queue;
+use Illuminate\Container\Container;
use Illuminate\Contracts\Redis\Factory;
use Illuminate\Queue\LuaScripts;
use Illuminate\Queue\Queue;
@@ -26,13 +27,15 @@ 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');
+ $queue->setContainer($container = m::spy(Container::class));
$redis->shouldReceive('connection')->once()->andReturn($redis);
$redis->shouldReceive('eval')->once()->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0]));
$id = $queue->push('foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Str::createUuidsNormally();
}
@@ -45,8 +48,9 @@ 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');
+ $queue->setContainer($container = m::spy(Container::class));
$redis->shouldReceive('connection')->once()->andReturn($redis);
$redis->shouldReceive('eval')->once()->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'id' => 'foo', 'attempts' => 0]));
@@ -56,6 +60,7 @@ public function testPushProperlyPushesJobOntoRedisWithCustomPayloadHook()
$id = $queue->push('foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Queue::createPayloadUsing(null);
@@ -70,8 +75,9 @@ 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');
+ $queue->setContainer($container = m::spy(Container::class));
$redis->shouldReceive('connection')->once()->andReturn($redis);
$redis->shouldReceive('eval')->once()->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'bar' => 'foo', 'id' => 'foo', 'attempts' => 0]));
@@ -85,6 +91,7 @@ public function testPushProperlyPushesJobOntoRedisWithTwoCustomPayloadHook()
$id = $queue->push('foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Queue::createPayloadUsing(null);
@@ -99,7 +106,8 @@ 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->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$queue->expects($this->once())->method('availableAt')->with(1)->willReturn(2);
@@ -112,6 +120,7 @@ public function testDelayedPushProperlyPushesJobOntoRedis()
$id = $queue->later(1, 'foo', ['data']);
$this->assertSame('foo', $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Str::createUuidsNormally();
}
@@ -125,7 +134,8 @@ 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->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('getRandomId')->willReturn('foo');
$queue->expects($this->once())->method('availableAt')->with($date)->willReturn(2);
@@ -137,6 +147,7 @@ public function testDelayedPushWithDateTimeProperlyPushesJobOntoRedis()
);
$queue->later($date, 'foo', ['data']);
+ $container->shouldHaveReceived('bound')->with('events')->once();
Str::createUuidsNormally();
}
diff --git a/tests/Queue/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..60e02b161ebb 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,43 +91,49 @@ 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->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('createPayload')->with($this->mockedJob, $this->queueName, $this->mockedData)->willReturn($this->mockedPayload);
$queue->expects($this->once())->method('secondsUntil')->with($now)->willReturn(5);
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('sendMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'MessageBody' => $this->mockedPayload, 'DelaySeconds' => 5])->andReturn($this->mockedSendMessageResponseModel);
$id = $queue->later($now->addSeconds(5), $this->mockedJob, $this->mockedData, $this->queueName);
$this->assertEquals($this->mockedMessageId, $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
}
public function testDelayedPushProperlyPushesJobOntoSqs()
{
- $queue = $this->getMockBuilder(SqsQueue::class)->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->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('createPayload')->with($this->mockedJob, $this->queueName, $this->mockedData)->willReturn($this->mockedPayload);
$queue->expects($this->once())->method('secondsUntil')->with($this->mockedDelay)->willReturn($this->mockedDelay);
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('sendMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'MessageBody' => $this->mockedPayload, 'DelaySeconds' => $this->mockedDelay])->andReturn($this->mockedSendMessageResponseModel);
$id = $queue->later($this->mockedDelay, $this->mockedJob, $this->mockedData, $this->queueName);
$this->assertEquals($this->mockedMessageId, $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
}
public function testPushProperlyPushesJobOntoSqs()
{
- $queue = $this->getMockBuilder(SqsQueue::class)->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->setContainer($container = m::spy(Container::class));
$queue->expects($this->once())->method('createPayload')->with($this->mockedJob, $this->queueName, $this->mockedData)->willReturn($this->mockedPayload);
$queue->expects($this->once())->method('getQueue')->with($this->queueName)->willReturn($this->queueUrl);
$this->sqs->shouldReceive('sendMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'MessageBody' => $this->mockedPayload])->andReturn($this->mockedSendMessageResponseModel);
$id = $queue->push($this->mockedJob, $this->mockedData, $this->queueName);
$this->assertEquals($this->mockedMessageId, $id);
+ $container->shouldHaveReceived('bound')->with('events')->once();
}
public function testSizeProperlyReadsSqsQueueSize()
{
- $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/QueueSyncQueueTest.php b/tests/Queue/QueueSyncQueueTest.php
index 2064add943a8..d4d07bbb2d6a 100755
--- a/tests/Queue/QueueSyncQueueTest.php
+++ b/tests/Queue/QueueSyncQueueTest.php
@@ -6,8 +6,11 @@
use Illuminate\Container\Container;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Queue\QueueableEntity;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\Jobs\SyncJob;
use Illuminate\Queue\SyncQueue;
+use LogicException;
use Mockery as m;
use PHPUnit\Framework\TestCase;
@@ -54,6 +57,26 @@ public function testFailedJobGetsHandledWhenAnExceptionIsThrown()
Container::setInstance();
}
+
+ public function testCreatesPayloadObject()
+ {
+ $sync = new SyncQueue;
+ $container = new Container;
+ $container->bind(\Illuminate\Contracts\Events\Dispatcher::class, \Illuminate\Events\Dispatcher::class);
+ $container->bind(\Illuminate\Contracts\Bus\Dispatcher::class, \Illuminate\Bus\Dispatcher::class);
+ $container->bind(\Illuminate\Contracts\Container\Container::class, \Illuminate\Container\Container::class);
+ $sync->setContainer($container);
+
+ SyncQueue::createPayloadUsing(function ($connection, $queue, $payload) {
+ return ['data' => ['extra' => 'extraValue']];
+ });
+
+ try {
+ $sync->push(new SyncQueueJob());
+ } catch (LogicException $e) {
+ $this->assertEquals('extraValue', $e->getMessage());
+ }
+ }
}
class SyncQueueTestEntity implements QueueableEntity
@@ -94,3 +117,20 @@ public function failed()
$_SERVER['__sync.failed'] = true;
}
}
+
+class SyncQueueJob implements ShouldQueue
+{
+ use InteractsWithQueue;
+
+ public function handle()
+ {
+ throw new LogicException($this->getValueFromJob('extra'));
+ }
+
+ public function getValueFromJob($key)
+ {
+ $payload = $this->job->payload();
+
+ return $payload['data'][$key] ?? null;
+ }
+}
diff --git a/tests/Queue/RedisQueueIntegrationTest.php b/tests/Queue/RedisQueueIntegrationTest.php
index 3381e03fee4d..5fbad9311dd4 100644
--- a/tests/Queue/RedisQueueIntegrationTest.php
+++ b/tests/Queue/RedisQueueIntegrationTest.php
@@ -3,7 +3,9 @@
namespace Illuminate\Tests\Queue;
use Illuminate\Container\Container;
+use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
+use Illuminate\Queue\Events\JobQueued;
use Illuminate\Queue\Jobs\RedisJob;
use Illuminate\Queue\RedisQueue;
use Illuminate\Support\Carbon;
@@ -21,6 +23,11 @@ class RedisQueueIntegrationTest extends TestCase
*/
private $queue;
+ /**
+ * @var \Mockery\MockInterface|\Mockery\LegacyMockInterface
+ */
+ private $container;
+
protected function setUp(): void
{
Carbon::setTestNow(Carbon::now());
@@ -57,6 +64,8 @@ public function testExpiredJobsArePopped($driver)
$this->queue->later(-300, $jobs[2]);
$this->queue->later(-100, $jobs[3]);
+ $this->container->shouldHaveReceived('bound')->with('events')->times(4);
+
$this->assertEquals($jobs[2], unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
$this->assertEquals($jobs[1], unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
$this->assertEquals($jobs[3], unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
@@ -183,13 +192,14 @@ public function testPopProperlyPopsDelayedJobOffOfRedis($driver)
*/
public function testPopPopsDelayedJobOffOfRedisWhenExpireNull($driver)
{
- $this->queue = new RedisQueue($this->redis[$driver], 'default', null, null);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->setQueue($driver, 'default', null, null);
// Push an item into queue
$job = new RedisQueueIntegrationTestJob(10);
$this->queue->later(-10, $job);
+ $this->container->shouldHaveReceived('bound')->with('events')->once();
+
// Pop and check it is popped correctly
$before = $this->currentTime();
$this->assertEquals($job, unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
@@ -264,12 +274,13 @@ public function testBlockingPopProperlyPopsExpiredJobs($driver)
*/
public function testNotExpireJobsWhenExpireNull($driver)
{
- $this->queue = new RedisQueue($this->redis[$driver], 'default', null, null);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->setQueue($driver, 'default', null, null);
// Make an expired reserved job
$failed = new RedisQueueIntegrationTestJob(-20);
$this->queue->push($failed);
+ $this->container->shouldHaveReceived('bound')->with('events')->once();
+
$beforeFailPop = $this->currentTime();
$this->queue->pop();
$afterFailPop = $this->currentTime();
@@ -277,6 +288,7 @@ public function testNotExpireJobsWhenExpireNull($driver)
// Push an item into queue
$job = new RedisQueueIntegrationTestJob(10);
$this->queue->push($job);
+ $this->container->shouldHaveReceived('bound')->with('events')->times(2);
// Pop and check it is popped correctly
$before = $this->currentTime();
@@ -309,12 +321,12 @@ public function testNotExpireJobsWhenExpireNull($driver)
*/
public function testExpireJobsWhenExpireSet($driver)
{
- $this->queue = new RedisQueue($this->redis[$driver], 'default', null, 30);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->setQueue($driver, 'default', null, 30);
// Push an item into queue
$job = new RedisQueueIntegrationTestJob(10);
$this->queue->push($job);
+ $this->container->shouldHaveReceived('bound')->with('events')->once();
// Pop and check it is popped correctly
$before = $this->currentTime();
@@ -431,6 +443,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'));
}
/**
@@ -454,17 +467,67 @@ public function testSize($driver)
$this->assertEquals(2, $this->queue->size());
}
+ /**
+ * @dataProvider redisDriverProvider
+ *
+ * @param string $driver
+ */
+ public function testPushJobQueuedEvent($driver)
+ {
+ $events = m::mock(Dispatcher::class);
+ $events->shouldReceive('dispatch')->withArgs(function (JobQueued $jobQueued) {
+ $this->assertInstanceOf(RedisQueueIntegrationTestJob::class, $jobQueued->job);
+ $this->assertIsString(RedisQueueIntegrationTestJob::class, $jobQueued->id);
+
+ return true;
+ })->andReturnNull()->once();
+
+ $container = m::mock(Container::class);
+ $container->shouldReceive('bound')->with('events')->andReturn(true)->once();
+ $container->shouldReceive('offsetGet')->with('events')->andReturn($events)->once();
+
+ $queue = new RedisQueue($this->redis[$driver]);
+ $queue->setContainer($container);
+
+ $queue->push(new RedisQueueIntegrationTestJob(5));
+ }
+
+ /**
+ * @dataProvider redisDriverProvider
+ *
+ * @param string $driver
+ */
+ public function testBulkJobQueuedEvent($driver)
+ {
+ $events = m::mock(Dispatcher::class);
+ $events->shouldReceive('dispatch')->with(m::type(JobQueued::class))->andReturnNull()->times(3);
+
+ $container = m::mock(Container::class);
+ $container->shouldReceive('bound')->with('events')->andReturn(true)->times(3);
+ $container->shouldReceive('offsetGet')->with('events')->andReturn($events)->times(3);
+
+ $queue = new RedisQueue($this->redis[$driver]);
+ $queue->setContainer($container);
+
+ $queue->bulk([
+ new RedisQueueIntegrationTestJob(5),
+ new RedisQueueIntegrationTestJob(10),
+ new RedisQueueIntegrationTestJob(15),
+ ]);
+ }
+
/**
* @param string $driver
* @param string $default
- * @param string $connection
+ * @param string|null $connection
* @param int $retryAfter
* @param int|null $blockFor
*/
private function setQueue($driver, $default = 'default', $connection = null, $retryAfter = 60, $blockFor = null)
{
$this->queue = new RedisQueue($this->redis[$driver], $default, $connection, $retryAfter, $blockFor);
- $this->queue->setContainer(m::mock(Container::class));
+ $this->container = m::spy(Container::class);
+ $this->queue->setContainer($this->container);
}
}
diff --git a/tests/Redis/ConcurrentLimiterTest.php b/tests/Redis/ConcurrentLimiterTest.php
index 78a6792274a5..7285e9586732 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/RedisConnectionTest.php b/tests/Redis/RedisConnectionTest.php
index 0ca1ddae5452..38ab3fb7452b 100644
--- a/tests/Redis/RedisConnectionTest.php
+++ b/tests/Redis/RedisConnectionTest.php
@@ -698,6 +698,33 @@ public function testItSscansForKeys()
}
}
+ public function testItSPopsForKeys()
+ {
+ foreach ($this->connections() as $redis) {
+ $members = ['test:spop:1', 'test:spop:2', 'test:spop:3', 'test:spop:4'];
+
+ foreach ($members as $member) {
+ $redis->sadd('set', $member);
+ }
+
+ $result = $redis->spop('set');
+ $this->assertIsNotArray($result);
+ $this->assertContains($result, $members);
+
+ $result = $redis->spop('set', 1);
+
+ $this->assertIsArray($result);
+ $this->assertCount(1, $result);
+
+ $result = $redis->spop('set', 2);
+
+ $this->assertIsArray($result);
+ $this->assertCount(2, $result);
+
+ $redis->flushAll();
+ }
+ }
+
public function testPhpRedisScanOption()
{
foreach ($this->connections() as $redis) {
diff --git a/tests/Redis/RedisConnectorTest.php b/tests/Redis/RedisConnectorTest.php
index 599fa2f2aad3..07ec786fe2fd 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->assertSame('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,30 @@ public function testScheme()
],
]);
$phpRedisClient = $phpRedis->connection()->client();
- $this->assertEquals("tcp://{$host}", $phpRedisClient->getHost());
+ $this->assertSame("tcp://{$host}", $phpRedisClient->getHost());
$this->assertEquals($port, $phpRedisClient->getPort());
}
+
+ public function testPredisConfigurationWithUsername()
+ {
+ $host = env('REDIS_HOST', '127.0.0.1');
+ $port = env('REDIS_PORT', 6379);
+ $username = 'testuser';
+ $password = 'testpw';
+
+ $predis = new RedisManager(new Application, 'predis', [
+ 'default' => [
+ 'host' => $host,
+ 'port' => $port,
+ 'username' => $username,
+ 'password' => $password,
+ 'database' => 5,
+ 'timeout' => 0.5,
+ ],
+ ]);
+ $predisClient = $predis->connection()->client();
+ $parameters = $predisClient->getConnection()->getParameters();
+ $this->assertEquals($username, $parameters->username);
+ $this->assertEquals($password, $parameters->password);
+ }
}
diff --git a/tests/Redis/RedisManagerExtensionTest.php b/tests/Redis/RedisManagerExtensionTest.php
index 04b7eb63d7d9..5cac41877cc2 100644
--- a/tests/Redis/RedisManagerExtensionTest.php
+++ b/tests/Redis/RedisManagerExtensionTest.php
@@ -19,7 +19,7 @@ protected function setUp(): void
{
parent::setUp();
- $this->redis = new RedisManager(new Application(), 'my_custom_driver', [
+ $this->redis = new RedisManager(new Application, 'my_custom_driver', [
'default' => [
'host' => 'some-host',
'port' => 'some-port',
@@ -39,7 +39,7 @@ protected function setUp(): void
]);
$this->redis->extend('my_custom_driver', function () {
- return new FakeRedisConnnector();
+ return new FakeRedisConnector;
});
}
@@ -72,7 +72,7 @@ public function test_parse_connection_configuration_for_cluster()
'url3',
],
];
- $redis = new RedisManager(new Application(), 'my_custom_driver', [
+ $redis = new RedisManager(new Application, 'my_custom_driver', [
'clusters' => [
$name => $config,
],
@@ -91,7 +91,7 @@ public function test_parse_connection_configuration_for_cluster()
}
}
-class FakeRedisConnnector implements Connector
+class FakeRedisConnector implements Connector
{
/**
* Create a new clustered Predis connection.
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..9802ad742a61 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', [
@@ -315,6 +334,24 @@ public function testCanRegisterResourcesWithoutOption()
}
}
+ public function testCanRegisterResourceWithMissingOption()
+ {
+ $this->router->middleware('resource-middleware')
+ ->resource('users', RouteRegistrarControllerStub::class)
+ ->missing(function () {
+ return 'missing';
+ });
+
+ $this->assertIsCallable($this->router->getRoutes()->getByName('users.show')->getMissing());
+ $this->assertIsCallable($this->router->getRoutes()->getByName('users.edit')->getMissing());
+ $this->assertIsCallable($this->router->getRoutes()->getByName('users.update')->getMissing());
+ $this->assertIsCallable($this->router->getRoutes()->getByName('users.destroy')->getMissing());
+
+ $this->assertNull($this->router->getRoutes()->getByName('users.index')->getMissing());
+ $this->assertNull($this->router->getRoutes()->getByName('users.create')->getMissing());
+ $this->assertNull($this->router->getRoutes()->getByName('users.store')->getMissing());
+ }
+
public function testCanAccessRegisteredResourceRoutesAsRouteCollection()
{
$resource = $this->router->middleware('resource-middleware')
@@ -575,6 +612,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..a0d4548dc06e 100644
--- a/tests/Routing/RoutingRouteTest.php
+++ b/tests/Routing/RoutingRouteTest.php
@@ -15,6 +15,7 @@
use Illuminate\Events\Dispatcher;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Routing\Controller;
@@ -202,7 +203,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 +215,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()
@@ -1671,6 +1672,27 @@ public function testImplicitBindingsWithOptionalParameterWithExistingKeyInUri()
$this->assertSame('taylor', $router->dispatch(Request::create('foo/taylor', 'GET'))->getContent());
}
+ public function testImplicitBindingsWithMissingModelHandledByMissing()
+ {
+ $router = $this->getRouter();
+ $router->get('foo/{bar}', [
+ 'middleware' => SubstituteBindings::class,
+ 'uses' => function (RouteModelBindingNullStub $bar = null) {
+ $this->assertInstanceOf(RouteModelBindingNullStub::class, $bar);
+
+ return $bar->first();
+ },
+ ])->missing(function () {
+ return new RedirectResponse('/', 302);
+ });
+
+ $request = Request::create('foo/taylor', 'GET');
+
+ $response = $router->dispatch($request);
+ $this->assertTrue($response->isRedirect('/'));
+ $this->assertEquals(302, $response->getStatusCode());
+ }
+
public function testImplicitBindingsWithOptionalParameterWithNoKeyInUri()
{
$router = $this->getRouter();
@@ -1831,7 +1853,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..188bdce4d89f 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()
@@ -452,6 +452,22 @@ public function testKeyExists()
$this->assertFalse($session->exists(['hulk.two']));
}
+ public function testKeyMissing()
+ {
+ $session = $this->getSession();
+ $session->put('foo', 'bar');
+ $this->assertFalse($session->missing('foo'));
+ $session->put('baz', null);
+ $session->put('hulk', ['one' => true]);
+ $this->assertFalse($session->has('baz'));
+ $this->assertFalse($session->missing('baz'));
+ $this->assertTrue($session->missing('bogus'));
+ $this->assertFalse($session->missing(['foo', 'baz']));
+ $this->assertTrue($session->missing(['foo', 'baz', 'bogus']));
+ $this->assertFalse($session->missing(['hulk.one']));
+ $this->assertTrue($session->missing(['hulk.two']));
+ }
+
public function testRememberMethodCallsPutAndReturnsDefault()
{
$session = $this->getSession();
diff --git a/tests/Support/Concerns/CountsEnumerations.php b/tests/Support/Concerns/CountsEnumerations.php
new file mode 100644
index 000000000000..a5c04bfa2db0
--- /dev/null
+++ b/tests/Support/Concerns/CountsEnumerations.php
@@ -0,0 +1,97 @@
+push($i);
+
+ yield $i;
+ }
+ };
+
+ return [$generatorFunction, $recorder];
+ }
+
+ protected function assertDoesNotEnumerate(callable $executor)
+ {
+ $this->assertEnumerates(0, $executor);
+ }
+
+ protected function assertDoesNotEnumerateCollection(
+ LazyCollection $collection,
+ callable $executor
+ ) {
+ $this->assertEnumeratesCollection($collection, 0, $executor);
+ }
+
+ protected function assertEnumerates($count, callable $executor)
+ {
+ $this->assertEnumeratesCollection(
+ LazyCollection::times(100),
+ $count,
+ $executor
+ );
+ }
+
+ protected function assertEnumeratesCollection(
+ LazyCollection $collection,
+ $count,
+ callable $executor
+ ) {
+ $enumerated = 0;
+
+ $data = $this->countEnumerations($collection, $enumerated);
+
+ $executor($data);
+
+ $this->assertEnumerations($count, $enumerated);
+ }
+
+ protected function assertEnumeratesOnce(callable $executor)
+ {
+ $this->assertEnumeratesCollectionOnce(LazyCollection::times(10), $executor);
+ }
+
+ protected function assertEnumeratesCollectionOnce(
+ LazyCollection $collection,
+ callable $executor
+ ) {
+ $enumerated = 0;
+ $count = $collection->count();
+ $collection = $this->countEnumerations($collection, $enumerated);
+
+ $executor($collection);
+
+ $this->assertEquals(
+ $count,
+ $enumerated,
+ $count > $enumerated ? 'Failed to enumerate in full.' : 'Enumerated more than once.'
+ );
+ }
+
+ protected function assertEnumerations($expected, $actual)
+ {
+ $this->assertEquals(
+ $expected,
+ $actual,
+ "Failed asserting that {$actual} items that were enumerated matches expected {$expected}."
+ );
+ }
+
+ protected function countEnumerations(LazyCollection $collection, &$count)
+ {
+ return $collection->tapEach(function () use (&$count) {
+ $count++;
+ });
+ }
+}
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/SupportCarbonTest.php b/tests/Support/SupportCarbonTest.php
index ea4a53bfff91..cdd865b8b470 100644
--- a/tests/Support/SupportCarbonTest.php
+++ b/tests/Support/SupportCarbonTest.php
@@ -4,6 +4,7 @@
use BadMethodCallException;
use Carbon\Carbon as BaseCarbon;
+use Carbon\CarbonImmutable as BaseCarbonImmutable;
use DateTime;
use DateTimeInterface;
use Illuminate\Support\Carbon;
@@ -108,4 +109,13 @@ public function testDeserializationOccursCorrectly()
$this->assertInstanceOf(Carbon::class, $deserialized);
}
+
+ public function testSetTestNowWillPersistBetweenImmutableAndMutableInstance()
+ {
+ Carbon::setTestNow(new Carbon('2017-06-27 13:14:15.000000'));
+
+ $this->assertSame('2017-06-27 13:14:15', Carbon::now()->toDateTimeString());
+ $this->assertSame('2017-06-27 13:14:15', BaseCarbon::now()->toDateTimeString());
+ $this->assertSame('2017-06-27 13:14:15', BaseCarbonImmutable::now()->toDateTimeString());
+ }
}
diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
index b40e2411193c..f80f69a2236c 100755
--- a/tests/Support/SupportCollectionTest.php
+++ b/tests/Support/SupportCollectionTest.php
@@ -7,6 +7,8 @@
use ArrayObject;
use CachingIterator;
use Exception;
+use Illuminate\Collections\ItemNotFoundException;
+use Illuminate\Collections\MultipleItemsFoundException;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Support\Jsonable;
use Illuminate\Support\Collection;
@@ -66,6 +68,92 @@ public function testFirstWithDefaultAndWithoutCallback($collection)
$this->assertSame('default', $result);
}
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testSoleReturnsFirstItemInCollectionIfOnlyOneExists($collection)
+ {
+ $collection = new $collection([
+ ['name' => 'foo'],
+ ['name' => 'bar'],
+ ]);
+
+ $this->assertSame(['name' => 'foo'], $collection->where('name', 'foo')->sole());
+ $this->assertSame(['name' => 'foo'], $collection->sole('name', '=', 'foo'));
+ $this->assertSame(['name' => 'foo'], $collection->sole('name', 'foo'));
+ }
+
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testSoleThrowsExceptionIfNoItemsExists($collection)
+ {
+ $this->expectException(ItemNotFoundException::class);
+
+ $collection = new $collection([
+ ['name' => 'foo'],
+ ['name' => 'bar'],
+ ]);
+
+ $collection->where('name', 'INVALID')->sole();
+ }
+
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testSoleThrowsExceptionIfMoreThanOneItemExists($collection)
+ {
+ $this->expectException(MultipleItemsFoundException::class);
+
+ $collection = new $collection([
+ ['name' => 'foo'],
+ ['name' => 'foo'],
+ ['name' => 'bar'],
+ ]);
+
+ $collection->where('name', 'foo')->sole();
+ }
+
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testSoleReturnsFirstItemInCollectionIfOnlyOneExistsWithCallback($collection)
+ {
+ $data = new $collection(['foo', 'bar', 'baz']);
+ $result = $data->sole(function ($value) {
+ return $value === 'bar';
+ });
+ $this->assertSame('bar', $result);
+ }
+
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testSoleThrowsExceptionIfNoItemsExistsWithCallback($collection)
+ {
+ $this->expectException(ItemNotFoundException::class);
+
+ $data = new $collection(['foo', 'bar', 'baz']);
+
+ $data->sole(function ($value) {
+ return $value === 'invalid';
+ });
+ }
+
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testSoleThrowsExceptionIfMoreThanOneItemExistsWithCallback($collection)
+ {
+ $this->expectException(MultipleItemsFoundException::class);
+
+ $data = new $collection(['foo', 'bar', 'bar']);
+
+ $data->sole(function ($value) {
+ return $value === 'bar';
+ });
+ }
+
/**
* @dataProvider collectionClassProvider
*/
@@ -78,8 +166,8 @@ public function testFirstWhere($collection)
$this->assertSame('book', $data->firstWhere('material', 'paper')['type']);
$this->assertSame('gasket', $data->firstWhere('material', 'rubber')['type']);
- $this->assertNull($data->firstWhere('material', 'nonexistant'));
- $this->assertNull($data->firstWhere('nonexistant', 'key'));
+ $this->assertNull($data->firstWhere('material', 'nonexistent'));
+ $this->assertNull($data->firstWhere('nonexistent', 'key'));
}
/**
@@ -144,7 +232,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 +463,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 +474,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);
@@ -541,6 +629,16 @@ public function testCountableByWithCallback($collection)
})->all());
}
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testContainsOneItem($collection)
+ {
+ $this->assertFalse((new $collection([]))->containsOneItem());
+ $this->assertTrue((new $collection([1]))->containsOneItem());
+ $this->assertFalse((new $collection([1, 2]))->containsOneItem());
+ }
+
public function testIterable()
{
$c = new Collection(['foo']);
@@ -572,7 +670,7 @@ public function testFilter($collection)
$c = new $collection(['id' => 1, 'first' => 'Hello', 'second' => 'World']);
$this->assertEquals(['first' => 'Hello', 'second' => 'World'], $c->filter(function ($item, $key) {
- return $key != 'id';
+ return $key !== 'id';
})->all());
}
@@ -766,8 +864,10 @@ public function testWhereStrict($collection)
*/
public function testWhereInstanceOf($collection)
{
- $c = new $collection([new stdClass, new stdClass, new $collection, new stdClass]);
+ $c = new $collection([new stdClass, new stdClass, new $collection, new stdClass, new Str]);
$this->assertCount(3, $c->whereInstanceOf(stdClass::class));
+
+ $this->assertCount(4, $c->whereInstanceOf([stdClass::class, Str::class]));
}
/**
@@ -1645,6 +1745,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
*/
@@ -3098,7 +3214,7 @@ public function testRejectRemovesElementsPassingTruthTest($collection)
$c = new $collection(['foo', 'bar']);
$this->assertEquals(['foo'], $c->reject(function ($v) {
- return $v == 'bar';
+ return $v === 'bar';
})->values()->all());
$c = new $collection(['foo', null]);
@@ -3109,12 +3225,12 @@ public function testRejectRemovesElementsPassingTruthTest($collection)
$c = new $collection(['foo', 'bar']);
$this->assertEquals(['foo', 'bar'], $c->reject(function ($v) {
- return $v == 'baz';
+ return $v === 'baz';
})->values()->all());
$c = new $collection(['id' => 1, 'primary' => 'foo', 'secondary' => 'bar']);
$this->assertEquals(['primary' => 'foo', 'secondary' => 'bar'], $c->reject(function ($item, $key) {
- return $key == 'id';
+ return $key === 'id';
})->all());
}
@@ -3187,7 +3303,7 @@ public function testSearchReturnsFalseWhenItemIsNotFound($collection)
return $value < 1 && is_numeric($value);
}));
$this->assertFalse($c->search(function ($value) {
- return $value == 'nope';
+ return $value === 'nope';
}));
}
@@ -3552,7 +3668,7 @@ public function testConcatWithCollection($collection)
*/
public function testDump($collection)
{
- $log = new Collection();
+ $log = new Collection;
VarDumper::setHandler(function ($value) use ($log) {
$log->add($value);
@@ -3574,6 +3690,28 @@ public function testReduce($collection)
$this->assertEquals(6, $data->reduce(function ($carry, $element) {
return $carry += $element;
}));
+
+ $data = new $collection([
+ 'foo' => 'bar',
+ 'baz' => 'qux',
+ ]);
+ $this->assertSame('foobarbazqux', $data->reduce(function ($carry, $element, $key) {
+ return $carry .= $key.$element;
+ }));
+ }
+
+ /**
+ * @dataProvider collectionClassProvider
+ */
+ public function testReduceWithKeys($collection)
+ {
+ $data = new $collection([
+ 'foo' => 'bar',
+ 'baz' => 'qux',
+ ]);
+ $this->assertSame('foobarbazqux', $data->reduceWithKeys(function ($carry, $element, $key) {
+ return $carry .= $key.$element;
+ }));
}
/**
@@ -3599,6 +3737,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 +4166,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/SupportFacadesEventTest.php b/tests/Support/SupportFacadesEventTest.php
index 8c62c0826ba1..15c4a4acc7ab 100644
--- a/tests/Support/SupportFacadesEventTest.php
+++ b/tests/Support/SupportFacadesEventTest.php
@@ -38,6 +38,7 @@ protected function setUp(): void
protected function tearDown(): void
{
Event::clearResolvedInstances();
+ Event::setFacadeApplication(null);
m::close();
}
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/SupportHelpersTest.php b/tests/Support/SupportHelpersTest.php
index bb3e5ead59ce..c286809fbe23 100755
--- a/tests/Support/SupportHelpersTest.php
+++ b/tests/Support/SupportHelpersTest.php
@@ -6,6 +6,7 @@
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Support\Env;
use Illuminate\Support\Optional;
+use LogicException;
use Mockery as m;
use PHPUnit\Framework\TestCase;
use RuntimeException;
@@ -39,6 +40,9 @@ public function testValue()
$this->assertSame('foo', value(function () {
return 'foo';
}));
+ $this->assertSame('foo', value(function ($arg) {
+ return $arg;
+ }, 'foo'));
}
public function testObjectGet()
@@ -362,10 +366,63 @@ public function testTap()
}
public function testThrow()
+ {
+ $this->expectException(LogicException::class);
+
+ throw_if(true, new LogicException);
+ }
+
+ public function testThrowDefaultException()
+ {
+ $this->expectException(RuntimeException::class);
+
+ throw_if(true);
+ }
+
+ public function testThrowExceptionWithMessage()
{
$this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage('test');
+
+ throw_if(true, 'test');
+ }
+
+ public function testThrowExceptionAsStringWithMessage()
+ {
+ $this->expectException(LogicException::class);
+ $this->expectExceptionMessage('test');
+
+ throw_if(true, LogicException::class, 'test');
+ }
+
+ public function testThrowUnless()
+ {
+ $this->expectException(LogicException::class);
+
+ throw_unless(false, new LogicException);
+ }
+
+ public function testThrowUnlessDefaultException()
+ {
+ $this->expectException(RuntimeException::class);
+
+ throw_unless(false);
+ }
+
+ public function testThrowUnlessExceptionWithMessage()
+ {
+ $this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage('test');
+
+ throw_unless(false, 'test');
+ }
+
+ public function testThrowUnlessExceptionAsStringWithMessage()
+ {
+ $this->expectException(LogicException::class);
+ $this->expectExceptionMessage('test');
- throw_if(true, new RuntimeException);
+ throw_unless(false, LogicException::class, 'test');
}
public function testThrowReturnIfNotThrown()
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/SupportLazyCollectionIsLazyTest.php b/tests/Support/SupportLazyCollectionIsLazyTest.php
index b61df7a6b632..dca52b769e07 100644
--- a/tests/Support/SupportLazyCollectionIsLazyTest.php
+++ b/tests/Support/SupportLazyCollectionIsLazyTest.php
@@ -2,12 +2,40 @@
namespace Illuminate\Tests\Support;
+use Illuminate\Collections\MultipleItemsFoundException;
use Illuminate\Support\LazyCollection;
use PHPUnit\Framework\TestCase;
use stdClass;
class SupportLazyCollectionIsLazyTest extends TestCase
{
+ use Concerns\CountsEnumerations;
+
+ public function testMakeWithClosureIsLazy()
+ {
+ [$closure, $recorder] = $this->makeGeneratorFunctionWithRecorder();
+
+ LazyCollection::make($closure);
+
+ $this->assertEquals([], $recorder->all());
+ }
+
+ public function testMakeWithLazyCollectionIsLazy()
+ {
+ $this->assertDoesNotEnumerate(function ($collection) {
+ LazyCollection::make($collection);
+ });
+ }
+
+ public function testMakeWithGeneratorIsNotLazy()
+ {
+ [$closure, $recorder] = $this->makeGeneratorFunctionWithRecorder(5);
+
+ LazyCollection::make($closure());
+
+ $this->assertEquals([1, 2, 3, 4, 5], $recorder->all());
+ }
+
public function testEagerEnumeratesOnce()
{
$this->assertEnumeratesOnce(function ($collection) {
@@ -484,6 +512,13 @@ public function testIsNotEmptyIsLazy()
});
}
+ public function testContainsOneItemIsLazy()
+ {
+ $this->assertEnumerates(2, function ($collection) {
+ $collection->containsOneItem();
+ });
+ }
+
public function testJoinIsLazy()
{
$this->assertEnumeratesOnce(function ($collection) {
@@ -943,6 +978,33 @@ public function testSomeIsLazy()
});
}
+ public function testSoleIsLazy()
+ {
+ $this->assertEnumerates(2, function ($collection) {
+ try {
+ $collection->sole();
+ } catch (MultipleItemsFoundException $e) {
+ //
+ }
+ });
+
+ $this->assertEnumeratesOnce(function ($collection) {
+ $collection->sole(function ($item) {
+ return $item === 1;
+ });
+ });
+
+ $this->assertEnumerates(4, function ($collection) {
+ try {
+ $collection->sole(function ($item) {
+ return $item % 2 === 0;
+ });
+ } catch (MultipleItemsFoundException $e) {
+ //
+ }
+ });
+ }
+
public function testSortIsLazy()
{
$this->assertDoesNotEnumerate(function ($collection) {
@@ -1439,77 +1501,4 @@ protected function make($source)
{
return new LazyCollection($source);
}
-
- protected function assertDoesNotEnumerate(callable $executor)
- {
- $this->assertEnumerates(0, $executor);
- }
-
- protected function assertDoesNotEnumerateCollection(
- LazyCollection $collection,
- callable $executor
- ) {
- $this->assertEnumeratesCollection($collection, 0, $executor);
- }
-
- protected function assertEnumerates($count, callable $executor)
- {
- $this->assertEnumeratesCollection(
- LazyCollection::times(100),
- $count,
- $executor
- );
- }
-
- protected function assertEnumeratesCollection(
- LazyCollection $collection,
- $count,
- callable $executor
- ) {
- $enumerated = 0;
-
- $data = $this->countEnumerations($collection, $enumerated);
-
- $executor($data);
-
- $this->assertEnumerations($count, $enumerated);
- }
-
- protected function assertEnumeratesOnce(callable $executor)
- {
- $this->assertEnumeratesCollectionOnce(LazyCollection::times(10), $executor);
- }
-
- protected function assertEnumeratesCollectionOnce(
- LazyCollection $collection,
- callable $executor
- ) {
- $enumerated = 0;
- $count = $collection->count();
- $collection = $this->countEnumerations($collection, $enumerated);
-
- $executor($collection);
-
- $this->assertEquals(
- $count,
- $enumerated,
- $count > $enumerated ? 'Failed to enumerate in full.' : 'Enumerated more than once.'
- );
- }
-
- protected function assertEnumerations($expected, $actual)
- {
- $this->assertEquals(
- $expected,
- $actual,
- "Failed asserting that {$actual} items that were enumerated matches expected {$expected}."
- );
- }
-
- protected function countEnumerations(LazyCollection $collection, &$count)
- {
- return $collection->tapEach(function () use (&$count) {
- $count++;
- });
- }
}
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/SupportPluralizerTest.php b/tests/Support/SupportPluralizerTest.php
index 5e4f4298ccef..ee3af6e45c04 100755
--- a/tests/Support/SupportPluralizerTest.php
+++ b/tests/Support/SupportPluralizerTest.php
@@ -16,6 +16,8 @@ public function testBasicPlural()
{
$this->assertSame('children', Str::plural('child'));
$this->assertSame('cod', Str::plural('cod'));
+ $this->assertSame('The words', Str::plural('The word'));
+ $this->assertSame('Bouquetés', Str::plural('Bouqueté'));
}
public function testCaseSensitiveSingularUsage()
@@ -68,6 +70,21 @@ public function testPluralStudlyWithCount()
$this->assertPluralStudly('RealHumans', 'RealHuman', -2);
}
+ public function testPluralNotAppliedForStringEndingWithNonAlphanumericCharacter()
+ {
+ $this->assertSame('Alien.', Str::plural('Alien.'));
+ $this->assertSame('Alien!', Str::plural('Alien!'));
+ $this->assertSame('Alien ', Str::plural('Alien '));
+ $this->assertSame('50%', Str::plural('50%'));
+ }
+
+ public function testPluralAppliedForStringEndingWithNumericCharacter()
+ {
+ $this->assertSame('User1s', Str::plural('User1'));
+ $this->assertSame('User2s', Str::plural('User2'));
+ $this->assertSame('User3s', Str::plural('User3'));
+ }
+
private function assertPluralStudly($expected, $value, $count = 2)
{
$this->assertSame($expected, Str::pluralStudly($value, $count));
diff --git a/tests/Support/SupportReflectorTest.php b/tests/Support/SupportReflectorTest.php
index 55c4940f7543..deebed5aabc7 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
@@ -67,6 +81,7 @@ class B extends A
{
public function f(parent $x)
{
+ //
}
}
@@ -78,7 +93,24 @@ class C
{
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/SupportReflectsClosuresTest.php b/tests/Support/SupportReflectsClosuresTest.php
index 3ab1200fedd0..1546b33c3696 100644
--- a/tests/Support/SupportReflectsClosuresTest.php
+++ b/tests/Support/SupportReflectsClosuresTest.php
@@ -12,7 +12,7 @@ public function testReflectsClosures()
{
$this->assertParameterTypes([ExampleParameter::class], function (ExampleParameter $one) {
// assert the Closure isn't actually executed
- throw new RuntimeException();
+ throw new RuntimeException;
});
$this->assertParameterTypes([], function () {
diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php
index 87bc3c0956c4..d8c744b37c70 100755
--- a/tests/Support/SupportStrTest.php
+++ b/tests/Support/SupportStrTest.php
@@ -365,6 +365,20 @@ public function testReplaceLast()
$this->assertSame('Malmö Jönköping', Str::replaceLast('', 'yyy', 'Malmö Jönköping'));
}
+ public function testRemove()
+ {
+ $this->assertSame('Fbar', Str::remove('o', 'Foobar'));
+ $this->assertSame('Foo', Str::remove('bar', 'Foobar'));
+ $this->assertSame('oobar', Str::remove('F', 'Foobar'));
+ $this->assertSame('Foobar', Str::remove('f', 'Foobar'));
+ $this->assertSame('oobar', Str::remove('f', 'Foobar', false));
+
+ $this->assertSame('Fbr', Str::remove(['o', 'a'], 'Foobar'));
+ $this->assertSame('Fooar', Str::remove(['f', 'b'], 'Foobar'));
+ $this->assertSame('ooar', Str::remove(['f', 'b'], 'Foobar', false));
+ $this->assertSame('Foobar', Str::remove(['f', '|'], 'Foo|bar'));
+ }
+
public function testSnake()
{
$this->assertSame('laravel_p_h_p_framework', Str::snake('LaravelPHPFramework'));
@@ -480,6 +494,12 @@ public function testPadRight()
$this->assertSame('Alien ', Str::padRight('Alien', 10));
}
+ public function testWordCount()
+ {
+ $this->assertEquals(2, Str::wordCount('Hello, world!'));
+ $this->assertEquals(10, Str::wordCount('Hi, this is my first contribution to the Laravel framework.'));
+ }
+
public function validUuidList()
{
return [
@@ -511,6 +531,18 @@ public function invalidUuidList()
['ff6f8cb0-c57da-51e1-9b21-0800200c9a66'],
];
}
+
+ public function testMarkdown()
+ {
+ $this->assertSame("
hello world
\n", Str::markdown('*hello world*'));
+ $this->assertSame("
hello world
\n", Str::markdown('# hello world'));
+ }
+
+ public function testRepeat()
+ {
+ $this->assertSame('aaaaa', Str::repeat('a', 5));
+ $this->assertSame('', Str::repeat('', 5));
+ }
}
class StringableObjectStub
diff --git a/tests/Support/SupportStringableTest.php b/tests/Support/SupportStringableTest.php
index f742dfba6753..6ab7d65c5b55 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());
@@ -53,6 +62,14 @@ public function testMatch()
$this->assertTrue($stringable->matchAll('/nothing/')->isEmpty());
}
+ public function testTest()
+ {
+ $stringable = $this->stringable('foo bar');
+
+ $this->assertTrue($stringable->test('/bar/'));
+ $this->assertTrue($stringable->test('/foo (.*)/'));
+ }
+
public function testTrim()
{
$this->assertSame('foo', (string) $this->stringable(' foo ')->trim());
@@ -92,6 +109,23 @@ public function testWhenEmpty()
}));
}
+ public function testWhenNotEmpty()
+ {
+ tap($this->stringable(), function ($stringable) {
+ $this->assertSame($stringable, $stringable->whenNotEmpty(function ($stringable) {
+ return $stringable.'.';
+ }));
+ });
+
+ $this->assertSame('', (string) $this->stringable()->whenNotEmpty(function ($stringable) {
+ return $stringable.'.';
+ }));
+
+ $this->assertSame('Not empty.', (string) $this->stringable('Not empty')->whenNotEmpty(function ($stringable) {
+ return $stringable.'.';
+ }));
+ }
+
public function testWhenFalse()
{
$this->assertSame('when', (string) $this->stringable('when')->when(false, function ($stringable, $value) {
@@ -435,6 +469,20 @@ public function testReplaceLast()
$this->assertSame('Malmö Jönköping', (string) $this->stringable('Malmö Jönköping')->replaceLast('', 'yyy'));
}
+ public function testRemove()
+ {
+ $this->assertSame('Fbar', (string) $this->stringable('Foobar')->remove('o'));
+ $this->assertSame('Foo', (string) $this->stringable('Foobar')->remove('bar'));
+ $this->assertSame('oobar', (string) $this->stringable('Foobar')->remove('F'));
+ $this->assertSame('Foobar', (string) $this->stringable('Foobar')->remove('f'));
+ $this->assertSame('oobar', (string) $this->stringable('Foobar')->remove('f', false));
+
+ $this->assertSame('Fbr', (string) $this->stringable('Foobar')->remove(['o', 'a']));
+ $this->assertSame('Fooar', (string) $this->stringable('Foobar')->remove(['f', 'b']));
+ $this->assertSame('ooar', (string) $this->stringable('Foobar')->remove(['f', 'b'], false));
+ $this->assertSame('Foobar', (string) $this->stringable('Foo|bar')->remove(['f', '|']));
+ }
+
public function testSnake()
{
$this->assertSame('laravel_p_h_p_framework', (string) $this->stringable('LaravelPHPFramework')->snake());
@@ -528,4 +576,59 @@ 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());
+ }
+
+ public function testJsonSerialize()
+ {
+ $this->assertSame('"foo"', json_encode($this->stringable('foo')));
+ }
+
+ public function testTap()
+ {
+ $stringable = $this->stringable('foobarbaz');
+
+ $fromTheTap = '';
+
+ $stringable = $stringable->tap(function (Stringable $string) use (&$fromTheTap) {
+ $fromTheTap = $string->substr(0, 3);
+ });
+
+ $this->assertSame('foo', (string) $fromTheTap);
+ $this->assertSame('foobarbaz', (string) $stringable);
+ }
+
+ public function testPipe()
+ {
+ $callback = function ($stringable) {
+ return 'bar';
+ };
+
+ $this->assertInstanceOf(Stringable::class, $this->stringable('foo')->pipe($callback));
+ $this->assertSame('bar', (string) $this->stringable('foo')->pipe($callback));
+ }
+
+ public function testMarkdown()
+ {
+ $this->assertEquals("
hello world
\n", $this->stringable('*hello world*')->markdown());
+ $this->assertEquals("
hello world
\n", $this->stringable('# hello world')->markdown());
+ }
+
+ public function testRepeat()
+ {
+ $this->assertSame('aaaaa', (string) $this->stringable('a')->repeat(5));
+ $this->assertSame('', (string) $this->stringable('')->repeat(5));
+ }
+
+ public function testWordCount()
+ {
+ $this->assertEquals(2, $this->stringable('Hello, world!')->wordCount());
+ $this->assertEquals(10, $this->stringable('Hi, this is my first contribution to the Laravel framework.')->wordCount());
+ }
}
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/Support/SupportTestingQueueFakeTest.php b/tests/Support/SupportTestingQueueFakeTest.php
index a2996c492d2b..cf22717cf29b 100644
--- a/tests/Support/SupportTestingQueueFakeTest.php
+++ b/tests/Support/SupportTestingQueueFakeTest.php
@@ -220,7 +220,7 @@ public function testAssertPushedWithChainUsingCallback()
$this->fake->assertPushedWithChain(JobWithChainAndParameterStub::class, [
JobStub::class,
], function ($job) {
- return $job->parameter == 'second';
+ return $job->parameter === 'second';
});
try {
@@ -228,7 +228,7 @@ public function testAssertPushedWithChainUsingCallback()
JobStub::class,
JobStub::class,
], function ($job) {
- return $job->parameter == 'second';
+ return $job->parameter === 'second';
});
$this->fail();
} catch (ExpectationFailedException $e) {
diff --git a/tests/Testing/Concerns/TestDatabasesTest.php b/tests/Testing/Concerns/TestDatabasesTest.php
new file mode 100644
index 000000000000..7042bd5362c3
--- /dev/null
+++ b/tests/Testing/Concerns/TestDatabasesTest.php
@@ -0,0 +1,110 @@
+singleton('config', function () {
+ return m::mock(Config::class)
+ ->shouldReceive('get')
+ ->once()
+ ->with('database.default', null)
+ ->andReturn('mysql')
+ ->getMock();
+ });
+
+ $_SERVER['LARAVEL_PARALLEL_TESTING'] = 1;
+ }
+
+ public function testSwitchToDatabaseWithoutUrl()
+ {
+ DB::shouldReceive('purge')->once();
+
+ config()->shouldReceive('get')
+ ->once()
+ ->with('database.connections.mysql.url', false)
+ ->andReturn(false);
+
+ config()->shouldReceive('set')
+ ->once()
+ ->with('database.connections.mysql.database', 'my_database_test_1');
+
+ $this->switchToDatabase('my_database_test_1');
+ }
+
+ /**
+ * @dataProvider databaseUrls
+ */
+ public function testSwitchToDatabaseWithUrl($testDatabase, $url, $testUrl)
+ {
+ DB::shouldReceive('purge')->once();
+
+ config()->shouldReceive('get')
+ ->once()
+ ->with('database.connections.mysql.url', false)
+ ->andReturn($url);
+
+ config()->shouldReceive('set')
+ ->once()
+ ->with('database.connections.mysql.url', $testUrl);
+
+ $this->switchToDatabase($testDatabase);
+ }
+
+ public function switchToDatabase($database)
+ {
+ $instance = new class {
+ use TestDatabases;
+ };
+
+ $method = new ReflectionMethod($instance, 'switchToDatabase');
+ tap($method)->setAccessible(true)->invoke($instance, $database);
+ }
+
+ public function databaseUrls()
+ {
+ return [
+ [
+ 'my_database_test_1',
+ 'mysql://root:@127.0.0.1/my_database?charset=utf8mb4',
+ 'mysql://root:@127.0.0.1/my_database_test_1?charset=utf8mb4',
+ ],
+ [
+ 'my_database_test_1',
+ 'mysql://my-user:@localhost/my_database',
+ 'mysql://my-user:@localhost/my_database_test_1',
+ ],
+ [
+ 'my-database_test_1',
+ 'postgresql://my_database_user:@127.0.0.1/my-database?charset=utf8',
+ 'postgresql://my_database_user:@127.0.0.1/my-database_test_1?charset=utf8',
+ ],
+ ];
+ }
+
+ public function tearDown(): void
+ {
+ parent::tearDown();
+
+ Container::setInstance(null);
+ DB::clearResolvedInstances();
+ DB::setFacadeApplication(null);
+
+ unset($_SERVER['LARAVEL_PARALLEL_TESTING']);
+
+ m::close();
+ }
+}
diff --git a/tests/Testing/Fluent/AssertTest.php b/tests/Testing/Fluent/AssertTest.php
new file mode 100644
index 000000000000..69f9278a6956
--- /dev/null
+++ b/tests/Testing/Fluent/AssertTest.php
@@ -0,0 +1,968 @@
+ 'value',
+ ]);
+
+ $assert->has('prop');
+ }
+
+ public function testAssertHasFailsWhenPropMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'value',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [prop] does not exist.');
+
+ $assert->has('prop');
+ }
+
+ public function testAssertHasNestedProp()
+ {
+ $assert = AssertableJson::fromArray([
+ 'example' => [
+ 'nested' => 'nested-value',
+ ],
+ ]);
+
+ $assert->has('example.nested');
+ }
+
+ public function testAssertHasFailsWhenNestedPropMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'example' => [
+ 'nested' => 'nested-value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [example.another] does not exist.');
+
+ $assert->has('example.another');
+ }
+
+ public function testAssertHasCountItemsInProp()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $assert->has('bar', 2);
+ }
+
+ public function testAssertHasCountFailsWhenAmountOfItemsDoesNotMatch()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] does not have the expected size.');
+
+ $assert->has('bar', 1);
+ }
+
+ public function testAssertHasCountFailsWhenPropMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [baz] does not exist.');
+
+ $assert->has('baz', 1);
+ }
+
+ public function testAssertHasFailsWhenSecondArgumentUnsupportedType()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'baz',
+ ]);
+
+ $this->expectException(TypeError::class);
+
+ $assert->has('bar', 'invalid');
+ }
+
+ public function testAssertHasOnlyCounts()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo',
+ 'bar',
+ 'baz',
+ ]);
+
+ $assert->has(3);
+ }
+
+ public function testAssertHasOnlyCountFails()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo',
+ 'bar',
+ 'baz',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Root level does not have the expected size.');
+
+ $assert->has(2);
+ }
+
+ public function testAssertHasOnlyCountFailsScoped()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] does not have the expected size.');
+
+ $assert->has('bar', function ($bar) {
+ $bar->has(3);
+ });
+ }
+
+ public function testAssertCount()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo',
+ 'bar',
+ 'baz',
+ ]);
+
+ $assert->count(3);
+ }
+
+ public function testAssertCountFails()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo',
+ 'bar',
+ 'baz',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Root level does not have the expected size.');
+
+ $assert->count(2);
+ }
+
+ public function testAssertCountFailsScoped()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] does not have the expected size.');
+
+ $assert->has('bar', function ($bar) {
+ $bar->count(3);
+ });
+ }
+
+ public function testAssertMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => [
+ 'bar' => true,
+ ],
+ ]);
+
+ $assert->missing('foo.baz');
+ }
+
+ public function testAssertMissingFailsWhenPropExists()
+ {
+ $assert = AssertableJson::fromArray([
+ 'prop' => 'value',
+ 'foo' => [
+ 'bar' => true,
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [foo.bar] was found while it was expected to be missing.');
+
+ $assert->missing('foo.bar');
+ }
+
+ public function testAssertMissingAll()
+ {
+ $assert = AssertableJson::fromArray([
+ 'baz' => 'foo',
+ ]);
+
+ $assert->missingAll([
+ 'foo',
+ 'bar',
+ ]);
+ }
+
+ public function testAssertMissingAllFailsWhenAtLeastOnePropExists()
+ {
+ $assert = AssertableJson::fromArray([
+ 'baz' => 'foo',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [baz] was found while it was expected to be missing.');
+
+ $assert->missingAll([
+ 'bar',
+ 'baz',
+ ]);
+ }
+
+ public function testAssertMissingAllAcceptsMultipleArgumentsInsteadOfArray()
+ {
+ $assert = AssertableJson::fromArray([
+ 'baz' => 'foo',
+ ]);
+
+ $assert->missingAll('foo', 'bar');
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [baz] was found while it was expected to be missing.');
+
+ $assert->missingAll('bar', 'baz');
+ }
+
+ public function testAssertWhereMatchesValue()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'value',
+ ]);
+
+ $assert->where('bar', 'value');
+ }
+
+ public function testAssertWhereFailsWhenDoesNotMatchValue()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'value',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] does not match the expected value.');
+
+ $assert->where('bar', 'invalid');
+ }
+
+ public function testAssertWhereFailsWhenMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'value',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [baz] does not exist.');
+
+ $assert->where('baz', 'invalid');
+ }
+
+ public function testAssertWhereFailsWhenMachingLoosely()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 1,
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] does not match the expected value.');
+
+ $assert->where('bar', true);
+ }
+
+ public function testAssertWhereUsingClosure()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'baz',
+ ]);
+
+ $assert->where('bar', function ($value) {
+ return $value === 'baz';
+ });
+ }
+
+ public function testAssertWhereFailsWhenDoesNotMatchValueUsingClosure()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'baz',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] was marked as invalid using a closure.');
+
+ $assert->where('bar', function ($value) {
+ return $value === 'invalid';
+ });
+ }
+
+ public function testAssertWhereClosureArrayValuesAreAutomaticallyCastedToCollections()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'foo',
+ 'example' => 'value',
+ ],
+ ]);
+
+ $assert->where('bar', function ($value) {
+ $this->assertInstanceOf(Collection::class, $value);
+
+ return $value->count() === 2;
+ });
+ }
+
+ public function testAssertWhereMatchesValueUsingArrayable()
+ {
+ $stub = ArrayableStubObject::make(['foo' => 'bar']);
+
+ $assert = AssertableJson::fromArray([
+ 'bar' => $stub->toArray(),
+ ]);
+
+ $assert->where('bar', $stub);
+ }
+
+ public function testAssertWhereMatchesValueUsingArrayableWhenSortedDifferently()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'foo',
+ 'example' => 'value',
+ ],
+ ]);
+
+ $assert->where('bar', function ($value) {
+ $this->assertInstanceOf(Collection::class, $value);
+
+ return $value->count() === 2;
+ });
+ }
+
+ public function testAssertWhereFailsWhenDoesNotMatchValueUsingArrayable()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => ['id' => 1, 'name' => 'Example'],
+ 'baz' => [
+ 'id' => 1,
+ 'name' => 'Taylor Otwell',
+ 'email' => 'taylor@laravel.com',
+ 'email_verified_at' => '2021-01-22T10:34:42.000000Z',
+ 'created_at' => '2021-01-22T10:34:42.000000Z',
+ 'updated_at' => '2021-01-22T10:34:42.000000Z',
+ ],
+ ]);
+
+ $assert
+ ->where('bar', ArrayableStubObject::make(['name' => 'Example', 'id' => 1]))
+ ->where('baz', [
+ 'name' => 'Taylor Otwell',
+ 'email' => 'taylor@laravel.com',
+ 'id' => 1,
+ 'email_verified_at' => '2021-01-22T10:34:42.000000Z',
+ 'updated_at' => '2021-01-22T10:34:42.000000Z',
+ 'created_at' => '2021-01-22T10:34:42.000000Z',
+ ]);
+ }
+
+ public function testAssertNestedWhereMatchesValue()
+ {
+ $assert = AssertableJson::fromArray([
+ 'example' => [
+ 'nested' => 'nested-value',
+ ],
+ ]);
+
+ $assert->where('example.nested', 'nested-value');
+ }
+
+ public function testAssertNestedWhereFailsWhenDoesNotMatchValue()
+ {
+ $assert = AssertableJson::fromArray([
+ 'example' => [
+ 'nested' => 'nested-value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [example.nested] does not match the expected value.');
+
+ $assert->where('example.nested', 'another-value');
+ }
+
+ public function testScope()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $called = false;
+ $assert->has('bar', function (AssertableJson $assert) use (&$called) {
+ $called = true;
+ $assert
+ ->where('baz', 'example')
+ ->where('prop', 'value');
+ });
+
+ $this->assertTrue($called, 'The scoped query was never actually called.');
+ }
+
+ public function testScopeFailsWhenPropMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [baz] does not exist.');
+
+ $assert->has('baz', function (AssertableJson $item) {
+ $item->where('baz', 'example');
+ });
+ }
+
+ public function testScopeFailsWhenPropSingleValue()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => 'value',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] is not scopeable.');
+
+ $assert->has('bar', function (AssertableJson $item) {
+ //
+ });
+ }
+
+ public function testScopeShorthand()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ ['key' => 'first'],
+ ['key' => 'second'],
+ ],
+ ]);
+
+ $called = false;
+ $assert->has('bar', 2, function (AssertableJson $item) use (&$called) {
+ $item->where('key', 'first');
+ $called = true;
+ });
+
+ $this->assertTrue($called, 'The scoped query was never actually called.');
+ }
+
+ public function testScopeShorthandFailsWhenAssertingZeroItems()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ ['key' => 'first'],
+ ['key' => 'second'],
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] does not have the expected size.');
+
+ $assert->has('bar', 0, function (AssertableJson $item) {
+ $item->where('key', 'first');
+ });
+ }
+
+ public function testScopeShorthandFailsWhenAmountOfItemsDoesNotMatch()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ ['key' => 'first'],
+ ['key' => 'second'],
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [bar] does not have the expected size.');
+
+ $assert->has('bar', 1, function (AssertableJson $item) {
+ $item->where('key', 'first');
+ });
+ }
+
+ public function testFirstScope()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => [
+ 'key' => 'first',
+ ],
+ 'bar' => [
+ 'key' => 'second',
+ ],
+ ]);
+
+ $assert->first(function (AssertableJson $item) {
+ $item->where('key', 'first');
+ });
+ }
+
+ public function testFirstScopeFailsWhenNoProps()
+ {
+ $assert = AssertableJson::fromArray([]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Cannot scope directly onto the first element of the root level because it is empty.');
+
+ $assert->first(function (AssertableJson $item) {
+ //
+ });
+ }
+
+ public function testFirstNestedScopeFailsWhenNoProps()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => [],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Cannot scope directly onto the first element of property [foo] because it is empty.');
+
+ $assert->has('foo', function (AssertableJson $assert) {
+ $assert->first(function (AssertableJson $item) {
+ //
+ });
+ });
+ }
+
+ public function testFirstScopeFailsWhenPropSingleValue()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [foo] is not scopeable.');
+
+ $assert->first(function (AssertableJson $item) {
+ //
+ });
+ }
+
+ public function testFailsWhenNotInteractingWithAllPropsInScope()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Unexpected properties were found in scope [bar].');
+
+ $assert->has('bar', function (AssertableJson $item) {
+ $item->where('baz', 'example');
+ });
+ }
+
+ public function testDisableInteractionCheckForCurrentScope()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $assert->has('bar', function (AssertableJson $item) {
+ $item->etc();
+ });
+ }
+
+ public function testCannotDisableInteractionCheckForDifferentScopes()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => [
+ 'foo' => 'bar',
+ 'example' => 'value',
+ ],
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Unexpected properties were found in scope [bar.baz].');
+
+ $assert->has('bar', function (AssertableJson $item) {
+ $item
+ ->etc()
+ ->has('baz', function (AssertableJson $item) {
+ //
+ });
+ });
+ }
+
+ public function testTopLevelPropInteractionDisabledByDefault()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ 'bar' => 'baz',
+ ]);
+
+ $assert->has('foo');
+ }
+
+ public function testTopLevelInteractionEnabledWhenInteractedFlagSet()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ 'bar' => 'baz',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Unexpected properties were found on the root level.');
+
+ $assert
+ ->has('foo')
+ ->interacted();
+ }
+
+ public function testAssertWhereAllMatchesValues()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => [
+ 'bar' => 'value',
+ 'example' => ['hello' => 'world'],
+ ],
+ 'baz' => 'another',
+ ]);
+
+ $assert->whereAll([
+ 'foo.bar' => 'value',
+ 'foo.example' => ArrayableStubObject::make(['hello' => 'world']),
+ 'baz' => function ($value) {
+ return $value === 'another';
+ },
+ ]);
+ }
+
+ public function testAssertWhereAllFailsWhenAtLeastOnePropDoesNotMatchValue()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ 'baz' => 'example',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [baz] was marked as invalid using a closure.');
+
+ $assert->whereAll([
+ 'foo' => 'bar',
+ 'baz' => function ($value) {
+ return $value === 'foo';
+ },
+ ]);
+ }
+
+ public function testAssertWhereTypeString()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ ]);
+
+ $assert->whereType('foo', 'string');
+ }
+
+ public function testAssertWhereTypeInteger()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 123,
+ ]);
+
+ $assert->whereType('foo', 'integer');
+ }
+
+ public function testAssertWhereTypeBoolean()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => true,
+ ]);
+
+ $assert->whereType('foo', 'boolean');
+ }
+
+ public function testAssertWhereTypeDouble()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 12.3,
+ ]);
+
+ $assert->whereType('foo', 'double');
+ }
+
+ public function testAssertWhereTypeArray()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => ['bar', 'baz'],
+ 'bar' => ['foo' => 'baz'],
+ ]);
+
+ $assert->whereType('foo', 'array');
+ $assert->whereType('bar', 'array');
+ }
+
+ public function testAssertWhereTypeNull()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => null,
+ ]);
+
+ $assert->whereType('foo', 'null');
+ }
+
+ public function testAssertWhereAllType()
+ {
+ $assert = AssertableJson::fromArray([
+ 'one' => 'foo',
+ 'two' => 123,
+ 'three' => true,
+ 'four' => 12.3,
+ 'five' => ['foo', 'bar'],
+ 'six' => ['foo' => 'bar'],
+ 'seven' => null,
+ ]);
+
+ $assert->whereAllType([
+ 'one' => 'string',
+ 'two' => 'integer',
+ 'three' => 'boolean',
+ 'four' => 'double',
+ 'five' => 'array',
+ 'six' => 'array',
+ 'seven' => 'null',
+ ]);
+ }
+
+ public function testAssertWhereTypeWhenWrongTypeIsGiven()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [foo] is not of expected type [integer].');
+
+ $assert->whereType('foo', 'integer');
+ }
+
+ public function testAssertWhereTypeWithUnionTypes()
+ {
+ $firstAssert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ ]);
+
+ $secondAssert = AssertableJson::fromArray([
+ 'foo' => null,
+ ]);
+
+ $firstAssert->whereType('foo', ['string', 'null']);
+ $secondAssert->whereType('foo', ['string', 'null']);
+ }
+
+ public function testAssertWhereTypeWhenWrongUnionTypeIsGiven()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 123,
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [foo] is not of expected type [string|null].');
+
+ $assert->whereType('foo', ['string', 'null']);
+ }
+
+ public function testAssertWhereTypeWithPipeInUnionType()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ ]);
+
+ $assert->whereType('foo', 'string|null');
+ }
+
+ public function testAssertWhereTypeWithPipeInWrongUnionType()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => 'bar',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [foo] is not of expected type [integer|null].');
+
+ $assert->whereType('foo', 'integer|null');
+ }
+
+ public function testAssertHasAll()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => [
+ 'bar' => 'value',
+ 'example' => ['hello' => 'world'],
+ ],
+ 'baz' => 'another',
+ ]);
+
+ $assert->hasAll([
+ 'foo.bar',
+ 'foo.example',
+ 'baz',
+ ]);
+ }
+
+ public function testAssertHasAllFailsWhenAtLeastOnePropMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => [
+ 'bar' => 'value',
+ 'example' => ['hello' => 'world'],
+ ],
+ 'baz' => 'another',
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [foo.baz] does not exist.');
+
+ $assert->hasAll([
+ 'foo.bar',
+ 'foo.baz',
+ 'baz',
+ ]);
+ }
+
+ public function testAssertHasAllAcceptsMultipleArgumentsInsteadOfArray()
+ {
+ $assert = AssertableJson::fromArray([
+ 'foo' => [
+ 'bar' => 'value',
+ 'example' => ['hello' => 'world'],
+ ],
+ 'baz' => 'another',
+ ]);
+
+ $assert->hasAll('foo.bar', 'foo.example', 'baz');
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [foo.baz] does not exist.');
+
+ $assert->hasAll('foo.bar', 'foo.baz', 'baz');
+ }
+
+ public function testAssertCountMultipleProps()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'key' => 'value',
+ 'prop' => 'example',
+ ],
+ 'baz' => [
+ 'another' => 'value',
+ ],
+ ]);
+
+ $assert->hasAll([
+ 'bar' => 2,
+ 'baz' => 1,
+ ]);
+ }
+
+ public function testAssertCountMultiplePropsFailsWhenPropMissing()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'key' => 'value',
+ 'prop' => 'example',
+ ],
+ ]);
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Property [baz] does not exist.');
+
+ $assert->hasAll([
+ 'bar' => 2,
+ 'baz' => 1,
+ ]);
+ }
+
+ public function testMacroable()
+ {
+ AssertableJson::macro('myCustomMacro', function () {
+ throw new RuntimeException('My Custom Macro was called!');
+ });
+
+ $this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage('My Custom Macro was called!');
+
+ $assert = AssertableJson::fromArray(['foo' => 'bar']);
+ $assert->myCustomMacro();
+ }
+
+ public function testTappable()
+ {
+ $assert = AssertableJson::fromArray([
+ 'bar' => [
+ 'baz' => 'example',
+ 'prop' => 'value',
+ ],
+ ]);
+
+ $called = false;
+ $assert->has('bar', function (AssertableJson $assert) use (&$called) {
+ $assert->etc();
+ $assert->tap(function (AssertableJson $assert) use (&$called) {
+ $called = true;
+ });
+ });
+
+ $this->assertTrue($called, 'The scoped query was never actually called.');
+ }
+}
diff --git a/tests/Testing/ParallelConsoleOutputTest.php b/tests/Testing/ParallelConsoleOutputTest.php
new file mode 100644
index 000000000000..7e9da0244df1
--- /dev/null
+++ b/tests/Testing/ParallelConsoleOutputTest.php
@@ -0,0 +1,25 @@
+write('Running phpunit in 12 processes with laravel/laravel.');
+ $this->assertEmpty($original->fetch());
+
+ $output->write('Configuration read from phpunit.xml.dist');
+ $this->assertEmpty($original->fetch());
+
+ $output->write('... 3/3 (100%)');
+ $this->assertSame('... 3/3 (100%)', $original->fetch());
+ }
+}
diff --git a/tests/Testing/ParallelTestingTest.php b/tests/Testing/ParallelTestingTest.php
new file mode 100644
index 000000000000..cb6fafb95382
--- /dev/null
+++ b/tests/Testing/ParallelTestingTest.php
@@ -0,0 +1,100 @@
+{$caller}($this);
+ $this->assertFalse($state);
+
+ $parallelTesting->{$callback}(function ($token, $testCase = null) use ($callback, &$state) {
+ if (in_array($callback, ['setUpTestCase', 'tearDownTestCase'])) {
+ $this->assertSame($this, $testCase);
+ } else {
+ $this->assertNull($testCase);
+ }
+
+ $this->assertEquals(1, $token);
+ $state = true;
+ });
+
+ $parallelTesting->{$caller}($this);
+ $this->assertFalse($state);
+
+ $parallelTesting->resolveTokenUsing(function () {
+ return 1;
+ });
+
+ $parallelTesting->{$caller}($this);
+ $this->assertTrue($state);
+ }
+
+ public function testOptions()
+ {
+ $parallelTesting = new ParallelTesting(Container::getInstance());
+
+ $this->assertFalse($parallelTesting->option('recreate_databases'));
+
+ $parallelTesting->resolveOptionsUsing(function ($option) {
+ return $option === 'recreate_databases';
+ });
+
+ $this->assertFalse($parallelTesting->option('recreate_caches'));
+ $this->assertTrue($parallelTesting->option('recreate_databases'));
+ }
+
+ public function testToken()
+ {
+ $parallelTesting = new ParallelTesting(Container::getInstance());
+
+ $this->assertFalse($parallelTesting->token());
+
+ $parallelTesting->resolveTokenUsing(function () {
+ return 1;
+ });
+
+ $this->assertSame(1, $parallelTesting->token());
+ }
+
+ public function callbacks()
+ {
+ return [
+ ['setUpProcess'],
+ ['setUpTestCase'],
+ ['setUpTestDatabase'],
+ ['tearDownTestCase'],
+ ['tearDownProcess'],
+ ];
+ }
+
+ public function tearDown(): void
+ {
+ parent::tearDown();
+
+ Container::setInstance(null);
+
+ unset($_SERVER['LARAVEL_PARALLEL_TESTING']);
+ }
+}
diff --git a/tests/Testing/Stubs/ArrayableStubObject.php b/tests/Testing/Stubs/ArrayableStubObject.php
new file mode 100644
index 000000000000..021440e0b287
--- /dev/null
+++ b/tests/Testing/Stubs/ArrayableStubObject.php
@@ -0,0 +1,25 @@
+data = $data;
+ }
+
+ public static function make($data = [])
+ {
+ return new self($data);
+ }
+
+ public function toArray()
+ {
+ return $this->data;
+ }
+}
diff --git a/tests/Testing/TestResponseTest.php b/tests/Testing/TestResponseTest.php
index 89bfa46b272d..7257b0159e58 100644
--- a/tests/Testing/TestResponseTest.php
+++ b/tests/Testing/TestResponseTest.php
@@ -1,11 +1,15 @@
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 +215,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 +298,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;
@@ -415,6 +578,39 @@ public function testAssertJsonWithNull()
$response->assertJson($resource->jsonSerialize());
}
+ public function testAssertJsonWithFluent()
+ {
+ $response = TestResponse::fromBaseResponse(new Response(new JsonSerializableSingleResourceStub));
+
+ $response->assertJson(function (AssertableJson $json) {
+ $json->where('0.foo', 'foo 0');
+ });
+ }
+
+ public function testAssertJsonWithFluentFailsWhenNotInteractingWithAllProps()
+ {
+ $response = TestResponse::fromBaseResponse(new Response(new JsonSerializableMixedResourcesStub));
+
+ $this->expectException(AssertionFailedError::class);
+ $this->expectExceptionMessage('Unexpected properties were found on the root level.');
+
+ $response->assertJson(function (AssertableJson $json) {
+ $json->where('foo', 'bar');
+ });
+ }
+
+ public function testAssertJsonWithFluentSkipsInteractionWhenTopLevelKeysNonAssociative()
+ {
+ $response = TestResponse::fromBaseResponse(new Response([
+ ['foo' => 'bar'],
+ ['foo' => 'baz'],
+ ]));
+
+ $response->assertJson(function (AssertableJson $json) {
+ //
+ });
+ }
+
public function testAssertSimilarJsonWithMixed()
{
$response = TestResponse::fromBaseResponse(new Response(new JsonSerializableMixedResourcesStub));
@@ -886,6 +1082,27 @@ public function testAssertJsonMissingValidationErrorsCanFail2()
$response->assertJsonMissingValidationErrors('bar');
}
+ public function testAssertJsonMissingValidationErrorsCanFail3()
+ {
+ $this->expectException(AssertionFailedError::class);
+
+ $baseResponse = tap(new Response, function ($response) {
+ $response->setContent(
+ json_encode([
+ 'data' => [
+ 'errors' => [
+ 'foo' => ['one'],
+ ],
+ ],
+ ]),
+ );
+ });
+
+ $response = TestResponse::fromBaseResponse($baseResponse);
+
+ $response->assertJsonMissingValidationErrors('foo', 'data.errors');
+ }
+
public function testAssertJsonMissingValidationErrorsWithoutArgument()
{
$data = ['status' => 'ok'];
@@ -947,6 +1164,31 @@ public function testAssertJsonMissingValidationErrorsCustomErrorsName()
$testResponse->assertJsonMissingValidationErrors('bar', 'data');
}
+ public function testAssertJsonMissingValidationErrorsNestedCustomErrorsName1()
+ {
+ $data = [
+ 'status' => 'ok',
+ 'data' => [
+ 'errors' => ['foo' => 'oops'],
+ ],
+ ];
+
+ $testResponse = TestResponse::fromBaseResponse(
+ (new Response)->setContent(json_encode($data))
+ );
+
+ $testResponse->assertJsonMissingValidationErrors('bar', 'data.errors');
+ }
+
+ public function testAssertJsonMissingValidationErrorsNestedCustomErrorsName2()
+ {
+ $testResponse = TestResponse::fromBaseResponse(
+ (new Response)->setContent(json_encode([]))
+ );
+
+ $testResponse->assertJsonMissingValidationErrors('bar', 'data.errors');
+ }
+
public function testMacroable()
{
TestResponse::macro('foo', function () {
@@ -996,6 +1238,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 +1343,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/ValidationAddFailureTest.php b/tests/Validation/ValidationAddFailureTest.php
index ec94133a18ed..20fa5e43706f 100644
--- a/tests/Validation/ValidationAddFailureTest.php
+++ b/tests/Validation/ValidationAddFailureTest.php
@@ -25,7 +25,7 @@ public function testAddFailureExists()
$validator = $this->makeValidator();
$method_name = 'addFailure';
$this->assertTrue(method_exists($validator, $method_name));
- $this->assertTrue(is_callable([$validator, $method_name]));
+ $this->assertIsCallable([$validator, $method_name]);
}
public function testAddFailureIsFunctional()
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/ValidationNotPwnedVerifierTest.php b/tests/Validation/ValidationNotPwnedVerifierTest.php
new file mode 100644
index 000000000000..fb50b61a81fa
--- /dev/null
+++ b/tests/Validation/ValidationNotPwnedVerifierTest.php
@@ -0,0 +1,126 @@
+assertFalse($verifier->verify([
+ 'value' => $password,
+ 'threshold' => 0,
+ ]));
+ }
+ }
+
+ public function testApiResponseGoesWrong()
+ {
+ $httpFactory = m::mock(HttpFactory::class);
+ $response = m::mock(Response::class);
+
+ $httpFactory = m::mock(HttpFactory::class);
+
+ $httpFactory
+ ->shouldReceive('withHeaders')
+ ->once()
+ ->with(['Add-Padding' => true])
+ ->andReturn($httpFactory);
+
+ $httpFactory->shouldReceive('get')
+ ->once()
+ ->andReturn($response);
+
+ $response->shouldReceive('successful')
+ ->once()
+ ->andReturn(true);
+
+ $response->shouldReceive('body')
+ ->once()
+ ->andReturn('');
+
+ $verifier = new NotPwnedVerifier($httpFactory);
+
+ $this->assertTrue($verifier->verify([
+ 'value' => 123123123,
+ 'threshold' => 0,
+ ]));
+ }
+
+ public function testApiGoesDown()
+ {
+ $httpFactory = m::mock(HttpFactory::class);
+ $response = m::mock(Response::class);
+
+ $httpFactory
+ ->shouldReceive('withHeaders')
+ ->once()
+ ->with(['Add-Padding' => true])
+ ->andReturn($httpFactory);
+
+ $httpFactory->shouldReceive('get')
+ ->once()
+ ->andReturn($response);
+
+ $response->shouldReceive('successful')
+ ->once()
+ ->andReturn(false);
+
+ $verifier = new NotPwnedVerifier($httpFactory);
+
+ $this->assertTrue($verifier->verify([
+ 'value' => 123123123,
+ 'threshold' => 0,
+ ]));
+ }
+
+ public function testDnsDown()
+ {
+ $container = Container::getInstance();
+ $exception = new ConnectionException();
+
+ $exceptionHandler = m::mock(ExceptionHandler::class);
+ $exceptionHandler->shouldReceive('report')->once()->with($exception);
+ $container->bind(ExceptionHandler::class, function () use ($exceptionHandler) {
+ return $exceptionHandler;
+ });
+
+ $httpFactory = m::mock(HttpFactory::class);
+
+ $httpFactory
+ ->shouldReceive('withHeaders')
+ ->once()
+ ->with(['Add-Padding' => true])
+ ->andReturn($httpFactory);
+
+ $httpFactory
+ ->shouldReceive('get')
+ ->once()
+ ->andThrow($exception);
+
+ $verifier = new NotPwnedVerifier($httpFactory);
+ $this->assertTrue($verifier->verify([
+ 'value' => 123123123,
+ 'threshold' => 0,
+ ]));
+ }
+}
diff --git a/tests/Validation/ValidationPasswordRuleTest.php b/tests/Validation/ValidationPasswordRuleTest.php
new file mode 100644
index 000000000000..e397bb8d9033
--- /dev/null
+++ b/tests/Validation/ValidationPasswordRuleTest.php
@@ -0,0 +1,231 @@
+fails(Password::min(3), [['foo' => 'bar'], ['foo']], [
+ 'validation.string',
+ 'validation.min.string',
+ ]);
+
+ $this->fails(Password::min(3), [1234567, 545], [
+ 'validation.string',
+ ]);
+
+ $this->passes(Password::min(3), ['abcd', '454qb^', '接2133手田']);
+ }
+
+ public function testMin()
+ {
+ $this->fails(new Password(8), ['a', 'ff', '12'], [
+ 'validation.min.string',
+ ]);
+
+ $this->fails(Password::min(3), ['a', 'ff', '12'], [
+ 'validation.min.string',
+ ]);
+
+ $this->passes(Password::min(3), ['333', 'abcd']);
+ $this->passes(new Password(8), ['88888888']);
+ }
+
+ public function testMixedCase()
+ {
+ $this->fails(Password::min(2)->mixedCase(), ['nn', 'MM'], [
+ 'The my password must contain at least one uppercase and one lowercase letter.',
+ ]);
+
+ $this->passes(Password::min(2)->mixedCase(), ['Nn', 'Mn', 'âA']);
+ }
+
+ public function testLetters()
+ {
+ $this->fails(Password::min(2)->letters(), ['11', '22', '^^', '``', '**'], [
+ 'The my password must contain at least one letter.',
+ ]);
+
+ $this->passes(Password::min(2)->letters(), ['1a', 'b2', 'â1', '1 京都府']);
+ }
+
+ public function testNumbers()
+ {
+ $this->fails(Password::min(2)->numbers(), ['aa', 'bb', ' a', '京都府'], [
+ 'The my password must contain at least one number.',
+ ]);
+
+ $this->passes(Password::min(2)->numbers(), ['1a', 'b2', '00', '京都府 1']);
+ }
+
+ public function testDefaultRules()
+ {
+ $this->fails(Password::min(3), [null], [
+ 'validation.string',
+ 'validation.min.string',
+ ]);
+ }
+
+ public function testSymbols()
+ {
+ $this->fails(Password::min(2)->symbols(), ['ab', '1v'], [
+ 'The my password must contain at least one symbol.',
+ ]);
+
+ $this->passes(Password::min(2)->symbols(), ['n^d', 'd^!', 'âè$', '金廿土弓竹中；']);
+ }
+
+ public function testUncompromised()
+ {
+ $this->fails(Password::min(2)->uncompromised(), [
+ '123456',
+ 'password',
+ 'welcome',
+ 'ninja',
+ 'abc123',
+ '123456789',
+ '12345678',
+ 'nuno',
+ ], [
+ 'The given my password has appeared in a data leak. Please choose a different my password.',
+ ]);
+
+ $this->passes(Password::min(2)->uncompromised(9999999), [
+ 'nuno',
+ ]);
+
+ $this->passes(Password::min(2)->uncompromised(), [
+ '手田日尸Ｚ難金木水口火女月土廿卜竹弓一十山',
+ '!p8VrB',
+ '&xe6VeKWF#n4',
+ '%HurHUnw7zM!',
+ 'rundeliekend',
+ '7Z^k5EvqQ9g%c!Jt9$ufnNpQy#Kf',
+ 'NRs*Gz2@hSmB$vVBSPDfqbRtEzk4nF7ZAbM29VMW$BPD%b2U%3VmJAcrY5eZGVxP%z%apnwSX',
+ ]);
+ }
+
+ public function testMessagesOrder()
+ {
+ $makeRules = function () {
+ return ['required', Password::min(8)->mixedCase()->numbers()];
+ };
+
+ $this->fails($makeRules(), [null], [
+ 'validation.required',
+ ]);
+
+ $this->fails($makeRules(), ['foo', 'azdazd', '1231231'], [
+ 'validation.min.string',
+ ]);
+
+ $this->fails($makeRules(), ['4564654564564'], [
+ 'The my password must contain at least one uppercase and one lowercase letter.',
+ ]);
+
+ $this->fails($makeRules(), ['aaaaaaaaa', 'TJQSJQSIUQHS'], [
+ 'The my password must contain at least one uppercase and one lowercase letter.',
+ 'The my password must contain at least one number.',
+ ]);
+
+ $this->passes($makeRules(), ['4564654564564Abc']);
+
+ $makeRules = function () {
+ return ['nullable', 'confirmed', Password::min(8)->letters()->symbols()->uncompromised()];
+ };
+
+ $this->passes($makeRules(), [null]);
+
+ $this->fails($makeRules(), ['foo', 'azdazd', '1231231'], [
+ 'validation.min.string',
+ ]);
+
+ $this->fails($makeRules(), ['aaaaaaaaa', 'TJQSJQSIUQHS'], [
+ 'The my password must contain at least one symbol.',
+ ]);
+
+ $this->fails($makeRules(), ['4564654564564'], [
+ 'The my password must contain at least one letter.',
+ 'The my password must contain at least one symbol.',
+ ]);
+
+ $this->fails($makeRules(), ['abcabcabc!'], [
+ 'The given my password has appeared in a data leak. Please choose a different my password.',
+ ]);
+
+ $v = new Validator(
+ resolve('translator'),
+ ['my_password' => 'Nuno'],
+ ['my_password' => ['nullable', 'confirmed', Password::min(3)->letters()]]
+ );
+
+ $this->assertFalse($v->passes());
+
+ $this->assertSame(
+ ['my_password' => ['validation.confirmed']],
+ $v->messages()->toArray()
+ );
+ }
+
+ protected function passes($rule, $values)
+ {
+ $this->testRule($rule, $values, true, []);
+ }
+
+ protected function fails($rule, $values, $messages)
+ {
+ $this->testRule($rule, $values, false, $messages);
+ }
+
+ protected function testRule($rule, $values, $result, $messages)
+ {
+ foreach ($values as $value) {
+ $v = new Validator(
+ resolve('translator'),
+ ['my_password' => $value, 'my_password_confirmation' => $value],
+ ['my_password' => is_object($rule) ? clone $rule : $rule]
+ );
+
+ $this->assertSame($result, $v->passes());
+
+ $this->assertSame(
+ $result ? [] : ['my_password' => $messages],
+ $v->messages()->toArray()
+ );
+ }
+ }
+
+ protected function setUp(): void
+ {
+ $container = Container::getInstance();
+
+ $container->bind('translator', function () {
+ return new Translator(
+ new ArrayLoader, 'en'
+ );
+ });
+
+ Facade::setFacadeApplication($container);
+
+ (new ValidationServiceProvider($container))->register();
+ }
+
+ protected function tearDown(): void
+ {
+ Container::setInstance(null);
+
+ Facade::clearResolvedInstances();
+
+ Facade::setFacadeApplication(null);
+ }
+}
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
index 826aeef296c3..00e360e0d537 100755
--- a/tests/Validation/ValidationValidatorTest.php
+++ b/tests/Validation/ValidationValidatorTest.php
@@ -10,6 +10,7 @@
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Contracts\Hashing\Hasher;
use Illuminate\Contracts\Translation\Translator as TranslatorContract;
+use Illuminate\Contracts\Validation\DataAwareRule;
use Illuminate\Contracts\Validation\ImplicitRule;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Database\Eloquent\Model;
@@ -61,7 +62,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()
@@ -429,7 +430,7 @@ public function testInputIsReplaced()
$v = new Validator($trans, ['email' => null], ['email' => 'email']);
$this->assertFalse($v->passes());
$v->messages()->setFormat(':message');
- $this->assertSame(' is not a valid email', $v->messages()->first('email'));
+ $this->assertSame('empty is not a valid email', $v->messages()->first('email'));
}
public function testInputIsReplacedByItsDisplayableValue()
@@ -770,7 +771,7 @@ public function testValidatePassword()
$container->shouldReceive('make')->with('hash')->andReturn($hasher);
$trans = $this->getTranslator();
- $trans->shouldReceive('get');
+ $trans->shouldReceive('get')->andReturnArg(0);
$v = new Validator($trans, ['password' => 'foo'], ['password' => 'password']);
$v->setContainer($container);
@@ -794,7 +795,7 @@ public function testValidatePassword()
$container->shouldReceive('make')->with('hash')->andReturn($hasher);
$trans = $this->getTranslator();
- $trans->shouldReceive('get');
+ $trans->shouldReceive('get')->andReturnArg(0);
$v = new Validator($trans, ['password' => 'foo'], ['password' => 'password']);
$v->setContainer($container);
@@ -818,7 +819,7 @@ public function testValidatePassword()
$container->shouldReceive('make')->with('hash')->andReturn($hasher);
$trans = $this->getTranslator();
- $trans->shouldReceive('get');
+ $trans->shouldReceive('get')->andReturnArg(0);
$v = new Validator($trans, ['password' => 'foo'], ['password' => 'password']);
$v->setContainer($container);
@@ -842,7 +843,7 @@ public function testValidatePassword()
$container->shouldReceive('make')->with('hash')->andReturn($hasher);
$trans = $this->getTranslator();
- $trans->shouldReceive('get');
+ $trans->shouldReceive('get')->andReturnArg(0);
$v = new Validator($trans, ['password' => 'foo'], ['password' => 'password:custom']);
$v->setContainer($container);
@@ -1096,16 +1097,82 @@ public function testRequiredIf()
$v = new Validator($trans, ['foo' => true], ['bar' => 'required_if:foo,false']);
$this->assertTrue($v->passes());
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => true], ['bar' => 'required_if:foo,null']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => 0], ['bar' => 'required_if:foo,0']);
+ $this->assertTrue($v->fails());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => '0'], ['bar' => 'required_if:foo,0']);
+ $this->assertTrue($v->fails());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => 1], ['bar' => 'required_if:foo,1']);
+ $this->assertTrue($v->fails());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => '1'], ['bar' => 'required_if:foo,1']);
+ $this->assertTrue($v->fails());
+
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['foo' => true], ['bar' => 'required_if:foo,true']);
$this->assertTrue($v->fails());
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => false], ['bar' => 'required_if:foo,false']);
+ $this->assertTrue($v->fails());
+
// error message when passed multiple values (required_if:foo,bar,baz)
$trans = $this->getIlluminateArrayTranslator();
$trans->addLines(['validation.required_if' => 'The :attribute field is required when :other is :value.'], 'en');
$v = new Validator($trans, ['first' => 'dayle', 'last' => ''], ['last' => 'RequiredIf:first,taylor,dayle']);
$this->assertFalse($v->passes());
$this->assertSame('The last field is required when first is dayle.', $v->messages()->first('last'));
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $trans->addLines(['validation.required_if' => 'The :attribute field is required when :other is :value.'], 'en');
+ $v = new Validator($trans, ['foo' => 0], [
+ 'foo' => 'nullable|required|boolean',
+ 'bar' => 'required_if:foo,true',
+ 'baz' => 'required_if:foo,false',
+ ]);
+ $this->assertTrue($v->fails());
+ $this->assertCount(1, $v->messages());
+ $this->assertSame('The baz field is required when foo is 0.', $v->messages()->first('baz'));
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, [], [
+ 'foo' => 'nullable|boolean',
+ 'baz' => 'nullable|required_if:foo,false',
+ ]);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => null], [
+ 'foo' => 'nullable|boolean',
+ 'baz' => 'nullable|required_if:foo,false',
+ ]);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, [], [
+ 'foo' => 'nullable|boolean',
+ 'baz' => 'nullable|required_if:foo,null',
+ ]);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $trans->addLines(['validation.required_if' => 'The :attribute field is required when :other is :value.'], 'en');
+ $v = new Validator($trans, ['foo' => null], [
+ 'foo' => 'nullable|boolean',
+ 'baz' => 'nullable|required_if:foo,null',
+ ]);
+ $this->assertTrue($v->fails());
+ $this->assertCount(1, $v->messages());
+ $this->assertSame('The baz field is required when foo is empty.', $v->messages()->first('baz'));
}
public function testRequiredUnless()
@@ -1138,6 +1205,26 @@ public function testRequiredUnless()
$v = new Validator($trans, ['foo' => false], ['bar' => 'required_unless:foo,true']);
$this->assertTrue($v->fails());
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => true], ['bar' => 'required_unless:foo,null']);
+ $this->assertTrue($v->fails());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => '0'], ['bar' => 'required_unless:foo,0']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => 0], ['bar' => 'required_unless:foo,0']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => '1'], ['bar' => 'required_unless:foo,1']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => 1], ['bar' => 'required_unless:foo,1']);
+ $this->assertTrue($v->passes());
+
// error message when passed multiple values (required_unless:foo,bar,baz)
$trans = $this->getIlluminateArrayTranslator();
$trans->addLines(['validation.required_unless' => 'The :attribute field is required unless :other is in :values.'], 'en');
@@ -1146,6 +1233,108 @@ public function testRequiredUnless()
$this->assertSame('The last field is required unless first is in taylor, sven.', $v->messages()->first('last'));
}
+ public function testProhibited()
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+
+ $v = new Validator($trans, [], ['name' => 'prohibited']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['last' => 'bar'], ['name' => 'prohibited']);
+ $this->assertTrue($v->passes());
+
+ $v = new Validator($trans, ['name' => 'foo'], ['name' => 'prohibited']);
+ $this->assertTrue($v->fails());
+
+ $file = new File('', false);
+ $v = new Validator($trans, ['name' => $file], ['name' => 'prohibited']);
+ $this->assertTrue($v->fails());
+
+ $file = new File(__FILE__, false);
+ $v = new Validator($trans, ['name' => $file], ['name' => 'prohibited']);
+ $this->assertTrue($v->fails());
+
+ $file = new File(__FILE__, false);
+ $file2 = new File(__FILE__, false);
+ $v = new Validator($trans, ['files' => [$file, $file2]], ['files.0' => 'prohibited', 'files.1' => 'prohibited']);
+ $this->assertTrue($v->fails());
+
+ $v = new Validator($trans, ['files' => [$file, $file2]], ['files' => 'prohibited']);
+ $this->assertTrue($v->fails());
+ }
+
+ public function testProhibitedIf()
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'taylor', 'last' => 'otwell'], ['last' => 'prohibited_if:first,taylor']);
+ $this->assertTrue($v->fails());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'taylor'], ['last' => 'prohibited_if:first,taylor']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'taylor', 'last' => 'otwell'], ['last' => 'prohibited_if:first,taylor,jess']);
+ $this->assertTrue($v->fails());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'taylor'], ['last' => 'prohibited_if:first,taylor,jess']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => true, 'bar' => 'baz'], ['bar' => 'prohibited_if:foo,false']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => true, 'bar' => 'baz'], ['bar' => 'prohibited_if:foo,true']);
+ $this->assertTrue($v->fails());
+
+ // error message when passed multiple values (prohibited_if:foo,bar,baz)
+ $trans = $this->getIlluminateArrayTranslator();
+ $trans->addLines(['validation.prohibited_if' => 'The :attribute field is prohibited when :other is :value.'], 'en');
+ $v = new Validator($trans, ['first' => 'jess', 'last' => 'archer'], ['last' => 'prohibited_if:first,taylor,jess']);
+ $this->assertFalse($v->passes());
+ $this->assertSame('The last field is prohibited when first is jess.', $v->messages()->first('last'));
+ }
+
+ public function testProhibitedUnless()
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'jess', 'last' => 'archer'], ['last' => 'prohibited_unless:first,taylor']);
+ $this->assertTrue($v->fails());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'taylor', 'last' => 'otwell'], ['last' => 'prohibited_unless:first,taylor']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'jess'], ['last' => 'prohibited_unless:first,taylor']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'taylor', 'last' => 'otwell'], ['last' => 'prohibited_unless:first,taylor,jess']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['first' => 'jess', 'last' => 'archer'], ['last' => 'prohibited_unless:first,taylor,jess']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => false, 'bar' => 'baz'], ['bar' => 'prohibited_unless:foo,false']);
+ $this->assertTrue($v->passes());
+
+ $trans = $this->getIlluminateArrayTranslator();
+ $v = new Validator($trans, ['foo' => false, 'bar' => 'baz'], ['bar' => 'prohibited_unless:foo,true']);
+ $this->assertTrue($v->fails());
+
+ // error message when passed multiple values (prohibited_unless:foo,bar,baz)
+ $trans = $this->getIlluminateArrayTranslator();
+ $trans->addLines(['validation.prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.'], 'en');
+ $v = new Validator($trans, ['first' => 'tim', 'last' => 'macdonald'], ['last' => 'prohibitedUnless:first,taylor,jess']);
+ $this->assertFalse($v->passes());
+ $this->assertSame('The last field is prohibited unless first is in taylor, jess.', $v->messages()->first('last'));
+ }
+
public function testFailedFileUploads()
{
$trans = $this->getIlluminateArrayTranslator();
@@ -1301,9 +1490,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 +1531,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 +1572,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 +1613,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 +1742,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 +1920,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 +1958,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 +1990,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 +2022,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 +2142,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 +2178,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 +2220,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 +2262,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 +2304,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']);
@@ -2157,6 +2438,15 @@ public function testValidateDistinct()
$v->messages()->setFormat(':message');
$this->assertSame('There is a duplication!', $v->messages()->first('foo.0'));
$this->assertSame('There is a duplication!', $v->messages()->first('foo.1'));
+
+ $v = new Validator($trans, ['foo' => ['0100', '100']], ['foo.*' => 'distinct'], ['foo.*.distinct' => 'There is a duplication!']);
+ $this->assertFalse($v->passes());
+ $v->messages()->setFormat(':message');
+ $this->assertSame('There is a duplication!', $v->messages()->first('foo.0'));
+ $this->assertSame('There is a duplication!', $v->messages()->first('foo.1'));
+
+ $v = new Validator($trans, ['foo' => ['0100', '100']], ['foo.*' => 'distinct:strict']);
+ $this->assertTrue($v->passes());
}
public function testValidateDistinctForTopLevelArrays()
@@ -2426,7 +2716,7 @@ public function testValidateEmailWithFilterUnicodeCheck()
public function testValidateEmailWithCustomClassCheck()
{
$container = m::mock(Container::class);
- $container->shouldReceive('make')->with(NoRFCWarningsValidation::class)->andReturn(new NoRFCWarningsValidation());
+ $container->shouldReceive('make')->with(NoRFCWarningsValidation::class)->andReturn(new NoRFCWarningsValidation);
$v = new Validator($this->getIlluminateArrayTranslator(), ['x' => 'foo@bar '], ['x' => 'email:'.NoRFCWarningsValidation::class]);
$v->setContainer($container);
@@ -2742,47 +3032,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 +3099,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());
}
@@ -2871,7 +3180,7 @@ public function testValidateImageDimensions()
$v = new Validator($trans, ['x' => $uploadedFile], ['x' => 'dimensions:ratio=2/3']);
$this->assertTrue($v->passes());
- // Ensure svg images always pass as size is irreleveant (image/svg+xml)
+ // Ensure svg images always pass as size is irrelevant (image/svg+xml)
$svgXmlUploadedFile = new UploadedFile(__DIR__.'/fixtures/image.svg', '', 'image/svg+xml', null, true);
$trans = $this->getIlluminateArrayTranslator();
@@ -2884,7 +3193,7 @@ public function testValidateImageDimensions()
$v = new Validator($trans, ['x' => $svgXmlFile], ['x' => 'dimensions:max_width=1,max_height=1']);
$this->assertTrue($v->passes());
- // Ensure svg images always pass as size is irreleveant (image/svg)
+ // Ensure svg images always pass as size is irrelevant (image/svg)
$svgUploadedFile = new UploadedFile(__DIR__.'/fixtures/image2.svg', '', 'image/svg', null, true);
$trans = $this->getIlluminateArrayTranslator();
@@ -2906,20 +3215,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 +3246,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 +3276,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']);
@@ -3581,7 +3912,7 @@ public function testSometimesAddingRules()
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
$v->sometimes('x', 'Confirmed', function ($i) {
- return $i->x == 'foo';
+ return $i->x === 'foo';
});
$this->assertEquals(['x' => ['Required', 'Confirmed']], $v->getRules());
@@ -3595,21 +3926,21 @@ public function testSometimesAddingRules()
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
$v->sometimes('x', 'Confirmed', function ($i) {
- return $i->x == 'bar';
+ return $i->x === 'bar';
});
$this->assertEquals(['x' => ['Required']], $v->getRules());
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
$v->sometimes('x', 'Foo|Bar', function ($i) {
- return $i->x == 'foo';
+ return $i->x === 'foo';
});
$this->assertEquals(['x' => ['Required', 'Foo', 'Bar']], $v->getRules());
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
$v->sometimes('x', ['Foo', 'Bar:Baz'], function ($i) {
- return $i->x == 'foo';
+ return $i->x === 'foo';
});
$this->assertEquals(['x' => ['Required', 'Foo', 'Bar:Baz']], $v->getRules());
@@ -3714,7 +4045,7 @@ public function testCustomDependentValidators()
['*.name' => 'dependent_rule:*.age']
);
$v->addDependentExtension('dependent_rule', function ($name) use ($v) {
- return Arr::get($v->getData(), $name) == 'Jamie';
+ return Arr::get($v->getData(), $name) === 'Jamie';
});
$this->assertTrue($v->passes());
}
@@ -4602,19 +4933,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 +4996,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 +5012,12 @@ public function testInvalidMethod()
'name' => 'required',
]);
- $this->assertEquals($v->invalid(), [
- 'name' => '',
- ]);
+ $this->assertEquals(
+ [
+ 'name' => '',
+ ],
+ $v->invalid()
+ );
}
public function testValidMethod()
@@ -4698,10 +5035,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 +5055,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 +5084,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()
@@ -4930,6 +5276,66 @@ public function message()
$this->assertSame('name must be taylor', $v->errors()->get('name')[0]);
$this->assertSame('name must be a first name', $v->errors()->get('name')[1]);
$this->assertSame('validation.string', $v->errors()->get('name')[2]);
+
+ // Test access to the validator data
+ $v = new Validator(
+ $this->getIlluminateArrayTranslator(),
+ ['password' => 'foo', 'password_confirmation' => 'foo'],
+ [
+ 'password' => [
+ new class implements Rule, DataAwareRule {
+ protected $data;
+
+ public function setData($data)
+ {
+ $this->data = $data;
+ }
+
+ public function passes($attribute, $value)
+ {
+ return $value === $this->data['password_confirmation'];
+ }
+
+ public function message()
+ {
+ return ['The :attribute confirmation does not match.'];
+ }
+ }, 'string',
+ ],
+ ]
+ );
+
+ $this->assertTrue($v->passes());
+
+ $v = new Validator(
+ $this->getIlluminateArrayTranslator(),
+ ['password' => 'foo', 'password_confirmation' => 'bar'],
+ [
+ 'password' => [
+ new class implements Rule, DataAwareRule {
+ protected $data;
+
+ public function setData($data)
+ {
+ $this->data = $data;
+ }
+
+ public function passes($attribute, $value)
+ {
+ return $value === $this->data['password_confirmation'];
+ }
+
+ public function message()
+ {
+ return ['The :attribute confirmation does not match.'];
+ }
+ }, 'string',
+ ],
+ ]
+ );
+
+ $this->assertTrue($v->fails());
+ $this->assertSame('The password confirmation does not match.', $v->errors()->get('password')[0]);
}
public function testCustomValidationObjectWithDotKeysIsCorrectlyPassedValue()
@@ -4974,7 +5380,7 @@ public function message()
);
$this->assertFalse($v->passes());
- $this->assertTrue(is_array($v->failed()['foo.foo.bar']));
+ $this->assertIsArray($v->failed()['foo.foo.bar']);
}
public function testImplicitCustomValidationObjects()
@@ -5186,6 +5592,20 @@ public function providesPassingExcludeIfData()
'has_appointment' => false,
],
],
+ [
+ [
+ 'has_appointment' => ['nullable', 'bool'],
+ 'appointment_date' => ['exclude_if:has_appointment,null', 'required', 'date'],
+ ],
+ [
+ 'has_appointment' => true,
+ 'appointment_date' => '2021-03-08',
+ ],
+ [
+ 'has_appointment' => true,
+ 'appointment_date' => '2021-03-08',
+ ],
+ ],
[
[
'has_appointment' => ['required', 'bool'],
@@ -5520,6 +5940,14 @@ public function testExcludeUnless()
);
$this->assertTrue($validator->fails());
$this->assertSame(['mouse' => ['validation.required']], $validator->messages()->toArray());
+
+ $validator = new Validator(
+ $this->getIlluminateArrayTranslator(),
+ ['foo' => true, 'bar' => 'baz'],
+ ['foo' => 'nullable', 'bar' => 'exclude_unless:foo,null']
+ );
+ $this->assertTrue($validator->passes());
+ $this->assertSame(['foo' => true], $validator->validated());
}
public function testExcludeWithout()
@@ -5571,6 +5999,42 @@ public function testValidateFailsWithAsterisksAsDataKeys()
$this->assertSame(['data.1.date' => ['validation.date'], 'data.*.date' => ['validation.date']], $validator->messages()->toArray());
}
+ public function testFailOnFirstError()
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+ $data = [
+ 'foo' => 'bar',
+ 'age' => 30,
+ ];
+ $rules = [
+ 'foo' => ['required', 'string'],
+ 'baz' => ['required'],
+ 'age' => ['required', 'min:31'],
+ ];
+
+ $expectedFailOnFirstErrorDisableResult = [
+ 'baz' => [
+ 'validation.required',
+ ],
+ 'age' => [
+ 'validation.min.string',
+ ],
+ ];
+ $failOnFirstErrorDisable = new Validator($trans, $data, $rules);
+ $this->assertFalse($failOnFirstErrorDisable->passes());
+ $this->assertEquals($expectedFailOnFirstErrorDisableResult, $failOnFirstErrorDisable->getMessageBag()->getMessages());
+
+ $expectedFailOnFirstErrorEnableResult = [
+ 'baz' => [
+ 'validation.required',
+ ],
+ ];
+ $failOnFirstErrorEnable = new Validator($trans, $data, $rules, [], []);
+ $failOnFirstErrorEnable->stopOnFirstFailure();
+ $this->assertFalse($failOnFirstErrorEnable->passes());
+ $this->assertEquals($expectedFailOnFirstErrorEnableResult, $failOnFirstErrorEnable->getMessageBag()->getMessages());
+ }
+
protected function getTranslator()
{
return m::mock(TranslatorContract::class);
diff --git a/tests/View/Blade/BladeComponentTagCompilerTest.php b/tests/View/Blade/BladeComponentTagCompilerTest.php
index 6872d38ae4a1..a00744859d45 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();
}
@@ -40,69 +40,77 @@ public function testBasicComponentParsing()
$result = $this->compiler(['alert' => TestAlertComponent::class])->compileTags('
');
- $this->assertSame("
@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
+ $this->assertSame("
##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
withAttributes(['type' => 'foo','limit' => '5','@click' => 'foo','wire:click' => 'changePlan(\''.e(\$plan).'\')','required' => true]); ?>\n".
-"@endcomponentClass @component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
+"@endComponentClass##END-COMPONENT-CLASS####BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
withAttributes([]); ?>\n".
-'@endcomponentClass
', trim($result));
+'@endComponentClass##END-COMPONENT-CLASS##
', trim($result));
}
public function testBasicComponentWithEmptyAttributesParsing()
{
$result = $this->compiler(['alert' => TestAlertComponent::class])->compileTags('
');
- $this->assertSame("
@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
+ $this->assertSame("
##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
withAttributes(['type' => '','limit' => '','@click' => '','required' => true]); ?>\n".
-'@endcomponentClass
', trim($result));
+'@endComponentClass##END-COMPONENT-CLASS##
', trim($result));
}
public function testDataCamelCasing()
{
$result = $this->compiler(['profile' => TestProfileComponent::class])->compileTags('
');
- $this->assertSame("@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', ['userId' => '1'])
-withAttributes([]); ?> @endcomponentClass", trim($result));
+ $this->assertSame("##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', ['userId' => '1'])
+withAttributes([]); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
}
public function testColonData()
{
$result = $this->compiler(['profile' => TestProfileComponent::class])->compileTags('
');
- $this->assertSame("@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', ['userId' => 1])
-withAttributes([]); ?> @endcomponentClass", trim($result));
+ $this->assertSame("##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', ['userId' => 1])
+withAttributes([]); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
+ }
+
+ public function testEscapedColonAttribute()
+ {
+ $result = $this->compiler(['profile' => TestProfileComponent::class])->compileTags('
');
+
+ $this->assertSame("##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', ['userId' => 1])
+withAttributes([':title' => 'user.name']); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
}
public function testColonAttributesIsEscapedIfStrings()
{
$result = $this->compiler(['profile' => TestProfileComponent::class])->compileTags('
');
- $this->assertSame("@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', [])
-withAttributes(['src' => \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute('foo')]); ?> @endcomponentClass", trim($result));
+ $this->assertSame("##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', [])
+withAttributes(['src' => \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute('foo')]); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
}
public function testColonNestedComponentParsing()
{
$result = $this->compiler(['foo:alert' => TestAlertComponent::class])->compileTags('
');
- $this->assertSame("@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'foo:alert', [])
-withAttributes([]); ?> @endcomponentClass", trim($result));
+ $this->assertSame("##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'foo:alert', [])
+withAttributes([]); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
}
public function testColonStartingNestedComponentParsing()
{
$result = $this->compiler(['foo:alert' => TestAlertComponent::class])->compileTags('
');
- $this->assertSame("@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'foo:alert', [])
-withAttributes([]); ?> @endcomponentClass", trim($result));
+ $this->assertSame("##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'foo:alert', [])
+withAttributes([]); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
}
public function testSelfClosingComponentsCanBeCompiled()
{
$result = $this->compiler(['alert' => TestAlertComponent::class])->compileTags('
');
- $this->assertSame(" @component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
+ $this->assertSame("
##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', [])
withAttributes([]); ?>\n".
-'@endcomponentClass
', trim($result));
+'@endComponentClass##END-COMPONENT-CLASS##
merge([\'class\' => \'test\']) }} wire:model="foo" />
');
- $this->assertSame(" @component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', ['title' => 'foo'])
+ $this->assertSame("
##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestAlertComponent', 'alert', ['title' => 'foo'])
withAttributes(['class' => 'bar','attributes' => \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute(\$attributes->merge(['class' => 'test'])),'wire:model' => 'foo']); ?>\n".
- '@endcomponentClass
', trim($result));
+ '@endComponentClass##END-COMPONENT-CLASS##
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
-
-
-
+