Merge branch '5.4' of github.com:laravel/framework into 5.4

pantherdd · Aug 27, 2017 · da18899 · da18899
2 parents eaec035 + 603ed4a
commit da18899
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Illuminate/Contracts/Foundation/Application.php b/src/Illuminate/Contracts/Foundation/Application.php
@@ -55,7 +55,7 @@ public function register($provider, $options = [], $force = false);
      * Register a deferred provider and service.
      *
      * @param  string  $provider
-     * @param  string  $service
+     * @param  string|null  $service
      * @return void
      */
     public function registerDeferredProvider($provider, $service = null);

diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -668,7 +668,7 @@ public function loadDeferredProvider($service)
      * Register a deferred provider and service.
      *
      * @param  string  $provider
-     * @param  string  $service
+     * @param  string|null  $service
      * @return void
      */
     public function registerDeferredProvider($provider, $service = null)

diff --git a/src/Illuminate/Validation/Concerns/FormatsMessages.php b/src/Illuminate/Validation/Concerns/FormatsMessages.php
@@ -68,7 +68,7 @@ protected function getMessage($attribute, $rule)
      *
      * @param  string  $attribute
      * @param  string  $lowerRule
-     * @param  array   $source
+     * @param  array|null  $source
      * @return string|null
      */
     protected function getFromLocalArray($attribute, $lowerRule, $source = null)