Merge branch '5.7'

illuminate · Sep 17, 2018 · 18f7ef6 · 18f7ef6
2 parents cffd60b + bad1260
commit 18f7ef6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 1 deletion.
diff --git a/Concerns/ManagesTransactions.php b/Concerns/ManagesTransactions.php
@@ -85,6 +85,7 @@ protected function handleTransactionException($e, $currentAttempt, $maxAttempts)
      * Start a new database transaction.
      *
      * @return void
+     *
      * @throws \Exception
      */
     public function beginTransaction()

diff --git a/Connection.php b/Connection.php
@@ -705,6 +705,7 @@ protected function getElapsedTime($start)
      * @param  array  $bindings
      * @param  \Closure  $callback
      * @return mixed
+     *
      * @throws \Exception
      */
     protected function handleQueryException($e, $query, $bindings, Closure $callback)

diff --git a/Eloquent/Collection.php b/Eloquent/Collection.php
@@ -478,6 +478,7 @@ public function pad($size, $value)
      * Get the type of the entities being queued.
      *
      * @return string|null
+     *
      * @throws \LogicException
      */
     public function getQueueableClass()
@@ -527,6 +528,7 @@ public function getQueueableRelations()
      * Get the connection of the entities being queued.
      *
      * @return string|null
+     *
      * @throws \LogicException
      */
     public function getQueueableConnection()

diff --git a/Eloquent/Model.php b/Eloquent/Model.php
@@ -1144,7 +1144,7 @@ public function refresh()
      * Clone the model into a new, non-existing instance.
      *
      * @param  array|null  $except
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return static
      */
     public function replicate(array $except = null)
     {

diff --git a/Migrations/MigrationCreator.php b/Migrations/MigrationCreator.php
@@ -42,6 +42,7 @@ public function __construct(Filesystem $files)
      * @param  string  $table
      * @param  bool    $create
      * @return string
+     *
      * @throws \Exception
      */
     public function create($name, $path, $table = null, $create = false)

diff --git a/Query/Processors/SqlServerProcessor.php b/Query/Processors/SqlServerProcessor.php
@@ -37,6 +37,7 @@ public function processInsertGetId(Builder $query, $sql, $values, $sequence = nu
      *
      * @param  \Illuminate\Database\Connection  $connection
      * @return int
+     *
      * @throws \Exception
      */
     protected function processInsertGetIdForOdbc(Connection $connection)

diff --git a/Schema/Grammars/SQLiteGrammar.php b/Schema/Grammars/SQLiteGrammar.php
@@ -179,6 +179,7 @@ public function compileIndex(Blueprint $blueprint, Fluent $command)
      *
      * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
+     *
      * @throws \RuntimeException
      */
     public function compileSpatialIndex(Blueprint $blueprint, Fluent $command)
@@ -308,6 +309,7 @@ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
      *
      * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
+     *
      * @throws \RuntimeException
      */
     public function compileDropSpatialIndex(Blueprint $blueprint, Fluent $command)