Merge pull request #32605 from laravel/fix-backport

[6.x] Backport some minor fixes

src/Illuminate/Database/DetectsLostConnections.php

@@ -43,6 +43,7 @@ protected function causedByLostConnection(Throwable $e)
             'Connection refused',
             'running with the --read-only option so it cannot execute this statement',
             'The connection is broken and recovery is not possible. The connection is marked by the client driver as unrecoverable. No attempt was made to restore the connection.',
+            'SQLSTATE[HY000] [2002] php_network_getaddresses: getaddrinfo failed: Try again',
         ]);
     }
 }

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -351,7 +351,7 @@ public function getAttributeValue($key)
         }
 
         // If the attribute exists within the cast array, we will convert it to
-        // an appropriate native PHP type dependant upon the associated value
+        // an appropriate native PHP type dependent upon the associated value
         // given with the key in the pair. Dayle made this comment line up.
         if ($this->hasCast($key)) {
             return $this->castAttribute($key, $value);

src/Illuminate/Database/Query/Builder.php

@@ -2331,9 +2331,9 @@ protected function stripTableForPluck($column)
             return $column;
         }
 
-        $seperator = strpos(strtolower($column), ' as ') !== false ? ' as ' : '\.';
+        $separator = strpos(strtolower($column), ' as ') !== false ? ' as ' : '\.';
 
-        return last(preg_split('~'.$seperator.'~i', $column));
+        return last(preg_split('~'.$separator.'~i', $column));
     }
 
     /**

src/Illuminate/Http/Request.php

@@ -294,7 +294,7 @@ public function ips()
     /**
      * Get the client user agent.
      *
-     * @return string
+     * @return string|null
      */
     public function userAgent()
     {

src/Illuminate/Routing/Matching/HostValidator.php

@@ -16,10 +16,12 @@ class HostValidator implements ValidatorInterface
      */
     public function matches(Route $route, Request $request)
     {
-        if (is_null($route->getCompiled()->getHostRegex())) {
+        $hostRegex = $route->getCompiled()->getHostRegex();
+
+        if (is_null($hostRegex)) {
             return true;
         }
 
-        return preg_match($route->getCompiled()->getHostRegex(), $request->getHost());
+        return preg_match($hostRegex, $request->getHost());
     }
 }

tests/Database/DatabaseEloquentBuilderTest.php

@@ -836,7 +836,7 @@ public function testHasWithConstraintsWithOrWhereAndHavingInSubquery()
         $this->assertEquals(['larry', '90210', '90220', 'fooside dr', 29], $builder->getBindings());
     }
 
-    public function testHasWithContraintsAndJoinAndHavingInSubquery()
+    public function testHasWithConstraintsAndJoinAndHavingInSubquery()
     {
         $model = new EloquentBuilderTestModelParentStub;
         $builder = $model->where('bar', 'baz');