Merge pull request #106 from php-java/change-di-approaching

m3m0r7 · web-flow · commit 18713ab1bcce · 2019-04-29T00:19:54.000+09:00
Change DI behavior.
diff --git a/src/Exceptions/NotSupportedInjectionTypesException.php b/src/Exceptions/NotSupportedInjectionTypesException.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Exceptions;
+
+class NotSupportedInjectionTypesException extends \Exception
+{
+}
diff --git a/src/Kernel/Core/DependencyInjector.php b/src/Kernel/Core/DependencyInjector.php
@@ -0,0 +1,50 @@
+<?php
+namespace PHPJava\Kernel\Core;
+
+use PHPJava\Exceptions\NotSupportedInjectionTypesException;
+
+trait DependencyInjector
+{
+    public function getNativeAnnotateInjections($phpDocument): array
+    {
+        $documentBlock = \phpDocumentor\Reflection\DocBlockFactory::createInstance()
+            ->create($phpDocument);
+
+        // Native annotation will dependency inject.
+        if (!empty($documentBlock->getTagsByName('native'))) {
+            $injections = [];
+            foreach ($documentBlock->getTagsByName('native') as $nativeClass) {
+                /**
+                 * @var \phpDocumentor\Reflection\DocBlock\Tags\Generic $nativeClass
+                 */
+                switch ($type = trim($nativeClass->getDescription())) {
+                    case 'ConstantPool':
+                        $injections[] = $this->getConstantPool();
+                        break;
+                    case 'JavaClass':
+                        $injections[] = $this->javaClass;
+                        break;
+                    case 'JavaClassInvoker':
+                        $injections[] = $this->javaClassInvoker;
+                        break;
+                    case 'Attributes':
+                        $injections[] = $this->getAttributes();
+                        break;
+                    case 'OperandStacks':
+                        $injections[] = $this->getStacks();
+                        break;
+                    case 'LocalStorages':
+                        $injections[] = $this->getLocalStorages();
+                        break;
+                    case 'Options':
+                        $injections[] = $this->options;
+                        break;
+                    default:
+                        throw new NotSupportedInjectionTypesException('Not supported injection type: "' . $type . '"');
+                }
+            }
+            return $injections;
+        }
+        return [];
+    }
+}
diff --git a/src/Kernel/Mnemonics/_invokestatic.php b/src/Kernel/Mnemonics/_invokestatic.php
@@ -16,6 +16,7 @@ final class _invokestatic implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
     use \PHPJava\Kernel\Core\ConstantPool;
+    use \PHPJava\Kernel\Core\DependencyInjector;
 
     public function execute(): void
     {
@@ -60,16 +61,11 @@ public function execute(): void
                     $methodAccessor = $reflectionClass->getMethod("{$prefix}{$methodName}");
 
                     if ($document = $methodAccessor->getDocComment()) {
-                        // parse PHPDoc
-                        $documentBlock = \phpDocumentor\Reflection\DocBlockFactory::createInstance()
-                            ->create($document);
-
-                        // Native annotation will dependency inject.
-                        if (!empty($documentBlock->getTagsByName('native'))) {
+                        $prependInjections = $this->getNativeAnnotateInjections($document);
+                        if (!empty($prependInjections)) {
                             array_unshift(
                                 $arguments,
-                                $this->getConstantPool(),
-                                $this->javaClass
+                                ...$prependInjections
                             );
                         }
                     }
diff --git a/src/Kernel/Mnemonics/_invokevirtual.php b/src/Kernel/Mnemonics/_invokevirtual.php
@@ -17,6 +17,7 @@ final class _invokevirtual implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
     use \PHPJava\Kernel\Core\ConstantPool;
+    use \PHPJava\Kernel\Core\DependencyInjector;
 
     public function execute(): void
     {
@@ -54,16 +55,11 @@ public function execute(): void
                 $methodAccessor = $reflectionClass->getMethod($methodName);
 
                 if ($document = $methodAccessor->getDocComment()) {
-                    // parse PHPDoc
-                    $documentBlock = \phpDocumentor\Reflection\DocBlockFactory::createInstance()
-                        ->create($document);
-
-                    // Native annotation will dependency inject.
-                    if (!empty($documentBlock->getTagsByName('native'))) {
+                    $prependInjections = $this->getNativeAnnotateInjections($document);
+                    if (!empty($prependInjections)) {
                         array_unshift(
                             $arguments,
-                            $this->getConstantPool(),
-                            $this->javaClass
+                            ...$prependInjections
                         );
                     }
                 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
 +namespace PHPJava\Exceptions;
++
 +class NotSupportedInjectionTypesException extends \Exception
 +{
 +}