[5.6] Rewrite BadMethodCallException messages for consistency and always include the FQN of the class that throws the exception

src/Illuminate/Database/Eloquent/Builder.php

@@ -1304,7 +1304,8 @@ public static function __callStatic($method, $parameters)
         }
 
         if (! isset(static::$macros[$method])) {
-            throw new BadMethodCallException("Method {$method} does not exist.");
+            $className = static::class;
+            throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
         }
 
         if (static::$macros[$method] instanceof Closure) {

src/Illuminate/Database/Query/Builder.php

@@ -2508,7 +2508,6 @@ public function __call($method, $parameters)
         }
 
         $className = static::class;
-
-        throw new BadMethodCallException("Call to undefined method {$className}::{$method}()");
+        throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
     }
 }

src/Illuminate/Http/RedirectResponse.php

@@ -231,8 +231,7 @@ public function __call($method, $parameters)
             return $this->with(Str::snake(substr($method, 4)), $parameters[0]);
         }
 
-        throw new BadMethodCallException(
-            "Method [$method] does not exist on Redirect."
-        );
+        $className = static::class;
+        throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
     }
 }

src/Illuminate/Mail/Mailable.php

@@ -718,6 +718,7 @@ public function __call($method, $parameters)
             return $this->with(Str::snake(substr($method, 4)), $parameters[0]);
         }
 
-        throw new BadMethodCallException("Method [$method] does not exist on mailable.");
+        $className = static::class;
+        throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
     }
 }

src/Illuminate/Routing/Controller.php

@@ -65,6 +65,7 @@ public function callAction($method, $parameters)
      */
     public function __call($method, $parameters)
     {
-        throw new BadMethodCallException("Method [{$method}] does not exist on [".get_class($this).'].');
+        $className = static::class;
+        throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
     }
 }

src/Illuminate/Routing/RouteRegistrar.php

@@ -175,6 +175,7 @@ public function __call($method, $parameters)
             return $this->attribute($method, $parameters[0]);
         }
 
-        throw new BadMethodCallException("Method [{$method}] does not exist.");
+        $className = static::class;
+        throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
     }
 }

src/Illuminate/Support/Traits/Macroable.php

@@ -71,7 +71,8 @@ public static function hasMacro($name)
     public static function __callStatic($method, $parameters)
     {
         if (! static::hasMacro($method)) {
-            throw new BadMethodCallException("Method {$method} does not exist.");
+            $className = static::class;
+            throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
         }
 
         if (static::$macros[$method] instanceof Closure) {
@@ -93,7 +94,8 @@ public static function __callStatic($method, $parameters)
     public function __call($method, $parameters)
     {
         if (! static::hasMacro($method)) {
-            throw new BadMethodCallException("Method {$method} does not exist.");
+            $className = static::class;
+            throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
         }
 
         $macro = static::$macros[$method];

src/Illuminate/Validation/Validator.php

@@ -1137,6 +1137,7 @@ public function __call($method, $parameters)
             return $this->callExtension($rule, $parameters);
         }
 
-        throw new BadMethodCallException("Method [$method] does not exist.");
+        $className = static::class;
+        throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
     }
 }

src/Illuminate/View/View.php

@@ -396,7 +396,8 @@ public function __unset($key)
     public function __call($method, $parameters)
     {
         if (! Str::startsWith($method, 'with')) {
-            throw new BadMethodCallException("Method [$method] does not exist on view.");
+            $className = static::class;
+            throw new BadMethodCallException("Method {$className}::{$method} does not exist.");
         }
 
         return $this->with(Str::camel(substr($method, 4)), $parameters[0]);

tests/Http/HttpRedirectResponseTest.php

@@ -121,7 +121,7 @@ public function testMagicCall()
 
     /**
      * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Method [doesNotExist] does not exist on Redirect.
+     * @expectedExceptionMessage Method Illuminate\Http\RedirectResponse::doesNotExist does not exist.
      */
     public function testMagicCallException()
     {

tests/Http/HttpResponseTest.php

@@ -189,7 +189,7 @@ public function testMagicCall()
 
     /**
      * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Method [doesNotExist] does not exist on Redirect.
+     * @expectedExceptionMessage Method Illuminate\Http\RedirectResponse::doesNotExist does not exist.
      */
     public function testMagicCallException()
     {

tests/Routing/RouteRegistrarTest.php

@@ -201,7 +201,7 @@ public function testCanRegisterGroupWithDomainAndNamePrefix()
 
     /**
      * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Method [missing] does not exist.
+     * @expectedExceptionMessage Method Illuminate\Routing\RouteRegistrar::missing does not exist.
      */
     public function testRegisteringNonApprovedAttributesThrows()
     {

tests/Support/SupportCarbonTest.php

@@ -58,7 +58,7 @@ public function testCarbonIsMacroableWhenCalledStatically()
 
     /**
      * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Method nonExistingStaticMacro does not exist.
+     * @expectedExceptionMessage Method Illuminate\Support\Carbon::nonExistingStaticMacro does not exist.
      */
     public function testCarbonRaisesExceptionWhenStaticMacroIsNotFound()
     {
@@ -67,7 +67,7 @@ public function testCarbonRaisesExceptionWhenStaticMacroIsNotFound()
 
     /**
      * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Method nonExistingMacro does not exist.
+     * @expectedExceptionMessage Method Illuminate\Support\Carbon::nonExistingMacro does not exist.
      */
     public function testCarbonRaisesExceptionWhenMacroIsNotFound()
     {

tests/View/ViewTest.php

@@ -165,7 +165,7 @@ public function testViewMagicMethods()
 
     /**
      * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Method [badMethodCall] does not exist on view.
+     * @expectedExceptionMessage Method Illuminate\View\View::badMethodCall does not exist.
      */
     public function testViewBadMethod()
     {