ResultIterator: Optional namespace (defaults to Dao\..\ResultIterator)

homersimpsons · homersimpsons · commit f872a3ab6f39 · 2019-09-27T11:11:39.000+02:00
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -89,18 +89,24 @@ class Configuration implements ConfigurationInterface
     public function __construct(
         string $beanNamespace,
         string $daoNamespace,
-        string $resultIteratorNamespace,
         Connection $connection,
         NamingStrategyInterface $namingStrategy = null,
         Cache $cache = null,
         SchemaAnalyzer $schemaAnalyzer = null,
         LoggerInterface $logger = null,
         array $generatorListeners = [],
         AnnotationParser $annotationParser = null,
-        array $codeGeneratorListeners = []
+        array $codeGeneratorListeners = [],
+        string $resultIteratorNamespace = null
     ) {
         $this->beanNamespace = rtrim($beanNamespace, '\\');
         $this->daoNamespace = rtrim($daoNamespace, '\\');
+        if ($resultIteratorNamespace === null) {
+            $baseNamespace = explode('\\', $this->daoNamespace);
+            array_pop($baseNamespace);
+            $baseNamespace[] = 'ResultIterator';
+            $resultIteratorNamespace = implode('\\', $baseNamespace);
+        }
         $this->resultIteratorNamespace = rtrim($resultIteratorNamespace, '\\');
         $this->connection = $connection;
         if ($cache !== null) {
diff --git a/tests/Commands/AlteredConfigurationTest.php b/tests/Commands/AlteredConfigurationTest.php
@@ -22,7 +22,7 @@ public function testAlteredConfiguration(): void
         $logger = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();
         $schemaAnalyzer = $this->getMockBuilder(SchemaAnalyzer::class)->disableOriginalConstructor()->getMock();
 
-        $configuration = new Configuration('FooBean', 'FooDao', 'FooResultIterator', $connection, $namingStrategy, $cache, $schemaAnalyzer, $logger, []);
+        $configuration = new Configuration('FooBean', 'FooDao', $connection, $namingStrategy, $cache, $schemaAnalyzer, $logger, [], null, [], 'FooResultIterator');
 
         $alteredConfiguration = new AlteredConfiguration($configuration);
 
diff --git a/tests/Performance/ManyToOneBench.php b/tests/Performance/ManyToOneBench.php
@@ -149,7 +149,7 @@ protected static function getCache(): ArrayCache
 
     private static function createConfiguration(): ConfigurationInterface
     {
-        $configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), null, self::getCache(), null, null, []);
+        $configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), null, self::getCache(), null, null, []);
         $configuration->setPathFinder(new PathFinder(null, dirname(__DIR__, 5)));
         return $configuration;
     }
diff --git a/tests/TDBMAbstractServiceTest.php b/tests/TDBMAbstractServiceTest.php
@@ -142,7 +142,7 @@ protected function getCache(): ArrayCache
     protected function getConfiguration() : ConfigurationInterface
     {
         if ($this->configuration === null) {
-            $this->configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), $this->getCache(), null, null, [$this->getDummyGeneratorListener()]);
+            $this->configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), $this->getCache(), null, null, [$this->getDummyGeneratorListener()]);
             $this->configuration->setPathFinder(new PathFinder(null, dirname(__DIR__, 4)));
         }
         return $this->configuration;
diff --git a/tests/TDBMDaoGeneratorTest.php b/tests/TDBMDaoGeneratorTest.php
@@ -142,7 +142,7 @@ public function testDaoGeneration(): void
 
     public function testGenerationException(): void
     {
-        $configuration = new Configuration('UnknownVendor\\Dao', 'UnknownVendor\\Bean', 'UnknownVendor\\ResultIterator', self::getConnection(), $this->getNamingStrategy());
+        $configuration = new Configuration('UnknownVendor\\Dao', 'UnknownVendor\\Bean', self::getConnection(), $this->getNamingStrategy());
 
         $schemaManager = $this->tdbmService->getConnection()->getSchemaManager();
         $schemaAnalyzer = new SchemaAnalyzer($schemaManager);
@@ -184,7 +184,7 @@ public function testGetBeanClassName(): void
         $this->assertEquals(UserBean::class, $this->tdbmService->getBeanClassName('users'));
 
         // Let's create another TDBMService to test the cache.
-        $configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), $this->getCache(), null, null, [$this->getDummyGeneratorListener()]);
+        $configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), $this->getCache(), null, null, [$this->getDummyGeneratorListener()]);
         $configuration->setPathFinder(new PathFinder(null, dirname(__DIR__, 4)));
         $newTdbmService = new TDBMService($configuration);
         $this->assertEquals(UserBean::class, $newTdbmService->getBeanClassName('users'));
diff --git a/tests/TDBMServiceTest.php b/tests/TDBMServiceTest.php
@@ -783,7 +783,7 @@ public function testFindObjectsFromSqlHierarchyUp(): void
     public function testLogger(): void
     {
         $arrayLogger = new ArrayLogger();
-        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, $arrayLogger));
+        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, $arrayLogger));
 
         $tdbmService->setLogLevel(LogLevel::DEBUG);
         $beans = $tdbmService->findObjects('contact', null, [], 'contact.id ASC', [], null, TDBMObject::class);
