Merge remote-tracking branch 'upstream/8.x' into 8.x

Author: TBlindaruk

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -730,7 +730,7 @@ public function tap(callable $callback)
      * Reduce the collection to a single value.
      *
      * @param  callable  $callback
-     * @param  mixed $initial
+     * @param  mixed  $initial
      * @return mixed
      */
     public function reduce(callable $callback, $initial = null)
@@ -748,7 +748,7 @@ public function reduce(callable $callback, $initial = null)
      * Reduce an associative collection to a single value.
      *
      * @param  callable  $callback
-     * @param  mixed $initial
+     * @param  mixed  $initial
      * @return mixed
      */
     public function reduceWithKeys(callable $callback, $initial = null)

src/Illuminate/Database/Concerns/ManagesTransactions.php

@@ -43,11 +43,13 @@ public function transaction(Closure $callback, $attempts = 1)
             try {
                 if ($this->transactions == 1) {
                     $this->getPdo()->commit();
-
-                    optional($this->transactionsManager)->commit($this->getName());
                 }
 
                 $this->transactions = max(0, $this->transactions - 1);
+
+                if ($this->transactions == 0) {
+                    optional($this->transactionsManager)->commit($this->getName());
+                }
             } catch (Throwable $e) {
                 $this->handleCommitTransactionException(
                     $e, $currentAttempt, $attempts
@@ -187,12 +189,14 @@ public function commit()
     {
         if ($this->transactions == 1) {
             $this->getPdo()->commit();
-
-            optional($this->transactionsManager)->commit($this->getName());
         }
 
         $this->transactions = max(0, $this->transactions - 1);
 
+        if ($this->transactions == 0) {
+            optional($this->transactionsManager)->commit($this->getName());
+        }
+
         $this->fireConnectionEvent('committed');
     }
 

src/Illuminate/Database/DetectsLostConnections.php

@@ -52,6 +52,8 @@ protected function causedByLostConnection(Throwable $e)
             'Temporary failure in name resolution',
             'SSL: Broken pipe',
             'SQLSTATE[08S01]: Communication link failure',
+            'SQLSTATE[08006] [7] could not connect to server: Connection refused Is the server running on host',
+            'SQLSTATE[HY000]: General error: 7 SSL SYSCALL error: No route to host',
         ]);
     }
 }

src/Illuminate/Database/Eloquent/Builder.php

@@ -1608,6 +1608,16 @@ protected static function registerMixin($mixin, $replace)
         }
     }
 
+    /**
+     * Clone the Eloquent query builder.
+     *
+     * @return static
+     */
+    public function clone()
+    {
+        return clone $this;
+    }
+
     /**
      * Force a clone of the underlying query builder when cloning.
      *

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

@@ -695,7 +695,7 @@ public function setAttribute($key, $value)
     {
         // First we will check for the presence of a mutator for the set operation
         // which simply lets the developers tweak the attribute as it is set on
-        // the model, such as "json_encoding" an listing of data for storage.
+        // this model, such as "json_encoding" a listing of data for storage.
         if ($this->hasSetMutator($key)) {
             return $this->setMutatedAttributeValue($key, $value);
         }
@@ -1322,6 +1322,16 @@ public function getAttributes()
         return $this->attributes;
     }
 
+    /**
+     * Get all of the current attributes on the model for an insert operation.
+     *
+     * @return array
+     */
+    protected function getAttributesForInsert()
+    {
+        return $this->getAttributes();
+    }
+
     /**
      * Set the array of model attributes. No checking is done.
      *

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

@@ -94,9 +94,7 @@ public function makeVisible($attributes)
      */
     public function makeVisibleIf($condition, $attributes)
     {
-        $condition = $condition instanceof Closure ? $condition($this) : $condition;
-
-        return $condition ? $this->makeVisible($attributes) : $this;
+        return value($condition, $this) ? $this->makeVisible($attributes) : $this;
     }
 
     /**
@@ -123,8 +121,6 @@ public function makeHidden($attributes)
      */
     public function makeHiddenIf($condition, $attributes)
     {
-        $condition = $condition instanceof Closure ? $condition($this) : $condition;
-
-        return value($condition) ? $this->makeHidden($attributes) : $this;
+        return value($condition, $this) ? $this->makeHidden($attributes) : $this;
     }
 }

src/Illuminate/Database/Eloquent/Model.php

@@ -3,7 +3,6 @@
 namespace Illuminate\Database\Eloquent;
 
 use ArrayAccess;
-use Exception;
 use Illuminate\Contracts\Queue\QueueableCollection;
 use Illuminate\Contracts\Queue\QueueableEntity;
 use Illuminate\Contracts\Routing\UrlRoutable;
