Merge remote-tracking branch 'origin/5.3' into 5.3

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -145,12 +145,12 @@ public function validator(Closure $callback)
      */
     public function validateNewPassword(array $credentials)
     {
-        list($password, $confirm) = [
-            $credentials['password'],
-            $credentials['password_confirmation'],
-        ];
-
         if (isset($this->passwordValidator)) {
+            list($password, $confirm) = [
+                $credentials['password'],
+                $credentials['password_confirmation'],
+            ];
+
             return call_user_func(
                 $this->passwordValidator, $credentials) && $password === $confirm;
         }

src/Illuminate/Container/Container.php

@@ -225,10 +225,10 @@ public function bind($abstract, $concrete = null, $shared = false)
      */
     protected function getClosure($abstract, $concrete)
     {
-        return function ($c, $parameters = []) use ($abstract, $concrete) {
+        return function ($container, $parameters = []) use ($abstract, $concrete) {
             $method = ($abstract == $concrete) ? 'build' : 'make';
 
-            return $c->$method($concrete, $parameters);
+            return $container->$method($concrete, $parameters);
         };
     }
 

src/Illuminate/Database/Eloquent/Model.php

@@ -3067,13 +3067,31 @@ public function is(Model $model)
     }
 
     /**
-     * Get all of the current attributes on the model.
+     * Get a selection of the current attributes on the model.
+     *
+     * @param array $keys
      *
      * @return array
      */
-    public function getAttributes()
+    public function getAttributes($keys = [])
     {
-        return $this->attributes;
+        if ($keys === []) {
+            return $this->attributes;
+        }
+
+        $keys = is_array($keys) ? $keys : func_get_args();
+
+        $result = [];
+
+        foreach ($keys as $key) {
+            $value = $this->getAttribute($key);
+
+            if (! is_null($value)) {
+                $result[$key] = $value;
+            }
+        }
+
+        return $result;
     }
 
     /**

src/Illuminate/Notifications/Console/stubs/notifications.stub

@@ -13,7 +13,7 @@ class CreateNotificationsTable extends Migration
     public function up()
     {
         Schema::create('notifications', function (Blueprint $table) {
-            $table->string('id')->primary();
+            $table->uuid('id')->primary();
             $table->string('type');
             $table->morphs('notifiable');
             $table->text('data');

src/Illuminate/Support/Pluralizer.php

@@ -23,6 +23,7 @@ class Pluralizer
         'emoji',
         'equipment',
         'fish',
+        'furniture',
         'gold',
         'information',
         'knowledge',
@@ -41,6 +42,7 @@ class Pluralizer
         'species',
         'swine',
         'traffic',
+        'wheat',
     ];
 
     /**

tests/Database/DatabaseEloquentModelTest.php

@@ -31,6 +31,18 @@ public function testAttributeManipulation()
         $this->assertEquals(json_encode(['name' => 'taylor']), $attributes['list_items']);
     }
 
+    public function testGetMultipleAttributes()
+    {
+        $model = new EloquentModelStub(['name' => 'taylor', 'framework' => 'laravel', 'foo' => 'bar']);
+
+        $this->assertEquals(['name' => 'taylor', 'foo' => 'bar'], $model->getAttributes('name', 'foo'));
+        $this->assertEquals(['name' => 'taylor', 'foo' => 'bar'], $model->getAttributes(['name', 'foo']));
+        $this->assertEquals(['name' => 'taylor'], $model->getAttributes('name'));
+        $this->assertEquals(['name' => 'taylor'], $model->getAttributes(['name']));
+
+        $this->assertEquals(['name' => 'taylor'], $model->getAttributes(['name', 'doesntexist']));
+    }
+
     public function testDirtyAttributes()
     {
         $model = new EloquentModelStub(['foo' => '1', 'bar' => 2, 'baz' => 3]);