Refactor AopCodeGen, InterceptTrait

ray-di · Sep 18, 2023 · e1486de · e1486de
1 parent 893d10e
commit e1486de
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/AopCodeGen.php b/src/AopCodeGen.php
@@ -26,6 +26,7 @@
 
 final class AopCodeGen
 {
+    const INTERCEPT_STATEMENT = '\$this->_intercept(__FUNCTION__, func_get_args());';
     /** @var AopCodeGenMethodSignature */
     private $methodSignature;
 
@@ -44,7 +45,7 @@ public function __construct()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function generate(ReflectionClass $sourceClass, BindInterface $bind, string $postfix = '_aop'): string
+    public function generate(ReflectionClass $sourceClass, BindInterface $bind, string $postfix): string
     {
         $fileName = (string) $sourceClass->getFileName();
         if (! file_exists($fileName)) {
@@ -93,7 +94,6 @@ public function generate(ReflectionClass $sourceClass, BindInterface $bind, stri
 
         $newCode->implementsInterface(WeavedInterface::class);
         $this->addMethods($newCode, $sourceClass, $bind);
-        $newCode->getCodeText();
 
         return $newCode->getCodeText();
     }
@@ -104,7 +104,6 @@ private function addMethods(AopCodeGenNewCode $newCode, ReflectionClass $class,
         $bindings = array_keys($bind->getBindings());
 
         $parentMethods = $class->getMethods();
-        $statement = '\$this->_intercept(func_get_args(), __FUNCTION__);';
         $additionalMethods = [];
         foreach ($parentMethods as $method) {
             if (! in_array($method->getName(), $bindings)) {
@@ -119,7 +118,7 @@ private function addMethods(AopCodeGenNewCode $newCode, ReflectionClass $class,
             }
 
             $return = $isVoid ? '' : 'return ';
-            $additionalMethods[] = sprintf("    %s\n    {\n        %s%s\n    }\n", $signature, $return, $statement);
+            $additionalMethods[] = sprintf("    %s\n    {\n        %s%s\n    }\n", $signature, $return, self::INTERCEPT_STATEMENT);
         }
 
         if ($additionalMethods) {

diff --git a/src/AopCodeGenNewCode.php b/src/AopCodeGenNewCode.php
@@ -56,6 +56,7 @@ public function implementsInterface(string $interfaceName): void
 
     public function getCodeText(): string
     {
+        // close opened curly brace
         while ($this->curlyBraceCount !== 0) {
             $this->code .= '}';
             $this->curlyBraceCount--;

diff --git a/src/InterceptTrait.php b/src/InterceptTrait.php
@@ -23,7 +23,7 @@ trait InterceptTrait
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
      */
-    private function _intercept(array $args, string $func) // phpcs:ignore
+    private function _intercept(string $func, array $args) // phpcs:ignore
     {
         if (! $this->isAspect) {
             $this->isAspect = true;

diff --git a/tests/AopCodeGenTest.php b/tests/AopCodeGenTest.php
@@ -29,7 +29,7 @@ public function testTypeDeclarations(): void
     {
         $bind = new Bind();
         $bind->bindInterceptors('run', []);
-        $code = $this->codeGen->generate(new ReflectionClass(FakePhp7Class::class), $bind);
+        $code = $this->codeGen->generate(new ReflectionClass(FakePhp7Class::class), $bind,  '_test');
         $expected = 'function run(string $a, int $b, float $c, bool $d): array';
         $this->assertStringContainsString($expected, $code);
     }
@@ -38,7 +38,7 @@ public function testReturnType(): void
     {
         $bind = new Bind();
         $bind->bindInterceptors('returnTypeArray', []);
-        $code = $this->codeGen->generate(new ReflectionClass(FakePhp7ReturnTypeClass::class), $bind);
+        $code = $this->codeGen->generate(new ReflectionClass(FakePhp7ReturnTypeClass::class), $bind,  '_test');
         $expected = 'function returnTypeArray(): array';
         $this->assertStringContainsString($expected, $code);
     }
@@ -51,12 +51,12 @@ public function testUnionType(): void
             $bind->bindInterceptors('method' . (string) $i, []);
         }
 
-        $code = $this->codeGen->generate(new ReflectionClass(FakePhp8Types::class), $bind);
+        $code = $this->codeGen->generate(new ReflectionClass(FakePhp8Types::class), $bind,  '_test');
         $tempFile = tempnam(sys_get_temp_dir(), 'tmp_') . '.php';
         file_put_contents($tempFile, $code);
         require $tempFile;
         unlink($tempFile);
-        $this->assertTrue(class_exists('\Ray\Aop\FakePhp8Types_aop'));
+        $this->assertTrue(class_exists('\Ray\Aop\FakePhp8Types_test'));
 
         $this->assertStringContainsString('public function method1($param1)', $code);
         $this->assertStringContainsString('public function method2(string $param1)', $code);
@@ -84,6 +84,6 @@ public function testUnionType(): void
     public function testInvalidSourceClass(): void
     {
         $this->expectException(InvalidSourceClassException::class);
-        $this->codeGen->generate(new ReflectionClass(stdClass::class), new Bind());
+        $this->codeGen->generate(new ReflectionClass(stdClass::class), new Bind(),  '_test');
     }
 }