Merge pull request #28129 from kylekatarnls/allow-non-string-return-d…

…ate-macro [5.8] Allow to call macros directly on Date
laravel · Apr 8, 2019 · b699e5e · b699e5e
2 parents 58360ff + 7621ba1
commit b699e5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Support/DateFactory.php b/src/Illuminate/Support/DateFactory.php
@@ -212,7 +212,8 @@ public function __call($method, $parameters)
         $dateClass = static::$dateClass ?: $defaultClassName;
 
         // Check if date can be created using public class method...
-        if (method_exists($dateClass, $method)) {
+        if (method_exists($dateClass, $method) ||
+            method_exists($dateClass, 'hasMacro') && $dateClass::hasMacro($method)) {
             return $dateClass::$method(...$parameters);
         }
 

diff --git a/tests/Support/DateFacadeTest.php b/tests/Support/DateFacadeTest.php
@@ -92,4 +92,13 @@ public function testUseInvalidHandler()
 
         DateFactory::use(42);
     }
+
+    public function testMacro()
+    {
+        Date::macro('returnNonDate', function () {
+            return 'string';
+        });
+
+        $this->assertSame('string', Date::returnNonDate());
+    }
 }