Merge remote-tracking branch 'origin/3.x'

Author: lisachenko

Diff for: composer.json

@@ -53,7 +53,8 @@
             "Go\\Tests\\TestProject\\": "tests/Fixtures/project/src/"
         },
         "files": [
-            "tests/functions.php"
+            "tests/functions.php",
+            "tests/Go/Stubs/ClassWithoutNamespace.php"
         ]
     },
 

Diff for: src/Instrument/Transformer/SelfValueVisitor.php

@@ -81,7 +81,7 @@ public function beforeTraverse(array $nodes)
     public function enterNode(Node $node)
     {
         if ($node instanceof Namespace_) {
-            $this->namespace = $node->name->toString();
+            $this->namespace = !empty($node->name) ? $node->name->toString() : null;
         } elseif ($node instanceof Class_) {
             if ($node->name !== null) {
                 $this->className = new Name($node->name->toString());

Diff for: src/Proxy/ClassProxyGenerator.php

@@ -109,7 +109,7 @@ public function __construct(
 
         $this->generator = new ClassGenerator(
             $originalClass->getShortName(),
-            $originalClass->getNamespaceName(),
+            !empty($originalClass->getNamespaceName()) ? $originalClass->getNamespaceName() : null,
             $originalClass->isFinal() ? ClassGenerator::FLAG_FINAL : null,
             $parentClassName,
             $introducedInterfaces,

Diff for: src/Proxy/Part/InterceptedMethodGenerator.php

@@ -39,7 +39,7 @@ public function __construct(ReflectionMethod $reflectionMethod, string $body, bo
         if ($reflectionMethod->hasReturnType()) {
             $reflectionReturnType = $reflectionMethod->getReturnType();
             if ($reflectionReturnType instanceof ReflectionNamedType) {
-                $returnTypeName = $reflectionReturnType->getName();
+                $returnTypeName = ($reflectionReturnType->allowsNull() ? '?' : '') . $reflectionReturnType->getName();
             } else {
                 $returnTypeName = (string)$reflectionReturnType;
             }

Diff for: tests/Go/Aop/Framework/AbstractMethodInvocationTest.php

@@ -24,4 +24,51 @@ public function testInvocationReturnsMethod(): void
         $this->assertEquals(parent::class, $this->invocation->getMethod()->class);
         $this->assertEquals('setUp', $this->invocation->getMethod()->name);
     }
+
+    /**
+     * @link https://github.com/goaop/framework/issues/481
+     */
+    public function testInstanceIsInitialized(): void
+    {
+        $this->expectNotToPerformAssertions();
+
+        $o = new class extends AbstractMethodInvocation {
+
+            protected static string $propertyName = 'scope';
+
+            /**
+             * @var (string&class-string) Class name scope for static invocation
+             */
+            protected string $scope;
+
+            public function __construct()
+            {
+                parent::__construct([new AroundInterceptor(function () {})], AbstractMethodInvocationTest::class, 'testInstanceIsInitialized');
+            }
+
+            public function isDynamic(): bool
+            {
+                return false;
+            }
+
+            public function getThis(): ?object
+            {
+                return null;
+            }
+
+            public function getScope(): string
+            {
+                return self::class;
+            }
+
+            public function proceed(): void
+            {
+                if ($this->level < 3) {
+                    $this->__invoke($this->scope);
+                }
+            }
+        };
+
+        $o->__invoke($o::class);
+    }
 }

Diff for: tests/Go/Instrument/Transformer/SelfValueTransformerTest.php

@@ -72,4 +72,14 @@ public function testTransformerReplacesAllSelfPlaces(): void
         $expected = file_get_contents(__DIR__ . '/_files/file-with-self-transformed.php');
         $this->assertSame($expected, (string) $metadata->source);
     }
+
+    public function testTransformerReplacesAllSelfPlacesWithoutNamespace(): void
+    {
+        $testFile = fopen(__DIR__ . '/_files/file-with-self-no-namespace.php', 'rb');
+        $content  = stream_get_contents($testFile);
+        $metadata = new StreamMetaData($testFile, $content);
+        $this->transformer->transform($metadata);
+        $expected = file_get_contents(__DIR__ . '/_files/file-with-self-no-namespace-transformed.php');
+        $this->assertSame($expected, (string) $metadata->source);
+    }
 }

Diff for: tests/Go/Instrument/Transformer/_files/file-with-self-no-namespace-transformed.php

@@ -0,0 +1,61 @@
+<?php
+/** @noinspection PhpIllegalPsrClassPathInspection */
+declare(strict_types=1);
+
+class ClassWithSelfNoNamespace extends \Exception
+{
+    const CLASS_CONST = \ClassWithSelfNoNamespace::class;
+
+    private static $foo = 42;
+
+    private \ClassWithSelfNoNamespace $instance;
+
+    public function acceptsAndReturnsSelf(\ClassWithSelfNoNamespace $instance): \ClassWithSelfNoNamespace
+    {
+        return $instance;
+    }
+
+    public function containsClosureWithSelf()
+    {
+        $func = function (\ClassWithSelfNoNamespace $instance): \ClassWithSelfNoNamespace {
+            return $instance;
+        };
+        $func($this);
+    }
+
+    public function staticMethodCall()
+    {
+        return \ClassWithSelfNoNamespace::staticPropertyAccess();
+    }
+
+    public function classConstantFetch()
+    {
+        return \ClassWithSelfNoNamespace::class . \ClassWithSelfNoNamespace::CLASS_CONST;
+    }
+
+    public static function staticPropertyAccess()
+    {
+        return self::$foo;
+    }
+
+    public function newInstanceCreation()
+    {
+        return new \ClassWithSelfNoNamespace;
+    }
+
+    public function catchSection()
+    {
+        try {
+            throw new \ClassWithSelfNoNamespace;
+        } catch (\ClassWithSelfNoNamespace $exception) {
+            // Nop
+        }
+    }
+
+    public function instanceCheck()
+    {
+        if ($this instanceof \ClassWithSelfNoNamespace) {
+            // Nop
+        }
+    }
+}

Diff for: tests/Go/Instrument/Transformer/_files/file-with-self-no-namespace.php

@@ -0,0 +1,61 @@
+<?php
+/** @noinspection PhpIllegalPsrClassPathInspection */
+declare(strict_types=1);
+
+class ClassWithSelfNoNamespace extends \Exception
+{
+    const CLASS_CONST = self::class;
+
+    private static $foo = 42;
+
+    private self $instance;
+
+    public function acceptsAndReturnsSelf(self $instance): self
+    {
+        return $instance;
+    }
+
+    public function containsClosureWithSelf()
+    {
+        $func = function (self $instance): self {
+            return $instance;
+        };
+        $func($this);
+    }
+
+    public function staticMethodCall()
+    {
+        return self::staticPropertyAccess();
+    }
+
+    public function classConstantFetch()
+    {
+        return self::class . self::CLASS_CONST;
+    }
+
+    public static function staticPropertyAccess()
+    {
+        return self::$foo;
+    }
+
+    public function newInstanceCreation()
+    {
+        return new self;
+    }
+
+    public function catchSection()
+    {
+        try {
+            throw new self;
+        } catch (self $exception) {
+            // Nop
+        }
+    }
+
+    public function instanceCheck()
+    {
+        if ($this instanceof self) {
+            // Nop
+        }
+    }
+}

Diff for: tests/Go/Proxy/ClassProxyGeneratorTest.php

@@ -92,6 +92,7 @@ public static function dataGenerator(): array
             [First::class, 'publicMethod'],
             [First::class, 'protectedMethod'],
             [First::class, 'passByReference'],
+            [\ClassWithoutNamespace::class, 'publicMethod'],
         ];
     }
 }

Diff for: tests/Go/Stubs/ClassWithoutNamespace.php

@@ -0,0 +1,11 @@
+<?php /** @noinspection PhpIllegalPsrClassPathInspection */
+
+
+class ClassWithoutNamespace
+{
+    public function publicMethod(): int
+    {
+        return 1;
+    }
+
+}