Merge branch 'master' into issue-51

Author: Nyholm

src/Visitor/Php/Symfony/ValidationAnnotation.php

@@ -14,18 +14,18 @@
 use Doctrine\Common\Annotations\AnnotationException;
 use PhpParser\Node;
 use PhpParser\NodeVisitor;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Translation\Extractor\Model\SourceLocation;
 use Translation\Extractor\Visitor\Php\BasePHPVisitor;
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
-use Symfony\Component\Validator\MetadataFactoryInterface as LegacyMetadataFactoryInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 final class ValidationAnnotation extends BasePHPVisitor implements NodeVisitor
 {
     /**
-     * @var MetadataFactoryInterface|LegacyMetadataFactoryInterface
+     * @var MetadataFactoryInterface
      */
     private $metadataFactory;
 
@@ -37,16 +37,10 @@ final class ValidationAnnotation extends BasePHPVisitor implements NodeVisitor
     /**
      * ValidationExtractor constructor.
      *
-     * @param MetadataFactoryInterface|LegacyMetadataFactoryInterface $metadataFactory
+     * @param MetadataFactoryInterface $metadataFactory
      */
-    public function __construct($metadataFactory)
+    public function __construct(MetadataFactoryInterface $metadataFactory)
     {
-        if (!(
-            $metadataFactory instanceof MetadataFactoryInterface
-            || $metadataFactory instanceof LegacyMetadataFactoryInterface
-        )) {
-            throw new \InvalidArgumentException(sprintf('%s expects an instance of MetadataFactoryInterface', get_class($this)));
-        }
         $this->metadataFactory = $metadataFactory;
     }
 
@@ -77,6 +71,7 @@ public function enterNode(Node $node)
         }
 
         try {
+            /** @var ClassMetadata $metadata */
             $metadata = $this->metadataFactory->getMetadataFor($name);
         } catch (AnnotationException $e) {
             $this->addError($node, 'Could not parse class "%s" for annotations. %s', $this->namespace, $e->getMessage());

tests/Functional/Visitor/Php/Symfony/ValidationAnnotationTest.php

@@ -25,14 +25,7 @@ final class ValidationAnnotationTest extends BasePHPVisitorTest
 {
     public function testExtractAnnotation()
     {
-        //use correct factory class depending on whether using Symfony 2 or 3
-        if (class_exists('Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory')) {
-            $metadataFactoryClass = 'Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory';
-        } else {
-            $metadataFactoryClass = 'Symfony\Component\Validator\Mapping\ClassMetadataFactory';
-        }
-
-        $factory = new $metadataFactoryClass(new AnnotationLoader(new AnnotationReader()));
+        $factory = new LazyLoadingMetadataFactory(new AnnotationLoader(new AnnotationReader()));
         $extractor = new ValidationAnnotation($factory);
         $collection = $this->getSourceLocations($extractor, Resources\Php\Symfony\ValidatorAnnotation::class);