Fix #2

vincentchalamon · Jul 13, 2018 · e14aa17 · e14aa17
1 parent a10bb34
commit e14aa17
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 28 deletions.
diff --git a/src/SchemaGenerator/ObjectSchemaGenerator.php b/src/SchemaGenerator/ObjectSchemaGenerator.php
@@ -139,9 +139,9 @@ public function generate(\ReflectionClass $reflectionClass, array $context = [])
             }
             if (($mapping['targetEntity'] ?? null) === $reflectionClass->name) {
                 // todo Is there a better way to handle this case?
-                $schema['properties'][$property] = $this->typeGenerator->generate($property, $mapping, ['serializer_groups' => []] + $context);
+                $schema['properties'][$property] = $this->typeGenerator->generate($mapping, ['serializer_groups' => []] + $context);
             } else {
-                $schema['properties'][$property] = $this->typeGenerator->generate($property, $mapping, $context);
+                $schema['properties'][$property] = $this->typeGenerator->generate($mapping, $context);
             }
             unset($this->path[$context['depth']]);
             if (false === ($mapping['nullable'] ?? true)) {

diff --git a/src/SchemaGenerator/TypeGenerator/ArrayTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/ArrayTypeGenerator.php
@@ -20,12 +20,12 @@
  */
 final class ArrayTypeGenerator implements TypeGeneratorInterface
 {
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return in_array($mapping['type'], [Type::TARRAY, Type::SIMPLE_ARRAY, Type::JSON_ARRAY], true);
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         $type = ['type' => ['array', 'object']];
         if ($mapping['nullable'] ?? false) {

diff --git a/src/SchemaGenerator/TypeGenerator/CollectionTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/CollectionTypeGenerator.php
@@ -31,12 +31,12 @@ public function __construct(ContainerInterface $container = null)
         $this->container = $container;
     }
 
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return null !== $mapping['targetEntity'] && in_array($mapping['type'], [ClassMetadataInfo::ONE_TO_MANY, ClassMetadataInfo::MANY_TO_MANY], true);
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         return [
             'type' => 'array',

diff --git a/src/SchemaGenerator/TypeGenerator/DateTimeTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/DateTimeTypeGenerator.php
@@ -18,12 +18,12 @@
  */
 final class DateTimeTypeGenerator implements TypeGeneratorInterface
 {
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return in_array($mapping['type'], ['datetime', 'date', 'time'], true);
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         $type = [
             'type' => ['string'],

diff --git a/src/SchemaGenerator/TypeGenerator/DefaultTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/DefaultTypeGenerator.php
@@ -18,12 +18,12 @@
  */
 final class DefaultTypeGenerator implements TypeGeneratorInterface
 {
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return true;
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         if (!in_array($mapping['type'], ['integer', 'number', 'boolean', 'object', 'array', 'string', 'null', 'any'], true)) {
             $mapping['type'] = 'any';

diff --git a/src/SchemaGenerator/TypeGenerator/EmailTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/EmailTypeGenerator.php
@@ -20,13 +20,15 @@ final class EmailTypeGenerator implements TypeGeneratorInterface, TypeGeneratorA
 {
     use TypeGeneratorAwareTrait;
 
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
-        return 'email' === $property;
+        return 'email' === $mapping['fieldName'];
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
-        return ['pattern' => '^[\\w\\.-]+@[\\w\\.-]+\\.[A-z]+$'] + $this->typeGenerator->generate('', $mapping, $context);
+        unset($mapping['fieldName']);
+
+        return ['pattern' => '^[\\w\\.-]+@[\\w\\.-]+\\.[A-z]+$'] + $this->typeGenerator->generate($mapping, $context);
     }
 }
diff --git a/src/SchemaGenerator/TypeGenerator/EntityTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/EntityTypeGenerator.php
@@ -54,12 +54,12 @@ public function setAnnotationReader(Reader $reader)
         $this->reader = $reader;
     }
 
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return null !== $mapping['targetEntity'] && in_array($mapping['type'], [ClassMetadataInfo::ONE_TO_ONE, ClassMetadataInfo::MANY_TO_ONE], true);
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         $reflectionClass = new \ReflectionClass($mapping['targetEntity']);
         if (0 < count($this->propertyInfo->getProperties($mapping['targetEntity'], $context))) {

diff --git a/src/SchemaGenerator/TypeGenerator/IntegerTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/IntegerTypeGenerator.php
@@ -18,12 +18,12 @@
  */
 final class IntegerTypeGenerator implements TypeGeneratorInterface
 {
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return in_array($mapping['type'], ['integer', 'smallint', 'bigint'], true);
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         $type = ['type' => ['integer']];
         if ($mapping['nullable'] ?? false) {

diff --git a/src/SchemaGenerator/TypeGenerator/NumberTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/NumberTypeGenerator.php
@@ -18,12 +18,12 @@
  */
 final class NumberTypeGenerator implements TypeGeneratorInterface
 {
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return in_array($mapping['type'], ['int', 'float', 'decimal'], true);
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         $type = ['type' => ['number']];
         if ($mapping['nullable'] ?? false) {

diff --git a/src/SchemaGenerator/TypeGenerator/StringTypeGenerator.php b/src/SchemaGenerator/TypeGenerator/StringTypeGenerator.php
@@ -18,12 +18,12 @@
  */
 final class StringTypeGenerator implements TypeGeneratorInterface
 {
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return in_array($mapping['type'], ['string', 'text'], true);
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         $type = ['type' => ['string']];
         if ($mapping['nullable'] ?? false) {

diff --git a/src/SchemaGenerator/TypeGenerator/TypeGeneratorChain.php b/src/SchemaGenerator/TypeGenerator/TypeGeneratorChain.php
@@ -35,16 +35,16 @@ public function __construct(array $generators)
         $this->generators = $generators;
     }
 
-    public function supports(string $property, array $mapping, array $context = []): bool
+    public function supports(array $mapping, array $context = []): bool
     {
         return true;
     }
 
-    public function generate(string $property, array $mapping, array $context = []): array
+    public function generate(array $mapping, array $context = []): array
     {
         foreach ($this->generators as $generator) {
-            if ($generator->supports($property, $mapping, $context)) {
-                return $generator->generate($property, $mapping, $context);
+            if ($generator->supports($mapping, $context)) {
+                return $generator->generate($mapping, $context);
             }
         }
 

diff --git a/src/SchemaGenerator/TypeGenerator/TypeGeneratorInterface.php b/src/SchemaGenerator/TypeGenerator/TypeGeneratorInterface.php
@@ -18,7 +18,7 @@
  */
 interface TypeGeneratorInterface
 {
-    public function supports(string $property, array $mapping, array $context = []): bool;
+    public function supports(array $mapping, array $context = []): bool;
 
-    public function generate(string $property, array $mapping, array $context = []): array;
+    public function generate(array $mapping, array $context = []): array;
 }