@@ -808,7 +808,7 @@ public function testFindObjectsFromSqlCountWithOneToManyLink(): void
 
     public function testBuildFilterFromFilterBagIterator(): void
     {
-        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
+        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         [$sql, $parameters, $counter] = $tdbmService->buildFilterFromFilterBag(new \ArrayIterator(['id' => 1]), self::getConnection()->getDatabasePlatform());
         $this->assertRegExp('/\(.id. = :tdbmparam1\)/', $sql);
@@ -819,7 +819,7 @@ public function testFindObjectsMethodWithoutResultIteratorClass(): void
     {
         $this->expectException(TDBMInvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
-        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
+        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         $tdbmService->findObjects('', null, [], null, [], null, null, self::class);
     }
@@ -828,7 +828,7 @@ public function testFindObjectsFromSqlMethodWithoutResultIteratorClass(): void
     {
         $this->expectException(TDBMInvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
-        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
+        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         $tdbmService->findObjectsFromSql('', '', null, [], null, null, null, self::class);
     }
@@ -837,7 +837,7 @@ public function testFindObjectsFromRawSqlMethodWithoutResultIteratorClass(): voi
     {
         $this->expectException(TDBMInvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
-        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
+        $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         $tdbmService->findObjectsFromRawSql('', '', [], null, null, null, self::class);
     }

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ protected static function getCache(): ArrayCache`
`149`	`149`
`150`	`150`	`private static function createConfiguration(): ConfigurationInterface`
`151`	`151`	`{`
`152`		`- $configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), null, self::getCache(), null, null, []);`
	`152`	`+ $configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), null, self::getCache(), null, null, []);`
`153`	`153`	`$configuration->setPathFinder(new PathFinder(null, dirname(__DIR__, 5)));`
`154`	`154`	`return $configuration;`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ protected function getCache(): ArrayCache`
`142`	`142`	`protected function getConfiguration() : ConfigurationInterface`
`143`	`143`	`{`
`144`	`144`	`if ($this->configuration === null) {`
`145`		`- $this->configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), $this->getCache(), null, null, [$this->getDummyGeneratorListener()]);`
	`145`	`+ $this->configuration = new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), $this->getCache(), null, null, [$this->getDummyGeneratorListener()]);`
`146`	`146`	`$this->configuration->setPathFinder(new PathFinder(null, dirname(__DIR__, 4)));`
`147`	`147`	`}`
`148`	`148`	`return $this->configuration;`
Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ public function testFindObjectsFromSqlHierarchyUp(): void`
`783`	`783`	`public function testLogger(): void`
`784`	`784`	`{`
`785`	`785`	`$arrayLogger = new ArrayLogger();`
`786`		`- $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, $arrayLogger));`
	`786`	`+ $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, $arrayLogger));`
`787`	`787`
`788`	`788`	`$tdbmService->setLogLevel(LogLevel::DEBUG);`
`789`	`789`	`$beans = $tdbmService->findObjects('contact', null, [], 'contact.id ASC', [], null, TDBMObject::class);`
`@@ -808,7 +808,7 @@ public function testFindObjectsFromSqlCountWithOneToManyLink(): void`
`808`	`808`
`809`	`809`	`public function testBuildFilterFromFilterBagIterator(): void`
`810`	`810`	`{`
`811`		`- $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
	`811`	`+ $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
`812`	`812`
`813`	`813`	`[$sql, $parameters, $counter] = $tdbmService->buildFilterFromFilterBag(new \ArrayIterator(['id' => 1]), self::getConnection()->getDatabasePlatform());`
`814`	`814`	`$this->assertRegExp('/\(.id. = :tdbmparam1\)/', $sql);`
`@@ -819,7 +819,7 @@ public function testFindObjectsMethodWithoutResultIteratorClass(): void`
`819`	`819`	`{`
`820`	`820`	`$this->expectException(TDBMInvalidArgumentException::class);`
`821`	`821`	$this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
`822`		`- $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
	`822`	`+ $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
`823`	`823`
`824`	`824`	`$tdbmService->findObjects('', null, [], null, [], null, null, self::class);`
`825`	`825`	`}`
`@@ -828,7 +828,7 @@ public function testFindObjectsFromSqlMethodWithoutResultIteratorClass(): void`
`828`	`828`	`{`
`829`	`829`	`$this->expectException(TDBMInvalidArgumentException::class);`
`830`	`830`	$this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
`831`		`- $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
	`831`	`+ $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
`832`	`832`
`833`	`833`	`$tdbmService->findObjectsFromSql('', '', null, [], null, null, null, self::class);`
`834`	`834`	`}`
`@@ -837,7 +837,7 @@ public function testFindObjectsFromRawSqlMethodWithoutResultIteratorClass(): voi`
`837`	`837`	`{`
`838`	`838`	`$this->expectException(TDBMInvalidArgumentException::class);`
`839`	`839`	$this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
`840`		`- $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', 'TheCodingMachine\\TDBM\\Test\\ResultIterator', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
	`840`	`+ $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
`841`	`841`
`842`	`842`	`$tdbmService->findObjectsFromRawSql('', '', [], null, null, null, self::class);`
`843`	`843`	`}`