Remove AopCodeGen

ray-di · Nov 12, 2023 · a2e64f3 · a2e64f3
1 parent abfee6c
commit a2e64f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 34 deletions.
diff --git a/src/AopCodeGen.php b/src/AopCodeGen.php
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -20,14 +20,13 @@
 use function sprintf;
 use function str_replace;
 
+use const PHP_VERSION_ID;
+
 final class Compiler implements CompilerInterface
 {
     /** @var string */
     public $classDir;
 
-    /** @var AopCodeGen */
-    private $codeGen;
-
     /** @throws AnnotationException */
     public function __construct(string $classDir)
     {
@@ -36,7 +35,6 @@ public function __construct(string $classDir)
         }
 
         $this->classDir = $classDir;
-        $this->codeGen = new AopCodeGen();
     }
 
     /**
@@ -114,7 +112,8 @@ private function requireFile(AopPostfixClassName $className, ReflectionClass $so
     {
         $file = $this->getFileName($className->fqn);
         if (! file_exists($file)) {
-            $aopCode = $this->codeGen->generate($sourceClass, $bind, $className->postFix);
+            $code = new AopCode(new MethodSignatureString(PHP_VERSION_ID));
+            $aopCode = $code->generate($sourceClass, $bind, $className->postFix);
             file_put_contents($file, $aopCode);
         }
 

diff --git a/tests/AopCodeGenTest.php b/tests/AopCodeGenTest.php
@@ -15,14 +15,16 @@
 use function tempnam;
 use function unlink;
 
-class AopCodeGenTest extends TestCase
+use const PHP_VERSION_ID;
+
+class AopCodeTest extends TestCase
 {
-    /** @var AopCodeGen */
+    /** @var AopCode */
     private $codeGen;
 
     protected function setUp(): void
     {
-        $this->codeGen = new AopCodeGen();
+        $this->codeGen = new AopCode(new MethodSignatureString(PHP_VERSION_ID));
     }
 
     public function testTypeDeclarations(): void