[DoctrineBridge] Move Doctrine extractor from PropertyInfo

dunglas · dunglas · commit 3fc5195da518 · 2015-09-21T21:54:58.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Extractors;
+namespace Symfony\Bridge\Doctrine\PropertyInfo;
 
 use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
 use Doctrine\Common\Persistence\Mapping\MappingException;
@@ -103,9 +103,10 @@ public function getTypes($class, $property, array $context = array())
                     return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTime'));
 
                 case 'array':
-                    // No break
+                    return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true));
+
                 case 'simple_array':
-                    return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT)));
+                    return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)));
 
                 case 'json_array':
                     return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true));
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -10,11 +10,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Tests\Extractors;
+namespace Symfony\Bridge\Doctrine\PropertyInfo\Tests;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Setup;
-use Symfony\Component\PropertyInfo\Extractors\DoctrineExtractor;
+use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor;
 use Symfony\Component\PropertyInfo\Type;
 
 /**
@@ -43,12 +43,13 @@ public function testGetProperties()
                 'guid',
                 'time',
                 'json',
+                'simpleArray',
                 'bool',
                 'binary',
                 'foo',
                 'bar',
             ),
-            $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\DoctrineDummy')
+            $this->extractor->getProperties('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy')
         );
     }
 
@@ -57,7 +58,7 @@ public function testGetProperties()
      */
     public function testExtract($property, array $type = null)
     {
-        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\DoctrineDummy', $property, array()));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy', $property, array()));
     }
 
     public function typesProvider()
@@ -68,15 +69,16 @@ public function typesProvider()
             array('bool', array(new Type(Type::BUILTIN_TYPE_BOOL))),
             array('binary', array(new Type(Type::BUILTIN_TYPE_RESOURCE))),
             array('json', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true))),
-            array('foo', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\DoctrineRelation'))),
+            array('foo', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation'))),
             array('bar', array(new Type(
                 Type::BUILTIN_TYPE_OBJECT,
                 false,
                 'Doctrine\Common\Collections\Collection',
                 true,
                 new Type(Type::BUILTIN_TYPE_INT),
-                new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\DoctrineRelation')
+                new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
             ))),
+            array('simpleArray', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)))),
             array('notMapped', null),
         );
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures;
 
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
@@ -50,6 +50,10 @@ class DoctrineDummy
      * @Column(type="json_array")
      */
     private $json;
+    /**
+     * @Column(type="simple_array")
+     */
+    private $simpleArray;
     /**
      * @Column(type="boolean")
      */
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures;
 
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Id;
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -26,6 +26,7 @@
         "symfony/form": "~2.8|~3.0.0",
         "symfony/http-kernel": "~2.2|~3.0.0",
         "symfony/property-access": "~2.3|~3.0.0",
+        "symfony/property-info": "~2.8|3.0",
         "symfony/security": "~2.2|~3.0.0",
         "symfony/expression-language": "~2.2|~3.0.0",
         "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
@@ -37,6 +38,7 @@
     "suggest": {
         "symfony/form": "",
         "symfony/validator": "",
+        "symfony/property-info": "",
         "doctrine/data-fixtures": "",
         "doctrine/dbal": "",
         "doctrine/orm": ""
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Extractors;
+namespace Symfony\Component\PropertyInfo\Extractor;
 
 use phpDocumentor\Reflection\ClassReflector;
 use phpDocumentor\Reflection\DocBlock;
@@ -33,11 +33,11 @@ class PhpDocExtractor implements PropertyDescriptionInfoInterface, PropertyTypeI
     /**
      * @var FileReflector[]
      */
-    private static $fileReflectors = array();
+    private $fileReflectors = array();
     /**
      * @var DocBlock[]
      */
-    private static $docBlocks = array();
+    private $docBlocks = array();
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Extractors;
+namespace Symfony\Component\PropertyInfo\Extractor;
 
 use Symfony\Component\PropertyInfo\PropertyAccessInfoInterface;
 use Symfony\Component\PropertyInfo\PropertyListRetrieverInterface;
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Extractors;
+namespace Symfony\Component\PropertyInfo\Extractor;
 
 use Symfony\Component\PropertyInfo\PropertyListRetrieverInterface;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
@@ -12,7 +12,7 @@
 
 namespace Symfony\Component\PropertyInfo\Tests\PhpDocExtractors;
 
-use Symfony\Component\PropertyInfo\Extractors\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Type;
 
 /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -10,9 +10,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Tests\Extractors;
+namespace Symfony\Component\PropertyInfo\Tests\Extractor;
 
-use Symfony\Component\PropertyInfo\Extractors\ReflectionExtractor;
+use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\Type;
 
 /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/SerializerExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/SerializerExtractorTest.php
@@ -13,7 +13,7 @@
 namespace Symfony\Component\PropertyInfo\PropertyInfo\Tests\Extractors;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Symfony\Component\PropertyInfo\Extractors\SerializerExtractor;
+use Symfony\Component\PropertyInfo\Extractor\SerializerExtractor;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -28,16 +28,16 @@
     "require-dev": {
         "symfony/phpunit-bridge": "~2.7",
         "symfony/serializer": "~2.7",
-        "doctrine/orm": "~2.3",
-        "phpdocumentor/reflection": "~1.0"
+        "phpdocumentor/reflection": "~1.0",
+        "doctrine/annotations": "~1.0"
     },
     "conflict": {
         "phpdocumentor/reflection": "<1.0.7"
     },
     "suggest": {
-        "symfony/serializer": "To use Serializer metadata",
-        "doctrine/orm": "To use Doctrine metadata",
-        "phpdocumentor/reflection": "To use the PHPDoc"
+        "symfony/doctrine-bridge": "To use Doctrine metadata",
+        "phpdocumentor/reflection": "To use the PHPDoc",
+        "symfony/serializer": "To use Serializer metadata"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\PropertyInfo\\": "" }
