Merge branch '5.6'

Author: GrahamCampbell

CHANGELOG-5.5.md

@@ -1,5 +1,12 @@
 # Release Notes for 5.5.x
 
+## [Unreleased]
+
+### Changed
+- Only set id on `NotificationFake` if no id is set ([#23474](https://github.com/laravel/framework/pull/23474))
+- Removed attribute filling from pivot models ([#23554](https://github.com/laravel/framework/pull/23554))
+
+
 ## v5.5.39 (2018-03-09)
 
 ### Fixed

src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub

@@ -43,6 +43,7 @@
 
                         <div class="form-group row">
                             <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
+
                             <div class="col-md-6">
                                 <input id="password-confirm" type="password" class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}" name="password_confirmation" required>
 

src/Illuminate/Console/Scheduling/CallbackEvent.php

@@ -60,8 +60,12 @@ public function run(Container $container)
             return;
         }
 
-        register_shutdown_function(function () {
-            $this->removeMutex();
+        $pid = getmypid();
+
+        register_shutdown_function(function () use ($pid) {
+            if ($pid === getmypid()) {
+                $this->removeMutex();
+            }
         });
 
         parent::callBeforeCallbacks($container);

src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php

@@ -2,12 +2,14 @@
 
 namespace Illuminate\Contracts\Broadcasting;
 
+use Illuminate\Broadcasting\Channel;
+
 interface ShouldBroadcast
 {
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return array
+     * @return Channel|Channel[]
      */
     public function broadcastOn();
 }

src/Illuminate/Database/Eloquent/Factory.php

@@ -116,11 +116,12 @@ public function state($class, $state, $attributes)
      *
      * @param  string  $class
      * @param  callable  $callback
+     * @param  string  $name
      * @return $this
      */
-    public function afterMaking($class, $callback)
+    public function afterMaking($class, callable $callback, $name = 'default')
     {
-        $this->afterMaking[$class]['default'][] = $callback;
+        $this->afterMaking[$class][$name][] = $callback;
 
         return $this;
     }
@@ -133,23 +134,22 @@ public function afterMaking($class, $callback)
      * @param  callable  $callback
      * @return $this
      */
-    public function afterMakingState($class, $state, $callback)
+    public function afterMakingState($class, $state, callable $callback)
     {
-        $this->afterMaking[$class][$state][] = $callback;
-
-        return $this;
+        return $this->afterMaking($class, $callback, $state);
     }
 
     /**
      * Define a callback to run after creating a model.
      *
      * @param  string  $class
      * @param  callable  $callback
+     * @param  string $name
      * @return $this
      */
-    public function afterCreating($class, $callback)
+    public function afterCreating($class, callable $callback, $name = 'default')
     {
-        $this->afterCreating[$class]['default'][] = $callback;
+        $this->afterCreating[$class][$name][] = $callback;
 
         return $this;
     }
@@ -162,11 +162,9 @@ public function afterCreating($class, $callback)
      * @param  callable  $callback
      * @return $this
      */
-    public function afterCreatingState($class, $state, $callback)
+    public function afterCreatingState($class, $state, callable $callback)
     {
-        $this->afterCreating[$class][$state][] = $callback;
-
-        return $this;
+        return $this->afterCreating($class, $callback, $state);
     }
 
     /**

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -652,9 +652,9 @@ protected function compileUnions(Builder $query)
      */
     protected function compileUnion(array $union)
     {
-        $conjuction = $union['all'] ? ' union all ' : ' union ';
+        $conjunction = $union['all'] ? ' union all ' : ' union ';
 
-        return $conjuction.$union['query']->toSql();
+        return $conjunction.$union['query']->toSql();
     }
 
     /**

src/Illuminate/Database/Query/Grammars/MySqlGrammar.php

@@ -60,9 +60,9 @@ public function compileSelect(Builder $query)
      */
     protected function compileUnion(array $union)
     {
-        $conjuction = $union['all'] ? ' union all ' : ' union ';
+        $conjunction = $union['all'] ? ' union all ' : ' union ';
 
-        return $conjuction.'('.$union['query']->toSql().')';
+        return $conjunction.'('.$union['query']->toSql().')';
     }
 
     /**

src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php

@@ -63,9 +63,9 @@ public function compileSelect(Builder $query)
      */
     protected function compileUnion(array $union)
     {
-        $conjuction = $union['all'] ? ' union all ' : ' union ';
+        $conjunction = $union['all'] ? ' union all ' : ' union ';
 
-        return $conjuction.'select * from ('.$union['query']->toSql().')';
+        return $conjunction.'select * from ('.$union['query']->toSql().')';
     }
 
     /**

src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php

@@ -84,7 +84,7 @@ protected function addForeignKeys(Blueprint $blueprint)
 
             // If this foreign key specifies the action to be taken on update we will add
             // that to the statement here. We'll append it to this SQL and then return
-            // the SQL so we can keep adding any other foreign consraints onto this.
+            // the SQL so we can keep adding any other foreign constraints onto this.
             if (! is_null($foreign->onUpdate)) {
                 $sql .= " on update {$foreign->onUpdate}";
             }

src/Illuminate/Foundation/Application.php

@@ -481,13 +481,7 @@ public function environment()
         if (func_num_args() > 0) {
             $patterns = is_array(func_get_arg(0)) ? func_get_arg(0) : func_get_args();
 
-            foreach ($patterns as $pattern) {
-                if (Str::is($pattern, $this['env'])) {
-                    return true;
-                }
-            }
-
-            return false;
+            return Str::is($patterns, $this['env']);
         }
 
         return $this['env'];