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

laravel · Jan 31, 2018 · f3e1895 · f3e1895
2 parents 6d8e530 + f249ed9
commit f3e1895
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Log/LogManager.php b/src/Illuminate/Log/LogManager.php
@@ -557,7 +557,7 @@ public function debug($message, array $context = [])
      */
     public function log($level, $message, array $context = [])
     {
-        return $this->driver()->log($message, $context);
+        return $this->driver()->log($level, $message, $context);
     }
 
     /**

diff --git a/src/Illuminate/Routing/RouteCollection.php b/src/Illuminate/Routing/RouteCollection.php
@@ -183,7 +183,7 @@ public function match(Request $request)
      * Determine if a route in the array matches the request.
      *
      * @param  array  $routes
-     * @param  \Illuminate\http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
      * @param  bool  $includingMethod
      * @return \Illuminate\Routing\Route|null
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -557,7 +557,7 @@ public function debug($message, array $context = []) @@
          */
         public function log($level, $message, array $context = [])
         {
-            return $this->driver()->log($message, $context);
+            return $this->driver()->log($level, $message, $context);
         }
         /**
@@ Expand Down @@