Merge pull request #39 from laravel/fix/first-class-callables-namespaces

[1.x] Fixes first class callables namespaces

Author: taylorotwell

src/Support/ReflectionClosure.php

@@ -96,7 +96,7 @@ public function getCode()
         $builtin_types = self::getBuiltinTypes();
         $class_keywords = ['self', 'static', 'parent'];
 
-        $ns = $this->getNamespaceName();
+        $ns = $this->getClosureNamespaceName();
         $nsf = $ns == '' ? '' : ($ns[0] == '\\' ? $ns : '\\'.$ns);
 
         $_file = var_export($fileName, true);
@@ -1133,6 +1133,23 @@ protected function fetchItems()
         static::$structures[$key] = $structures;
     }
 
+    /**
+     * Returns the namespace associated to the closure.
+     *
+     * @return string
+     */
+    protected function getClosureNamespaceName()
+    {
+        $ns = $this->getNamespaceName();
+
+        // First class callables...
+        if ($this->getName() !== '{closure}' && empty($ns) && ! is_null($this->getClosureScopeClass())) {
+            $ns = $this->getClosureScopeClass()->getNamespaceName();
+        }
+
+        return $ns;
+    }
+
     /**
      * Parse the given token.
      *

tests/Fixtures/Model.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Fixtures;
+
+class Model
+{
+    public function make(Model $model): Model
+    {
+        return new Model();
+    }
+
+    public static function staticMake(Model $model): Model
+    {
+        return new Model();
+    }
+}

tests/ReflectionClosure5Test.php

@@ -4,6 +4,7 @@
 use Foo\Baz\Qux;
 use Foo\Baz\Qux\Forest;
 use Laravel\SerializableClosure\Support\ReflectionClosure;
+use Tests\Fixtures\Model;
 
 test('is short closure', function () {
     $f1 = fn () => 1;
@@ -152,6 +153,28 @@
     expect($f)->toBeCode($e);
 });
 
+test('from callable namespaces', function () {
+    $f = Closure::fromCallable([new Model, 'make']);
+
+    $e = 'function (\Tests\Fixtures\Model $model): \Tests\Fixtures\Model
+    {
+        return new \Tests\Fixtures\Model();
+    }';
+
+    expect($f)->toBeCode($e);
+});
+
+test('from static callable namespaces', function () {
+    $f = Closure::fromCallable([Model::class, 'staticMake']);
+
+    $e = 'static function (\Tests\Fixtures\Model $model): \Tests\Fixtures\Model
+    {
+        return new \Tests\Fixtures\Model();
+    }';
+
+    expect($f)->toBeCode($e);
+});
+
 // Helpers
 function c(Closure $closure)
 {

tests/ReflectionClosurePhp81Test.php

@@ -2,6 +2,8 @@
 
 use Foo\Baz\Qux\Forest;
 use Some\ClassName as ClassAlias;
+use Tests\Fixtures\Model;
+use function Tests\Fixtures\{makeModel};
 
 enum GlobalEnum {
     case Admin;
@@ -256,6 +258,32 @@ enum ScopedBackedEnum: string {
     expect($f)->toBeCode($e);
 })->skip('Constants in anonymous classes is not supported.');
 
+test('first-class callable namespaces', function () {
+    $model = new Model();
+
+    $f = $model->make(...);
+
+    $e = 'function (\Tests\Fixtures\Model $model): \Tests\Fixtures\Model
+    {
+        return new \Tests\Fixtures\Model();
+    }';
+
+    expect($f)->toBeCode($e);
+});
+
+test('static first-class callable namespaces', function () {
+    $model = new Model();
+
+    $f = $model->staticMake(...);
+
+    $e = 'static function (\Tests\Fixtures\Model $model): \Tests\Fixtures\Model
+    {
+        return new \Tests\Fixtures\Model();
+    }';
+
+    expect($f)->toBeCode($e);
+});
+
 class ReflectionClosurePhp81Service
 {
 }

tests/SerializerPhp81Test.php

@@ -1,5 +1,7 @@
 <?php
 
+use Tests\Fixtures\Model;
+
 enum SerializerGlobalEnum {
     case Admin;
     case Guest;
@@ -280,6 +282,26 @@ enum SerializerScopedBackedEnum: string {
     expect($object->getPrivate())->toBe('private');
 })->with('serializers');
 
+test('first-class callable namespaces', function () {
+    $model = new Model();
+
+    $f = $model->make(...);
+
+    $f = s($f);
+
+    expect($f(new Model))->toBeInstanceOf(Model::class);
+})->with('serializers');
+
+test('static first-class callable namespaces', function () {
+    $model = new Model();
+
+    $f = $model->staticMake(...);
+
+    $f = s($f);
+
+    expect($f(new Model))->toBeInstanceOf(Model::class);
+})->with('serializers');
+
 interface SerializerPhp81HasId {}
 interface SerializerPhp81HasName {}
 

tests/SerializerTest.php

@@ -3,6 +3,7 @@
 use Laravel\SerializableClosure\SerializableClosure;
 use Laravel\SerializableClosure\Serializers\Signed;
 use Laravel\SerializableClosure\Support\ReflectionClosure;
+use Tests\Fixtures\Model;
 
 test('closure use return value', function () {
     $a = 100;
@@ -384,6 +385,22 @@ function () {
     expect($r)->toEqual('Hi');
 })->with('serializers');
 
+test('from callable namespaces', function () {
+    $f = Closure::fromCallable([new Model, 'make']);
+
+    $f = s($f);
+
+    expect($f(new Model))->toBeInstanceOf(Model::class);
+})->with('serializers');
+
+test('from static callable namespaces', function () {
+    $f = Closure::fromCallable([new Model, 'staticMake']);
+
+    $f = s($f);
+
+    expect($f(new Model))->toBeInstanceOf(Model::class);
+})->with('serializers');
+
 class A
 {
     protected static function aStaticProtected()