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

* origin/2.x:
  Fix constructor invocation to know about special parent class names, fix #425

src/Aop/Framework/ReflectionConstructorInvocation.php

@@ -12,6 +12,7 @@
 namespace Go\Aop\Framework;
 
 use Go\Aop\Intercept\ConstructorInvocation;
+use Go\Core\AspectContainer;
 use ReflectionClass;
 use ReflectionMethod;
 
@@ -48,11 +49,16 @@ class ReflectionConstructorInvocation extends AbstractInvocation implements Cons
      */
     public function __construct(string $className, string $unusedType, array $advices)
     {
-        $this->class       = new ReflectionClass($className);
+        $originalClass = $className;
+        if (strpos($originalClass, AspectContainer::AOP_PROXIED_SUFFIX) !== false) {
+            $originalClass = substr($originalClass, 0, -strlen(AspectContainer::AOP_PROXIED_SUFFIX));
+        }
+
+        $this->class       = new ReflectionClass($originalClass);
         $this->constructor = $constructor = $this->class->getConstructor();
 
-        // Give an access to call protected constructor
-        if ($constructor && $constructor->isProtected()) {
+        // Give an access to call protected/private constructors
+        if ($constructor && !$constructor->isPublic()) {
             $constructor->setAccessible(true);
         }
 
@@ -76,7 +82,11 @@ final public function proceed()
             return $currentInterceptor->invoke($this);
         }
 
-        $this->instance = $this->class->newInstance(...$this->arguments);
+        $this->instance = $this->class->newInstanceWithoutConstructor();
+        $constructor    = $this->getConstructor();
+        if ($constructor !== null) {
+            $constructor->invoke($this->instance, ...$this->arguments);
+        }
 
         return $this->instance;
     }

tests/Go/Aop/Framework/ReflectionConstructorInvocationTest.php

@@ -0,0 +1,97 @@
+<?php
+declare(strict_types = 1);
+/*
+ * Go! AOP framework
+ *
+ * @copyright Copyright 2019, Lisachenko Alexander <[email protected]>
+ *
+ * This source file is subject to the license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Go\Aop\Framework;
+
+use Go\Core\AspectContainer;
+
+class ReflectionConstructorInvocationTest extends AbstractInterceptorTest
+{
+    public function testCanCreateObjectDuringInvocation(): void
+    {
+        $invocation = new ReflectionConstructorInvocation(\Exception::class, 'unused', []);
+        $result     = $invocation->__invoke();
+        $this->assertInstanceOf(\Exception::class, $result);
+    }
+
+    public function testKnowsAboutSpecialClassSuffix(): void
+    {
+        $specialName = \Exception::class . AspectContainer::AOP_PROXIED_SUFFIX;
+        $invocation  = new ReflectionConstructorInvocation($specialName, 'unused', []);
+        $result      = $invocation->__invoke();
+        $this->assertInstanceOf(\Exception::class, $result);
+    }
+
+    public function testCanExecuteAdvicesDuringConstruct(): void
+    {
+        $sequence   = [];
+        $advice     = $this->getAdvice($sequence);
+        $before     = new BeforeInterceptor($advice);
+        $invocation = new ReflectionConstructorInvocation(\Exception::class, 'unused', [$before]);
+        $this->assertEmpty($sequence);
+        $invocation->__invoke(['Message', 100]);
+        $this->assertContains('advice', $sequence);
+    }
+
+    public function testStringRepresentation(): void
+    {
+        $invocation = new ReflectionConstructorInvocation(\Exception::class, 'unused', []);
+        $name       = (string)$invocation;
+
+        $this->assertEquals('initialization(Exception)', $name);
+    }
+
+    public function testReturnsConstructor(): void
+    {
+        $invocation = new ReflectionConstructorInvocation(\Exception::class, 'unused', []);
+        $ctor       = $invocation->getConstructor();
+        $this->assertInstanceOf(\ReflectionMethod::class, $ctor);
+        $this->assertEquals('__construct', $ctor->name);
+    }
+
+    public function testReturnsThis(): void
+    {
+        $invocation = new ReflectionConstructorInvocation(\Exception::class, 'unused', []);
+        $instance   = $invocation->getThis();
+        $this->assertNull($instance);
+        $object = $invocation->__invoke(['Some error', 100]);
+        $this->assertEquals($object, $invocation->getThis());
+    }
+
+    public function testCanCreateAnInstanceEvenWithNonPublicConstructor(): void
+    {
+        try {
+            $testClassInstance = new class('Test') {
+                public $message;
+
+                private function __construct(string $message)
+                {
+                    $this->message = $message;
+                }
+            };
+            $loadedClass = get_class($testClassInstance);
+        } catch (\Error $e) {
+            // let's look for all class names to find our anonymous one
+            foreach (get_declared_classes() as $loadedClass) {
+                $refClass = new \ReflectionClass($loadedClass);
+                if ($refClass->getFileName() === __FILE__ && strpos($refClass->getName(), 'anonymous') !== false) {
+                    // loadedClass will contain our anonymous class
+                    break;
+                }
+            }
+        }
+        $testClassName = $loadedClass;
+        $invocation    = new ReflectionConstructorInvocation($testClassName, 'unused', []);
+        $result        = $invocation->__invoke(['Hello']);
+        $this->assertInstanceOf($testClassName, $result);
+        $this->assertSame('Hello', $result->message);
+    }
+}