Merge pull request #22 from moufmouf/support_autowiring_annotation

Changing code to adopt new @autowire syntax.

Author: moufmouf

DependencyInjection/GraphqliteCompilerPass.php

@@ -248,37 +248,33 @@ private function getListOfInjectedServices(ReflectionMethod $method, ContainerBu
         $services = [];
 
         /**
-         * @var Parameter[] $parameterAnnotations
+         * @var Autowire[] $autowireAnnotations
          */
-        $parameterAnnotations = $this->getAnnotationReader()->getMethodAnnotations($method, Parameter::class);
+        $autowireAnnotations = $this->getAnnotationReader()->getMethodAnnotations($method, Autowire::class);
 
         $parametersByName = null;
 
-        foreach ($parameterAnnotations as $parameterAnnotation) {
-            /** @var Autowire|null $autowire */
-            $autowire = $parameterAnnotation->getAnnotationByType(Autowire::class);
-            if ($autowire) {
-                $target = $parameterAnnotation->getFor();
+        foreach ($autowireAnnotations as $autowire) {
+            $target = $autowire->getTarget();
 
-                if ($parametersByName === null) {
-                    $parametersByName = self::getParametersByName($method);
-                }
+            if ($parametersByName === null) {
+                $parametersByName = self::getParametersByName($method);
+            }
 
-                if (!isset($parametersByName[$target])) {
-                    throw new GraphQLException('In method '.$method->getDeclaringClass()->getName().'::'.$method->getName().', the @Autowire annotation refers to a non existing parameter named "'.$target.'"');
-                }
+            if (!isset($parametersByName[$target])) {
+                throw new GraphQLException('In method '.$method->getDeclaringClass()->getName().'::'.$method->getName().', the @Autowire annotation refers to a non existing parameter named "'.$target.'"');
+            }
 
-                $id = $autowire->getIdentifier();
-                if ($id !== null) {
-                    $services[$id] = $id;
-                } else {
-                    $parameter = $parametersByName[$target];
-                    $type = $parameter->getType();
-                    if ($type !== null) {
-                        $fqcn = $type->getName();
-                        if ($container->has($fqcn)) {
-                            $services[$fqcn] = $fqcn;
-                        }
+            $id = $autowire->getIdentifier();
+            if ($id !== null) {
+                $services[$id] = $id;
+            } else {
+                $parameter = $parametersByName[$target];
+                $type = $parameter->getType();
+                if ($type !== null) {
+                    $fqcn = $type->getName();
+                    if ($container->has($fqcn)) {
+                        $services[$fqcn] = $fqcn;
                     }
                 }
             }

Tests/Fixtures/Entities/Contact.php

@@ -4,11 +4,8 @@
 namespace TheCodingMachine\Graphqlite\Bundle\Tests\Fixtures\Entities;
 
 
-use DateTimeInterface;
-use Psr\Http\Message\UploadedFileInterface;
 use stdClass;
 use TheCodingMachine\GraphQLite\Annotations\Field;
-use TheCodingMachine\GraphQLite\Annotations\Parameter;
 use TheCodingMachine\GraphQLite\Annotations\Type;
 use TheCodingMachine\Graphqlite\Bundle\Tests\Fixtures\Controller\TestGraphqlController;
 use TheCodingMachine\GraphQLite\Annotations\Autowire;
@@ -38,8 +35,8 @@ public function getName(): string
 
     /**
      * @Field()
-     * @Parameter(for="$testService", annotations={@Autowire})
-     * @Parameter(for="$someService", annotations={@Autowire(identifier="someService")})
+     * @Autowire(for="$testService")
+     * @Autowire(for="$someService", identifier="someService")
      * @return string
      */
     public function injectService(TestGraphqlController $testService = null, stdClass $someService = null): string