Merge 2.x into master

sonata-project · Feb 6, 2018 · 4dec9e6 · 4dec9e6
2 parents a92ef90 + 9e27220
commit 4dec9e6
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 7 deletions.
diff --git a/src/DependencyInjection/Compiler/AddMapperInformationCompilerPass.php b/src/DependencyInjection/Compiler/AddMapperInformationCompilerPass.php
@@ -72,5 +72,7 @@ public function process(ContainerBuilder $container): void
                 $mapper->addMethodCall('addOverride', [$class, $type, $options]);
             }
         }
+
+        DoctrineCollector::getInstance()->clear();
     }
 }
diff --git a/src/Mapper/DoctrineCollector.php b/src/Mapper/DoctrineCollector.php
@@ -57,13 +57,7 @@ class DoctrineCollector
 
     public function __construct()
     {
-        $this->associations = [];
-        $this->indexes = [];
-        $this->uniques = [];
-        $this->discriminatorColumns = [];
-        $this->inheritanceTypes = [];
-        $this->discriminators = [];
-        $this->overrides = [];
+        $this->initialize();
     }
 
     /**
@@ -251,4 +245,20 @@ final public function getOverrides(): array
     {
         return $this->overrides;
     }
+
+    public function clear()
+    {
+        $this->initialize();
+    }
+
+    private function initialize()
+    {
+        $this->associations = [];
+        $this->indexes = [];
+        $this->uniques = [];
+        $this->discriminatorColumns = [];
+        $this->inheritanceTypes = [];
+        $this->discriminators = [];
+        $this->overrides = [];
+    }
 }
diff --git a/tests/Mapper/DoctrineCollectorTest.php b/tests/Mapper/DoctrineCollectorTest.php
@@ -37,4 +37,26 @@ public function testDefaultValues(): void
         $this->assertEquals([], $collector->getDiscriminators());
         $this->assertEquals([], $collector->getOverrides());
     }
+
+    public function testClear()
+    {
+        $collector = DoctrineCollector::getInstance();
+        $collector->addIndex(\stdClass::class, 'name', ['column']);
+        $collector->addUnique(\stdClass::class, 'name', ['column']);
+        $collector->addInheritanceType(\stdClass::class, 'type');
+        $collector->addDiscriminatorColumn(\stdClass::class, ['columnDef']);
+        $collector->addAssociation(\stdClass::class, 'type', ['options']);
+        $collector->addDiscriminator(\stdClass::class, 'key', 'discriminatorClass');
+        $collector->addOverride(\stdClass::class, 'type', ['options']);
+
+        $collector->clear();
+
+        $this->assertEquals([], $collector->getIndexes());
+        $this->assertEquals([], $collector->getUniques());
+        $this->assertEquals([], $collector->getInheritanceTypes());
+        $this->assertEquals([], $collector->getDiscriminatorColumns());
+        $this->assertEquals([], $collector->getAssociations());
+        $this->assertEquals([], $collector->getDiscriminators());
+        $this->assertEquals([], $collector->getOverrides());
+    }
 }