Merge pull request #36018 from nexxai/typo-fixes

[8.x] Typo fixes
laravel · Jan 24, 2021 · ae790fe · ae790fe
2 parents 72a44d3 + 8a7ea71
commit ae790fe
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/src/Illuminate/Cache/Lock.php b/src/Illuminate/Cache/Lock.php
@@ -153,7 +153,7 @@ protected function isOwnedByCurrentProcess()
     }
 
     /**
-     * Specify the number of milliseconds to sleep in between blocked lock aquisition attempts.
+     * Specify the number of milliseconds to sleep in between blocked lock acquisition attempts.
      *
      * @param  int  $milliseconds
      * @return $this

diff --git a/src/Illuminate/Database/DatabaseTransactionRecord.php b/src/Illuminate/Database/DatabaseTransactionRecord.php
@@ -30,7 +30,7 @@ class DatabaseTransactionRecord
      *
      * @param  string  $connection
      * @param  int  $level
-     * @retunr void
+     * @return void
      */
     public function __construct($connection, $level)
     {

diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php
@@ -30,7 +30,7 @@ trait InteractsWithConsole
     public $unexpectedOutput = [];
 
     /**
-     * All of the expected ouput tables.
+     * All of the expected output tables.
      *
      * @var array
      */

diff --git a/tests/Foundation/FoundationFormRequestTest.php b/tests/Foundation/FoundationFormRequestTest.php
@@ -119,15 +119,15 @@ public function test_after_validation_runs_after_validation()
      * Catch the given exception thrown from the executor, and return it.
      *
      * @param  string  $class
-     * @param  \Closure  $excecutor
+     * @param  \Closure  $executor
      * @return \Exception
      *
      * @throws \Exception
      */
-    protected function catchException($class, $excecutor)
+    protected function catchException($class, $executor)
     {
         try {
-            $excecutor();
+            $executor();
         } catch (Exception $e) {
             if (is_a($e, $class)) {
                 return $e;

diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -501,8 +501,8 @@ public function testArrayAccess()
             return $route;
         });
 
-        $this->assertFalse(isset($request['non-existant']));
-        $this->assertNull($request['non-existant']);
+        $this->assertFalse(isset($request['non-existent']));
+        $this->assertNull($request['non-existent']);
 
         $this->assertTrue(isset($request['name']));
         $this->assertNull($request['name']);

diff --git a/tests/Integration/Notifications/SendingMailNotificationsTest.php b/tests/Integration/Notifications/SendingMailNotificationsTest.php
@@ -203,12 +203,12 @@ public function testMailIsSentWithSubject()
         $user->notify($notification);
     }
 
-    public function testMailIsSentToMultipleAdresses()
+    public function testMailIsSentToMultipleAddresses()
     {
         $notification = new TestMailNotificationWithSubject;
         $notification->id = Str::uuid()->toString();
 
-        $user = NotifiableUserWithMultipleAddreses::forceCreate([
+        $user = NotifiableUserWithMultipleAddresses::forceCreate([
             'email' => 'taylor@laravel.com',
         ]);
 
@@ -365,7 +365,7 @@ public function routeNotificationForMail($notification)
     }
 }
 
-class NotifiableUserWithMultipleAddreses extends NotifiableUser
+class NotifiableUserWithMultipleAddresses extends NotifiableUser
 {
     public function routeNotificationForMail($notification)
     {

diff --git 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/MailableQueuedTest.php b/tests/Mail/MailableQueuedTest.php
@@ -32,7 +32,7 @@ public function testQueuedMailableSent()
             ->onlyMethods(['createMessage', 'to'])
             ->getMock();
         $mailer->setQueue($queueFake);
-        $mailable = new MailableQueableStub;
+        $mailable = new MailableQueueableStub;
         $queueFake->assertNothingPushed();
         $mailer->send($mailable);
         $queueFake->assertPushedOn(null, SendQueuedMailable::class);
@@ -46,7 +46,7 @@ public function testQueuedMailableWithAttachmentSent()
             ->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);
@@ -75,7 +75,7 @@ public function testQueuedMailableWithAttachmentFromDiskSent()
             ->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/Redis/RedisManagerExtensionTest.php b/tests/Redis/RedisManagerExtensionTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
         ]);
 
         $this->redis->extend('my_custom_driver', function () {
-            return new FakeRedisConnnector();
+            return new FakeRedisConnector();
         });
     }
 
@@ -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/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -78,8 +78,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'));
     }
 
     /**

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -2982,7 +2982,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();
 
@@ -2995,7 +2995,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();