|
26 | 26 | use PhpParser\Node; |
27 | 27 | use PhpParser\NodeTraverser; |
28 | 28 | use PhpParser\NodeVisitor; |
29 | | -use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface; |
30 | 29 | use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface; |
31 | | -use Symfony\Component\Validator\MetadataFactoryInterface as LegacyMetadataFactoryInterface; |
32 | 30 | use Twig\Node\Node as TwigNode; |
33 | 31 |
|
34 | 32 | /** |
|
38 | 36 | */ |
39 | 37 | class ValidationExtractor implements FileVisitorInterface, NodeVisitor |
40 | 38 | { |
41 | | - /** |
42 | | - * @var ClassMetadataFactoryInterface|MetadataFactoryInterface|LegacyMetadataFactoryInterface |
43 | | - */ |
44 | | - private $metadataFactory; |
| 39 | + private MetadataFactoryInterface $metadataFactory; |
45 | 40 |
|
46 | | - /** |
47 | | - * @var NodeTraverser |
48 | | - */ |
49 | | - private $traverser; |
| 41 | + private NodeTraverser $traverser; |
50 | 42 |
|
51 | 43 | /** |
52 | 44 | * @var MessageCatalogue |
53 | 45 | */ |
54 | 46 | private $catalogue; |
55 | 47 |
|
56 | | - /** |
57 | | - * @var string |
58 | | - */ |
59 | | - private $namespace = ''; |
| 48 | + private string $namespace = ''; |
60 | 49 |
|
61 | 50 | public function __construct($metadataFactory) |
62 | 51 | { |
63 | | - if ( |
64 | | - ! ( |
65 | | - $metadataFactory instanceof MetadataFactoryInterface |
66 | | - || $metadataFactory instanceof LegacyMetadataFactoryInterface |
67 | | - || $metadataFactory instanceof ClassMetadataFactoryInterface |
68 | | - ) |
69 | | - ) { |
| 52 | + if (!$metadataFactory instanceof MetadataFactoryInterface) { |
70 | 53 | throw new \InvalidArgumentException(sprintf('%s expects an instance of MetadataFactoryInterface or ClassMetadataFactoryInterface', static::class)); |
71 | 54 | } |
| 55 | + |
72 | 56 | $this->metadataFactory = $metadataFactory; |
73 | 57 |
|
74 | 58 | $this->traverser = new NodeTraverser(); |
@@ -100,8 +84,8 @@ public function enterNode(Node $node) |
100 | 84 | return; |
101 | 85 | } |
102 | 86 |
|
103 | | - $metadata = $this->metadataFactory instanceof ClassMetadataFactoryInterface ? $this->metadataFactory->getClassMetadata($name) : $this->metadataFactory->getMetadataFor($name); |
104 | | - if (!$metadata->hasConstraints() && !count($metadata->getConstrainedProperties())) { |
| 87 | + $metadata = $this->metadataFactory->getMetadataFor($name); |
| 88 | + if (!$metadata->getConstraints() && !$metadata->getConstrainedProperties()) { |
105 | 89 | return; |
106 | 90 | } |
107 | 91 |
|
|
0 commit comments