@@ -20,6 +19,7 @@
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\ForwardsCalls;
 use JsonSerializable;
+use LogicException;
 
 abstract class Model implements Arrayable, ArrayAccess, Jsonable, JsonSerializable, QueueableEntity, UrlRoutable
 {
@@ -1011,7 +1011,7 @@ protected function performInsert(Builder $query)
         // If the model has an incrementing key, we can use the "insertGetId" method on
         // the query builder, which will give us back the final inserted ID for this
         // table from the database. Not all tables have to be incrementing though.
-        $attributes = $this->getAttributes();
+        $attributes = $this->getAttributesForInsert();
 
         if ($this->getIncrementing()) {
             $this->insertAndSetId($query, $attributes);
@@ -1097,14 +1097,14 @@ public static function destroy($ids)
      *
      * @return bool|null
      *
-     * @throws \Exception
+     * @throws \LogicException
      */
     public function delete()
     {
         $this->mergeAttributesFromClassCasts();
 
         if (is_null($this->getKeyName())) {
-            throw new Exception('No primary key defined on model.');
+            throw new LogicException('No primary key defined on model.');
         }
 
         // If the model doesn't exist, there is nothing to delete so we'll just return

src/Illuminate/Database/Events/MigrationEvent.php

@@ -8,7 +8,7 @@
 abstract class MigrationEvent implements MigrationEventContract
 {
     /**
-     * An migration instance.
+     * A migration instance.
      *
      * @var \Illuminate\Database\Migrations\Migration
      */

src/Illuminate/Database/Migrations/Migrator.php

@@ -13,6 +13,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use ReflectionClass;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Migrator
@@ -185,9 +186,9 @@ protected function runUp($file, $batch, $pretend)
         // First we will resolve a "real" instance of the migration class from this
         // migration file name. Once we have the instances we can run the actual
         // command such as "up" or "down", or we can just simulate the action.
-        $migration = $this->resolve(
-            $name = $this->getMigrationName($file)
-        );
+        $migration = $this->resolvePath($file);
+
+        $name = $this->getMigrationName($file);
 
         if ($pretend) {
             return $this->pretendToRun($migration, 'up');
@@ -348,9 +349,9 @@ protected function runDown($file, $migration, $pretend)
         // First we will get the file name of the migration so we can resolve out an
         // instance of the migration. Once we get an instance we can either run a
         // pretend execution of the migration or we can run the real migration.
-        $instance = $this->resolve(
-            $name = $this->getMigrationName($file)
-        );
+        $instance = $this->resolvePath($file);
+
+        $name = $this->getMigrationName($file);
 
         $this->note("<comment>Rolling back:</comment> {$name}");
 
@@ -413,6 +414,12 @@ protected function pretendToRun($migration, $method)
         foreach ($this->getQueries($migration, $method) as $query) {
             $name = get_class($migration);
 
+            $reflectionClass = new ReflectionClass($migration);
+
+            if ($reflectionClass->isAnonymous()) {
+                $name = $this->getMigrationName($reflectionClass->getFileName());
+            }
+
             $this->note("<info>{$name}:</info> {$query['query']}");
         }
     }
@@ -448,11 +455,39 @@ protected function getQueries($migration, $method)
      */
     public function resolve($file)
     {
-        $class = Str::studly(implode('_', array_slice(explode('_', $file), 4)));
+        $class = $this->getMigrationClass($file);
 
         return new $class;
     }
 
+    /**
+     * Resolve a migration instance from a migration path.
+     *
+     * @param  string  $path
+     * @return object
+     */
+    protected function resolvePath(string $path)
+    {
+        $class = $this->getMigrationClass($this->getMigrationName($path));
+
+        if (class_exists($class) && realpath($path) == (new ReflectionClass($class))->getFileName()) {
+            return new $class;
+        }
+
+        return $this->files->getRequire($path);
+    }
+
+    /**
+     * Generate a migration class name based on the migration file name.
+     *
+     * @param  string  $migrationName
+     * @return string
+     */
+    protected function getMigrationClass(string $migrationName): string
+    {
+        return Str::studly(implode('_', array_slice(explode('_', $migrationName), 4)));
+    }
+
     /**
      * Get all of the migration files in a given path.
      *

src/Illuminate/Database/Query/Builder.php

@@ -244,7 +244,7 @@ public function select($columns = ['*'])
     /**
      * Add a subselect expression to the query.
      *
-     * @param  \Closure|\Illuminate\Database\Query\Builder|string  $query
+     * @param  \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|string  $query
      * @param  string  $as
      * @return $this
      *