thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/Commands/GenerateCommand.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $alteredConf = new AlteredConfiguration($this->configuration);
 
 
-        $loggers = [ new ConsoleLogger($output) ];
+        $loggers = [new ConsoleLogger($output)];
 
         $logger = $alteredConf->getLogger();
         if ($logger) {

Indentation +32 added lines, -32 removed lines

@@ -12,48 +12,48 @@
 class GenerateCommand extends Command
 {
 
-    /**
-     * @var ConfigurationInterface
-     */
-    private $configuration;
+	/**
+	 * @var ConfigurationInterface
+	 */
+	private $configuration;
 
-    public function __construct(ConfigurationInterface $configuration)
-    {
-        parent::__construct();
-        $this->configuration = $configuration;
-    }
+	public function __construct(ConfigurationInterface $configuration)
+	{
+		parent::__construct();
+		$this->configuration = $configuration;
+	}
 
-    protected function configure()
-    {
-        $this->setName('tdbm:generate')
-            ->setDescription('Generates DAOs and beans.')
-            ->setHelp('Use this command to generate or regenerate the DAOs and beans for your project.')
-        ;
-    }
+	protected function configure()
+	{
+		$this->setName('tdbm:generate')
+			->setDescription('Generates DAOs and beans.')
+			->setHelp('Use this command to generate or regenerate the DAOs and beans for your project.')
+		;
+	}
 
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        // TODO: externalize composer.json file for autoloading (no more parameters for generateAllDaosAndBeans)
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		// TODO: externalize composer.json file for autoloading (no more parameters for generateAllDaosAndBeans)
 
-        $alteredConf = new AlteredConfiguration($this->configuration);
+		$alteredConf = new AlteredConfiguration($this->configuration);
 
 
-        $loggers = [ new ConsoleLogger($output) ];
+		$loggers = [ new ConsoleLogger($output) ];
 
-        $logger = $alteredConf->getLogger();
-        if ($logger) {
-            $loggers[] = $logger;
-        }
+		$logger = $alteredConf->getLogger();
+		if ($logger) {
+			$loggers[] = $logger;
+		}
 
-        $multiLogger = new MultiLogger($loggers);
+		$multiLogger = new MultiLogger($loggers);
 
-        $alteredConf->setLogger($multiLogger);
+		$alteredConf->setLogger($multiLogger);
 
-        $multiLogger->notice('Starting regenerating DAOs and beans');
+		$multiLogger->notice('Starting regenerating DAOs and beans');
 
-        $tdbmService = new TDBMService($this->configuration);
-        $tdbmService->generateAllDaosAndBeans();
+		$tdbmService = new TDBMService($this->configuration);
+		$tdbmService->generateAllDaosAndBeans();
 
-        $multiLogger->notice('Finished regenerating DAOs and beans');
-    }
+		$multiLogger->notice('Finished regenerating DAOs and beans');
+	}
 }

src/Mouf/Database/TDBM/Configuration.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
     /**
      * @return LoggerInterface
      */
-    public function getLogger(): ?LoggerInterface
+    public function getLogger(): ? LoggerInterface
     {
         return $this->logger;
     }

Indentation +161 added lines, -161 removed lines

@@ -17,165 +17,165 @@
 class Configuration implements ConfigurationInterface
 {
 
-    /**
-     * @var string
-     */
-    private $beanNamespace;
-    /**
-     * @var string
-     */
-    private $daoNamespace;
-    /**
-     * @var Connection
-     */
-    private $connection;
-    /**
-     * @var Cache
-     */
-    private $cache;
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-    /**
-     * @var GeneratorListenerInterface
-     */
-    private $generatorEventDispatcher;
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-    /**
-     * @var PathFinderInterface
-     */
-    private $pathFinder;
-
-    /**
-     * @param string $beanNamespace The namespace hosting the beans
-     * @param string $daoNamespace The namespace hosting the DAOs
-     * @param Connection $connection The connection to the database
-     * @param Cache|null $cache The Doctrine cache to store database metadata
-     * @param SchemaAnalyzer|null $schemaAnalyzer The schema analyzer that will be used to find shortest paths... Will be automatically created if not passed
-     * @param LoggerInterface|null $logger The logger
-     * @param GeneratorListenerInterface[] $generatorListeners A list of listeners that will be triggered when beans/daos are generated
-     */
-    public function __construct(string $beanNamespace, string $daoNamespace, Connection $connection, NamingStrategyInterface $namingStrategy, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null, array $generatorListeners = [])
-    {
-        $this->beanNamespace = rtrim($beanNamespace, '\\');
-        $this->daoNamespace = rtrim($daoNamespace, '\\');
-        $this->connection = $connection;
-        $this->namingStrategy = $namingStrategy;
-        if ($cache !== null) {
-            $this->cache = $cache;
-        } else {
-            $this->cache = new VoidCache();
-        }
-        if ($schemaAnalyzer !== null) {
-            $this->schemaAnalyzer = $schemaAnalyzer;
-        } else {
-            $this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
-        }
-        $this->logger = $logger;
-        $this->generatorEventDispatcher = new GeneratorEventDispatcher($generatorListeners);
-        $this->pathFinder = new PathFinder();
-    }
-
-    /**
-     * @return string
-     */
-    public function getBeanNamespace(): string
-    {
-        return $this->beanNamespace;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDaoNamespace(): string
-    {
-        return $this->daoNamespace;
-    }
-
-    /**
-     * @return Connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
-
-    /**
-     * @return NamingStrategyInterface
-     */
-    public function getNamingStrategy(): NamingStrategyInterface
-    {
-        return $this->namingStrategy;
-    }
-
-    /**
-     * @return Cache
-     */
-    public function getCache(): Cache
-    {
-        return $this->cache;
-    }
-
-    /**
-     * @return SchemaAnalyzer
-     */
-    public function getSchemaAnalyzer(): SchemaAnalyzer
-    {
-        return $this->schemaAnalyzer;
-    }
-
-    /**
-     * @return LoggerInterface
-     */
-    public function getLogger(): ?LoggerInterface
-    {
-        return $this->logger;
-    }
-
-    /**
-     * @return GeneratorListenerInterface
-     */
-    public function getGeneratorEventDispatcher(): GeneratorListenerInterface
-    {
-        return $this->generatorEventDispatcher;
-    }
-
-
-
-    /**
-     * Creates a unique cache key for the current connection.
-     *
-     * @return string
-     */
-    private function getConnectionUniqueId(): string
-    {
-        return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
-    }
-
-    /**
-     * Returns a class able to find the place of a PHP file based on the class name.
-     * Useful to find the path where DAOs and beans should be written to.
-     *
-     * @return PathFinderInterface
-     */
-    public function getPathFinder(): PathFinderInterface
-    {
-        return $this->pathFinder;
-    }
-
-    /**
-     * @param PathFinderInterface $pathFinder
-     */
-    public function setPathFinder(PathFinderInterface $pathFinder)
-    {
-        $this->pathFinder = $pathFinder;
-    }
+	/**
+	 * @var string
+	 */
+	private $beanNamespace;
+	/**
+	 * @var string
+	 */
+	private $daoNamespace;
+	/**
+	 * @var Connection
+	 */
+	private $connection;
+	/**
+	 * @var Cache
+	 */
+	private $cache;
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
+	/**
+	 * @var GeneratorListenerInterface
+	 */
+	private $generatorEventDispatcher;
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+	/**
+	 * @var PathFinderInterface
+	 */
+	private $pathFinder;
+
+	/**
+	 * @param string $beanNamespace The namespace hosting the beans
+	 * @param string $daoNamespace The namespace hosting the DAOs
+	 * @param Connection $connection The connection to the database
+	 * @param Cache|null $cache The Doctrine cache to store database metadata
+	 * @param SchemaAnalyzer|null $schemaAnalyzer The schema analyzer that will be used to find shortest paths... Will be automatically created if not passed
+	 * @param LoggerInterface|null $logger The logger
+	 * @param GeneratorListenerInterface[] $generatorListeners A list of listeners that will be triggered when beans/daos are generated
+	 */
+	public function __construct(string $beanNamespace, string $daoNamespace, Connection $connection, NamingStrategyInterface $namingStrategy, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null, array $generatorListeners = [])
+	{
+		$this->beanNamespace = rtrim($beanNamespace, '\\');
+		$this->daoNamespace = rtrim($daoNamespace, '\\');
+		$this->connection = $connection;
+		$this->namingStrategy = $namingStrategy;
+		if ($cache !== null) {
+			$this->cache = $cache;
+		} else {
+			$this->cache = new VoidCache();
+		}
+		if ($schemaAnalyzer !== null) {
+			$this->schemaAnalyzer = $schemaAnalyzer;
+		} else {
+			$this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
+		}
+		$this->logger = $logger;
+		$this->generatorEventDispatcher = new GeneratorEventDispatcher($generatorListeners);
+		$this->pathFinder = new PathFinder();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getBeanNamespace(): string
+	{
+		return $this->beanNamespace;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDaoNamespace(): string
+	{
+		return $this->daoNamespace;
+	}
+
+	/**
+	 * @return Connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * @return NamingStrategyInterface
+	 */
+	public function getNamingStrategy(): NamingStrategyInterface
+	{
+		return $this->namingStrategy;
+	}
+
+	/**
+	 * @return Cache
+	 */
+	public function getCache(): Cache
+	{
+		return $this->cache;
+	}
+
+	/**
+	 * @return SchemaAnalyzer
+	 */
+	public function getSchemaAnalyzer(): SchemaAnalyzer
+	{
+		return $this->schemaAnalyzer;
+	}
+
+	/**
+	 * @return LoggerInterface
+	 */
+	public function getLogger(): ?LoggerInterface
+	{
+		return $this->logger;
+	}
+
+	/**
+	 * @return GeneratorListenerInterface
+	 */
+	public function getGeneratorEventDispatcher(): GeneratorListenerInterface
+	{
+		return $this->generatorEventDispatcher;
+	}
+
+
+
+	/**
+	 * Creates a unique cache key for the current connection.
+	 *
+	 * @return string
+	 */
+	private function getConnectionUniqueId(): string
+	{
+		return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
+	}
+
+	/**
+	 * Returns a class able to find the place of a PHP file based on the class name.
+	 * Useful to find the path where DAOs and beans should be written to.
+	 *
+	 * @return PathFinderInterface
+	 */
+	public function getPathFinder(): PathFinderInterface
+	{
+		return $this->pathFinder;
+	}
+
+	/**
+	 * @param PathFinderInterface $pathFinder
+	 */
+	public function setPathFinder(PathFinderInterface $pathFinder)
+	{
+		$this->pathFinder = $pathFinder;
+	}
 }

src/Mouf/Database/TDBM/Utils/PathFinder/PathFinderInterface.php

Indentation +8 added lines, -8 removed lines

@@ -5,12 +5,12 @@
 
 interface PathFinderInterface
 {
-    /**
-     * Returns the path of a class file given the fully qualified class name.
-     *
-     * @param string $className
-     * @return \SplFileInfo
-     * @throws NoPathFoundException
-     */
-    public function getPath(string $className) : \SplFileInfo;
+	/**
+	 * Returns the path of a class file given the fully qualified class name.
+	 *
+	 * @param string $className
+	 * @return \SplFileInfo
+	 * @throws NoPathFoundException
+	 */
+	public function getPath(string $className) : \SplFileInfo;
 }

src/Mouf/Database/TDBM/Utils/PathFinder/NoPathFoundException.php

Indentation +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@
  */
 class NoPathFoundException extends TDBMException
 {
-    public static function create(string $className)
-    {
-        return new self(sprintf('Could not find a path where class %s would be autoloadable. Maybe consider editing your composer.json autoload section accordingly.', $className));
-    }
+	public static function create(string $className)
+	{
+		return new self(sprintf('Could not find a path where class %s would be autoloadable. Maybe consider editing your composer.json autoload section accordingly.', $className));
+	}
 }

src/Mouf/Database/TDBM/Commands/AlteredConfiguration.php

Indentation +99 added lines, -99 removed lines

@@ -20,103 +20,103 @@
  */
 class AlteredConfiguration implements ConfigurationInterface
 {
-    /**
-     * @var ConfigurationInterface
-     */
-    private $configuration;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    public function __construct(ConfigurationInterface $configuration)
-    {
-        $this->configuration = $configuration;
-        $this->logger = $configuration->getLogger();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getBeanNamespace(): string
-    {
-        return $this->configuration->getBeanNamespace();
-    }
-
-    /**
-     * @return string
-     */
-    public function getDaoNamespace(): string
-    {
-        return $this->configuration->getDaoNamespace();
-    }
-
-    /**
-     * @return Connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->configuration->getConnection();
-    }
-
-    /**
-     * @return Cache
-     */
-    public function getCache(): Cache
-    {
-        return $this->configuration->getCache();
-    }
-
-    /**
-     * @return NamingStrategyInterface
-     */
-    public function getNamingStrategy(): NamingStrategyInterface
-    {
-        return $this->configuration->getNamingStrategy();
-    }
-
-    /**
-     * @return SchemaAnalyzer
-     */
-    public function getSchemaAnalyzer(): SchemaAnalyzer
-    {
-        return $this->configuration->getSchemaAnalyzer();
-    }
-
-    /**
-     * @return LoggerInterface
-     */
-    public function getLogger(): ?LoggerInterface
-    {
-        return $this->logger;
-    }
-
-    /**
-     * @return GeneratorListenerInterface
-     */
-    public function getGeneratorEventDispatcher(): GeneratorListenerInterface
-    {
-        return $this->configuration->getGeneratorEventDispatcher();
-    }
-
-    /**
-     * @param LoggerInterface $logger
-     */
-    public function setLogger(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * Returns a class able to find the place of a PHP file based on the class name.
-     * Useful to find the path where DAOs and beans should be written to.
-     *
-     * @return PathFinderInterface
-     */
-    public function getPathFinder(): PathFinderInterface
-    {
-        return $this->configuration->getPathFinder();
-    }
+	/**
+	 * @var ConfigurationInterface
+	 */
+	private $configuration;
+
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
+
+	public function __construct(ConfigurationInterface $configuration)
+	{
+		$this->configuration = $configuration;
+		$this->logger = $configuration->getLogger();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getBeanNamespace(): string
+	{
+		return $this->configuration->getBeanNamespace();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDaoNamespace(): string
+	{
+		return $this->configuration->getDaoNamespace();
+	}
+
+	/**
+	 * @return Connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->configuration->getConnection();
+	}
+
+	/**
+	 * @return Cache
+	 */
+	public function getCache(): Cache
+	{
+		return $this->configuration->getCache();
+	}
+
+	/**
+	 * @return NamingStrategyInterface
+	 */
+	public function getNamingStrategy(): NamingStrategyInterface
+	{
+		return $this->configuration->getNamingStrategy();
+	}
+
+	/**
+	 * @return SchemaAnalyzer
+	 */
+	public function getSchemaAnalyzer(): SchemaAnalyzer
+	{
+		return $this->configuration->getSchemaAnalyzer();
+	}
+
+	/**
+	 * @return LoggerInterface
+	 */
+	public function getLogger(): ?LoggerInterface
+	{
+		return $this->logger;
+	}
+
+	/**
+	 * @return GeneratorListenerInterface
+	 */
+	public function getGeneratorEventDispatcher(): GeneratorListenerInterface
+	{
+		return $this->configuration->getGeneratorEventDispatcher();
+	}
+
+	/**
+	 * @param LoggerInterface $logger
+	 */
+	public function setLogger(LoggerInterface $logger)
+	{
+		$this->logger = $logger;
+	}
+
+	/**
+	 * Returns a class able to find the place of a PHP file based on the class name.
+	 * Useful to find the path where DAOs and beans should be written to.
+	 *
+	 * @return PathFinderInterface
+	 */
+	public function getPathFinder(): PathFinderInterface
+	{
+		return $this->configuration->getPathFinder();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
     /**
      * @return LoggerInterface
      */
-    public function getLogger(): ?LoggerInterface
+    public function getLogger(): ? LoggerInterface
     {
         return $this->logger;
     }

src/Mouf/Database/TDBM/Utils/PathFinder/PathFinder.php

Indentation +54 added lines, -54 removed lines

@@ -5,58 +5,58 @@
 
 class PathFinder implements PathFinderInterface
 {
-    /**
-     * @var string
-     */
-    private $composerFile;
-
-    /**
-     * @var string
-     */
-    private $rootPath;
-
-    /**
-     * @var bool
-     */
-    private $useAutoloadDev;
-
-    /**
-     * @var ClassNameMapper
-     */
-    private $classNameMapper;
-
-    public function __construct(string $composerFile = null, string $rootPath = null, bool $useAutoloadDev = false)
-    {
-        $this->composerFile = $composerFile;
-        $this->useAutoloadDev = $useAutoloadDev;
-        if ($rootPath === null) {
-            $this->rootPath = dirname(__DIR__, 9);
-        } else {
-            $this->rootPath = $rootPath;
-        }
-    }
-
-    private function getClassNameMapper() : ClassNameMapper
-    {
-        if ($this->classNameMapper === null) {
-            $this->classNameMapper = ClassNameMapper::createFromComposerFile($this->composerFile, $this->rootPath, $this->useAutoloadDev);
-        }
-        return $this->classNameMapper;
-    }
-
-    /**
-     * Returns the path of a class file given the fully qualified class name.
-     *
-     * @param string $className
-     * @return \SplFileInfo
-     * @throws NoPathFoundException
-     */
-    public function getPath(string $className): \SplFileInfo
-    {
-        $paths = $this->getClassNameMapper()->getPossibleFileNames($className);
-        if (empty($paths)) {
-            throw NoPathFoundException::create($className);
-        }
-        return new \SplFileInfo($this->rootPath.'/'.$paths[0]);
-    }
+	/**
+	 * @var string
+	 */
+	private $composerFile;
+
+	/**
+	 * @var string
+	 */
+	private $rootPath;
+
+	/**
+	 * @var bool
+	 */
+	private $useAutoloadDev;
+
+	/**
+	 * @var ClassNameMapper
+	 */
+	private $classNameMapper;
+
+	public function __construct(string $composerFile = null, string $rootPath = null, bool $useAutoloadDev = false)
+	{
+		$this->composerFile = $composerFile;
+		$this->useAutoloadDev = $useAutoloadDev;
+		if ($rootPath === null) {
+			$this->rootPath = dirname(__DIR__, 9);
+		} else {
+			$this->rootPath = $rootPath;
+		}
+	}
+
+	private function getClassNameMapper() : ClassNameMapper
+	{
+		if ($this->classNameMapper === null) {
+			$this->classNameMapper = ClassNameMapper::createFromComposerFile($this->composerFile, $this->rootPath, $this->useAutoloadDev);
+		}
+		return $this->classNameMapper;
+	}
+
+	/**
+	 * Returns the path of a class file given the fully qualified class name.
+	 *
+	 * @param string $className
+	 * @return \SplFileInfo
+	 * @throws NoPathFoundException
+	 */
+	public function getPath(string $className): \SplFileInfo
+	{
+		$paths = $this->getClassNameMapper()->getPossibleFileNames($className);
+		if (empty($paths)) {
+			throw NoPathFoundException::create($className);
+		}
+		return new \SplFileInfo($this->rootPath.'/'.$paths[0]);
+	}
 }

src/Mouf/Database/TDBM/Utils/DefaultNamingStrategy.php

Indentation +189 added lines, -189 removed lines

@@ -7,193 +7,193 @@
 
 class DefaultNamingStrategy implements NamingStrategyInterface
 {
-    private $beanPrefix = '';
-    private $beanSuffix = '';
-    private $baseBeanPrefix = 'Abstract';
-    private $baseBeanSuffix = '';
-    private $daoPrefix = '';
-    private $daoSuffix = 'Dao';
-    private $baseDaoPrefix = 'Abstract';
-    private $baseDaoSuffix = 'Dao';
-    private $exceptions = [];
-
-    /**
-     * Sets the string prefix to any bean class name.
-     *
-     * @param string $beanPrefix
-     */
-    public function setBeanPrefix(string $beanPrefix)
-    {
-        $this->beanPrefix = $beanPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any bean class name.
-     *
-     * @param string $beanSuffix
-     */
-    public function setBeanSuffix(string $beanSuffix)
-    {
-        $this->beanSuffix = $beanSuffix;
-    }
-
-    /**
-     * Sets the string prefix to any base bean class name.
-     *
-     * @param string $baseBeanPrefix
-     */
-    public function setBaseBeanPrefix(string $baseBeanPrefix)
-    {
-        $this->baseBeanPrefix = $baseBeanPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any base bean class name.
-     *
-     * @param string $baseBeanSuffix
-     */
-    public function setBaseBeanSuffix(string $baseBeanSuffix)
-    {
-        $this->baseBeanSuffix = $baseBeanSuffix;
-    }
-
-    /**
-     * Sets the string prefix to any DAO class name.
-     *
-     * @param string $daoPrefix
-     */
-    public function setDaoPrefix(string $daoPrefix)
-    {
-        $this->daoPrefix = $daoPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any DAO class name.
-     *
-     * @param string $daoSuffix
-     */
-    public function setDaoSuffix(string $daoSuffix)
-    {
-        $this->daoSuffix = $daoSuffix;
-    }
-
-    /**
-     * Sets the string prefix to any base DAO class name.
-     *
-     * @param string $baseDaoPrefix
-     */
-    public function setBaseDaoPrefix(string $baseDaoPrefix)
-    {
-        $this->baseDaoPrefix = $baseDaoPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any base DAO class name.
-     *
-     * @param string $baseDaoSuffix
-     */
-    public function setBaseDaoSuffix(string $baseDaoSuffix)
-    {
-        $this->baseDaoSuffix = $baseDaoSuffix;
-    }
-
-
-    /**
-     * Returns the bean class name from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBeanClassName(string $tableName): string
-    {
-        return $this->beanPrefix.$this->toSingularCamelCase($tableName).$this->beanSuffix;
-    }
-
-    /**
-     * Returns the base bean class name from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBaseBeanClassName(string $tableName): string
-    {
-        return $this->baseBeanPrefix.$this->toSingularCamelCase($tableName).$this->baseBeanSuffix;
-    }
-
-    /**
-     * Returns the name of the DAO class from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getDaoClassName(string $tableName): string
-    {
-        return $this->daoPrefix.$this->toSingularCamelCase($tableName).$this->daoSuffix;
-    }
-
-    /**
-     * Returns the name of the base DAO class from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBaseDaoClassName(string $tableName): string
-    {
-        return $this->baseDaoPrefix.$this->toSingularCamelCase($tableName).$this->baseDaoSuffix;
-    }
-
-    /**
-     * Tries to put string to the singular form (if it is plural) and camel case form.
-     * We assume the table names are in english.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    private function toSingularCamelCase(string $str): string
-    {
-        // Let's first check if this is not in the exceptions directory.
-        if (isset($this->exceptions[$str])) {
-            return $this->exceptions[$str];
-        }
-
-        $tokens = preg_split("/[_ ]+/", $str);
-        $tokens = array_map([Inflector::class, 'singularize'], $tokens);
-
-        $str = '';
-        foreach ($tokens as $token) {
-            $str .= ucfirst(Inflector::singularize($token));
-        }
-
-        return $str;
-    }
-
-    /**
-     * Returns the class name for the DAO factory.
-     *
-     * @return string
-     */
-    public function getDaoFactoryClassName(): string
-    {
-        return 'DaoFactory';
-    }
-
-    /**
-     * Sets exceptions in the naming of classes.
-     * The key is the name of the table, the value the "base" name of beans and DAOs.
-     *
-     * This is very useful for dealing with plural to singular translations in non english table names.
-     *
-     * For instance if you are dealing with a table containing horses in French ("chevaux" that has a singular "cheval"):
-     *
-     * [
-     *     "chevaux" => "Cheval"
-     * ]
-     *
-     * @param array<string,string> $exceptions
-     */
-    public function setExceptions(array $exceptions)
-    {
-        $this->exceptions = $exceptions;
-    }
+	private $beanPrefix = '';
+	private $beanSuffix = '';
+	private $baseBeanPrefix = 'Abstract';
+	private $baseBeanSuffix = '';
+	private $daoPrefix = '';
+	private $daoSuffix = 'Dao';
+	private $baseDaoPrefix = 'Abstract';
+	private $baseDaoSuffix = 'Dao';
+	private $exceptions = [];
+
+	/**
+	 * Sets the string prefix to any bean class name.
+	 *
+	 * @param string $beanPrefix
+	 */
+	public function setBeanPrefix(string $beanPrefix)
+	{
+		$this->beanPrefix = $beanPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any bean class name.
+	 *
+	 * @param string $beanSuffix
+	 */
+	public function setBeanSuffix(string $beanSuffix)
+	{
+		$this->beanSuffix = $beanSuffix;
+	}
+
+	/**
+	 * Sets the string prefix to any base bean class name.
+	 *
+	 * @param string $baseBeanPrefix
+	 */
+	public function setBaseBeanPrefix(string $baseBeanPrefix)
+	{
+		$this->baseBeanPrefix = $baseBeanPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any base bean class name.
+	 *
+	 * @param string $baseBeanSuffix
+	 */
+	public function setBaseBeanSuffix(string $baseBeanSuffix)
+	{
+		$this->baseBeanSuffix = $baseBeanSuffix;
+	}
+
+	/**
+	 * Sets the string prefix to any DAO class name.
+	 *
+	 * @param string $daoPrefix
+	 */
+	public function setDaoPrefix(string $daoPrefix)
+	{
+		$this->daoPrefix = $daoPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any DAO class name.
+	 *
+	 * @param string $daoSuffix
+	 */
+	public function setDaoSuffix(string $daoSuffix)
+	{
+		$this->daoSuffix = $daoSuffix;
+	}
+
+	/**
+	 * Sets the string prefix to any base DAO class name.
+	 *
+	 * @param string $baseDaoPrefix
+	 */
+	public function setBaseDaoPrefix(string $baseDaoPrefix)
+	{
+		$this->baseDaoPrefix = $baseDaoPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any base DAO class name.
+	 *
+	 * @param string $baseDaoSuffix
+	 */
+	public function setBaseDaoSuffix(string $baseDaoSuffix)
+	{
+		$this->baseDaoSuffix = $baseDaoSuffix;
+	}
+
+
+	/**
+	 * Returns the bean class name from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBeanClassName(string $tableName): string
+	{
+		return $this->beanPrefix.$this->toSingularCamelCase($tableName).$this->beanSuffix;
+	}
+
+	/**
+	 * Returns the base bean class name from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBaseBeanClassName(string $tableName): string
+	{
+		return $this->baseBeanPrefix.$this->toSingularCamelCase($tableName).$this->baseBeanSuffix;
+	}
+
+	/**
+	 * Returns the name of the DAO class from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getDaoClassName(string $tableName): string
+	{
+		return $this->daoPrefix.$this->toSingularCamelCase($tableName).$this->daoSuffix;
+	}
+
+	/**
+	 * Returns the name of the base DAO class from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBaseDaoClassName(string $tableName): string
+	{
+		return $this->baseDaoPrefix.$this->toSingularCamelCase($tableName).$this->baseDaoSuffix;
+	}
+
+	/**
+	 * Tries to put string to the singular form (if it is plural) and camel case form.
+	 * We assume the table names are in english.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	private function toSingularCamelCase(string $str): string
+	{
+		// Let's first check if this is not in the exceptions directory.
+		if (isset($this->exceptions[$str])) {
+			return $this->exceptions[$str];
+		}
+
+		$tokens = preg_split("/[_ ]+/", $str);
+		$tokens = array_map([Inflector::class, 'singularize'], $tokens);
+
+		$str = '';
+		foreach ($tokens as $token) {
+			$str .= ucfirst(Inflector::singularize($token));
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Returns the class name for the DAO factory.
+	 *
+	 * @return string
+	 */
+	public function getDaoFactoryClassName(): string
+	{
+		return 'DaoFactory';
+	}
+
+	/**
+	 * Sets exceptions in the naming of classes.
+	 * The key is the name of the table, the value the "base" name of beans and DAOs.
+	 *
+	 * This is very useful for dealing with plural to singular translations in non english table names.
+	 *
+	 * For instance if you are dealing with a table containing horses in French ("chevaux" that has a singular "cheval"):
+	 *
+	 * [
+	 *     "chevaux" => "Cheval"
+	 * ]
+	 *
+	 * @param array<string,string> $exceptions
+	 */
+	public function setExceptions(array $exceptions)
+	{
+		$this->exceptions = $exceptions;
+	}
 }

src/Mouf/Database/TDBM/QueryFactory/FindObjectsFromSqlQueryFactory.php

Indentation +164 added lines, -164 removed lines

@@ -15,168 +15,168 @@
  */
 class FindObjectsFromSqlQueryFactory extends AbstractQueryFactory
 {
-    private $mainTable;
-    private $from;
-    private $filterString;
-    private $cache;
-    private $cachePrefix;
-
-    public function __construct(string $mainTable, string $from, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, SchemaAnalyzer $schemaAnalyzer, Cache $cache, string $cachePrefix)
-    {
-        parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
-        $this->mainTable = $mainTable;
-        $this->from = $from;
-        $this->filterString = $filterString;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->cache = $cache;
-        $this->cachePrefix = $cachePrefix;
-    }
-
-    protected function compute()
-    {
-        $connection = $this->tdbmService->getConnection();
-
-        $columnsList = null;
-
-        $allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($this->mainTable);
-
-        list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
-
-        $sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM '.$this->from;
-
-        // Let's compute the COUNT.
-        $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
-            return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
-        }, $pkColumnNames);
-
-        $countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM '.$this->from;
-
-        // Add joins on inherited tables if necessary
-        if (count($allFetchedTables) > 1) {
-            $joinSql = '';
-            $parentFks = $this->getParentRelationshipForeignKeys($this->mainTable);
-            foreach ($parentFks as $fk) {
-                $joinSql .= sprintf(' JOIN %s ON (%s.%s = %s.%s)',
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getLocalColumns()[0]),
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getForeignColumns()[0])
-                );
-            }
-
-            $childrenFks = $this->getChildrenRelationshipForeignKeys($this->mainTable);
-            foreach ($childrenFks as $fk) {
-                $joinSql .= sprintf(' LEFT JOIN %s ON (%s.%s = %s.%s)',
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getForeignColumns()[0]),
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getLocalColumns()[0])
-                );
-            }
-
-            $sql .= $joinSql;
-        }
-
-        if (!empty($this->filterString)) {
-            $sql .= ' WHERE '.$this->filterString;
-            $countSql .= ' WHERE '.$this->filterString;
-        }
-
-        if (!empty($orderString)) {
-            $sql .= ' ORDER BY '.$orderString;
-        }
-
-        if (stripos($countSql, 'GROUP BY') !== false) {
-            throw new TDBMException('Unsupported use of GROUP BY in SQL request.');
-        }
-
-        $this->magicSql = $sql;
-        $this->magicSqlCount = $countSql;
-        $this->columnDescList = $columnDescList;
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getParentRelationshipForeignKeys($tableName)
-    {
-        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
-            return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
-        });
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getParentRelationshipForeignKeysWithoutCache($tableName)
-    {
-        $parentFks = [];
-        $currentTable = $tableName;
-        while ($currentFk = $this->schemaAnalyzer->getParentRelationship($currentTable)) {
-            $currentTable = $currentFk->getForeignTableName();
-            $parentFks[] = $currentFk;
-        }
-
-        return $parentFks;
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getChildrenRelationshipForeignKeys(string $tableName) : array
-    {
-        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
-            return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
-        });
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getChildrenRelationshipForeignKeysWithoutCache(string $tableName) : array
-    {
-        $children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
-
-        if (!empty($children)) {
-            $fksTables = array_map(function (ForeignKeyConstraint $fk) {
-                return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
-            }, $children);
-
-            $fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
-
-            return $fks;
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * Returns an item from cache or computes it using $closure and puts it in cache.
-     *
-     * @param string   $key
-     * @param callable $closure
-     *
-     * @return mixed
-     */
-    protected function fromCache(string $key, callable $closure)
-    {
-        $item = $this->cache->fetch($key);
-        if ($item === false) {
-            $item = $closure();
-            $this->cache->save($key, $item);
-        }
-
-        return $item;
-    }
+	private $mainTable;
+	private $from;
+	private $filterString;
+	private $cache;
+	private $cachePrefix;
+
+	public function __construct(string $mainTable, string $from, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, SchemaAnalyzer $schemaAnalyzer, Cache $cache, string $cachePrefix)
+	{
+		parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
+		$this->mainTable = $mainTable;
+		$this->from = $from;
+		$this->filterString = $filterString;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->cache = $cache;
+		$this->cachePrefix = $cachePrefix;
+	}
+
+	protected function compute()
+	{
+		$connection = $this->tdbmService->getConnection();
+
+		$columnsList = null;
+
+		$allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($this->mainTable);
+
+		list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
+
+		$sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM '.$this->from;
+
+		// Let's compute the COUNT.
+		$pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
+		$pkColumnNames = array_map(function ($pkColumn) {
+			return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
+		}, $pkColumnNames);
+
+		$countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM '.$this->from;
+
+		// Add joins on inherited tables if necessary
+		if (count($allFetchedTables) > 1) {
+			$joinSql = '';
+			$parentFks = $this->getParentRelationshipForeignKeys($this->mainTable);
+			foreach ($parentFks as $fk) {
+				$joinSql .= sprintf(' JOIN %s ON (%s.%s = %s.%s)',
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getLocalColumns()[0]),
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getForeignColumns()[0])
+				);
+			}
+
+			$childrenFks = $this->getChildrenRelationshipForeignKeys($this->mainTable);
+			foreach ($childrenFks as $fk) {
+				$joinSql .= sprintf(' LEFT JOIN %s ON (%s.%s = %s.%s)',
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getForeignColumns()[0]),
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getLocalColumns()[0])
+				);
+			}
+
+			$sql .= $joinSql;
+		}
+
+		if (!empty($this->filterString)) {
+			$sql .= ' WHERE '.$this->filterString;
+			$countSql .= ' WHERE '.$this->filterString;
+		}
+
+		if (!empty($orderString)) {
+			$sql .= ' ORDER BY '.$orderString;
+		}
+
+		if (stripos($countSql, 'GROUP BY') !== false) {
+			throw new TDBMException('Unsupported use of GROUP BY in SQL request.');
+		}
+
+		$this->magicSql = $sql;
+		$this->magicSqlCount = $countSql;
+		$this->columnDescList = $columnDescList;
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getParentRelationshipForeignKeys($tableName)
+	{
+		return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
+			return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
+		});
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getParentRelationshipForeignKeysWithoutCache($tableName)
+	{
+		$parentFks = [];
+		$currentTable = $tableName;
+		while ($currentFk = $this->schemaAnalyzer->getParentRelationship($currentTable)) {
+			$currentTable = $currentFk->getForeignTableName();
+			$parentFks[] = $currentFk;
+		}
+
+		return $parentFks;
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getChildrenRelationshipForeignKeys(string $tableName) : array
+	{
+		return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
+			return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
+		});
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getChildrenRelationshipForeignKeysWithoutCache(string $tableName) : array
+	{
+		$children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
+
+		if (!empty($children)) {
+			$fksTables = array_map(function (ForeignKeyConstraint $fk) {
+				return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
+			}, $children);
+
+			$fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
+
+			return $fks;
+		} else {
+			return [];
+		}
+	}
+
+	/**
+	 * Returns an item from cache or computes it using $closure and puts it in cache.
+	 *
+	 * @param string   $key
+	 * @param callable $closure
+	 *
+	 * @return mixed
+	 */
+	protected function fromCache(string $key, callable $closure)
+	{
+		$item = $this->cache->fetch($key);
+		if ($item === false) {
+			$item = $closure();
+			$this->cache->save($key, $item);
+		}
+
+		return $item;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -46,14 +46,14 @@ 
 
         // Let's compute the COUNT.
         $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
+        $pkColumnNames = array_map(function($pkColumn) {
             return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
         }, $pkColumnNames);
 
         $countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM '.$this->from;
 
         // Add joins on inherited tables if necessary
-        if (count($allFetchedTables) > 1) {
+        if (count($allFetchedTables)>1) {
             $joinSql = '';
             $parentFks = $this->getParentRelationshipForeignKeys($this->mainTable);
             foreach ($parentFks as $fk) {
@@ -105,7 +105,7 @@ 
      */
     private function getParentRelationshipForeignKeys($tableName)
     {
-        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
+        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function() use ($tableName) {
             return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
         });
     }
@@ -134,7 +134,7 @@ 
      */
     private function getChildrenRelationshipForeignKeys(string $tableName) : array
     {
-        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
+        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function() use ($tableName) {
             return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
         });
     }
@@ -149,7 +149,7 @@ 
         $children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
 
         if (!empty($children)) {
-            $fksTables = array_map(function (ForeignKeyConstraint $fk) {
+            $fksTables = array_map(function(ForeignKeyConstraint $fk) {
                 return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
             }, $children);
 

src/Mouf/Database/TDBM/InnerResultIterator.php

Indentation +267 added lines, -267 removed lines

@@ -29,271 +29,271 @@
  */
 class InnerResultIterator implements \Iterator, \Countable, \ArrayAccess
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
-
-    protected $fetchStarted = false;
-    private $objectStorage;
-    private $className;
-
-    private $tdbmService;
-    private $magicSql;
-    private $parameters;
-    private $limit;
-    private $offset;
-    private $columnDescriptors;
-    private $magicQuery;
-
-    /**
-     * The key of the current retrieved object.
-     *
-     * @var int
-     */
-    protected $key = -1;
-
-    protected $current = null;
-
-    private $databasePlatform;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, LoggerInterface $logger)
-    {
-        $this->magicSql = $magicSql;
-        $this->objectStorage = $objectStorage;
-        $this->className = $className;
-        $this->tdbmService = $tdbmService;
-        $this->parameters = $parameters;
-        $this->limit = $limit;
-        $this->offset = $offset;
-        $this->columnDescriptors = $columnDescriptors;
-        $this->magicQuery = $magicQuery;
-        $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
-        $this->logger = $logger;
-    }
-
-    protected function executeQuery()
-    {
-        $sql = $this->magicQuery->build($this->magicSql, $this->parameters);
-        $sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
-
-        $this->logger->debug('Running SQL request: '.$sql);
-
-        $this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters);
-
-        $this->fetchStarted = true;
-    }
-
-    /**
-     * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
-     *
-     * @return int
-     */
-    public function count()
-    {
-        if (!$this->fetchStarted) {
-            $this->executeQuery();
-        }
-
-        return $this->statement->rowCount();
-    }
-
-    /**
-     * Fetches record at current cursor.
-     *
-     * @return AbstractTDBMObject|null
-     */
-    public function current()
-    {
-        return $this->current;
-    }
-
-    /**
-     * Returns the current result's key.
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Advances the cursor to the next result.
-     * Casts the database result into one (or several) beans.
-     */
-    public function next()
-    {
-        $row = $this->statement->fetch(\PDO::FETCH_LAZY);
-        if ($row) {
-
-            // array<tablegroup, array<table, array<column, value>>>
-            $beansData = [];
-            foreach ($row as $key => $value) {
-                if (!isset($this->columnDescriptors[$key])) {
-                    continue;
-                }
-
-                $columnDescriptor = $this->columnDescriptors[$key];
-
-                if ($columnDescriptor['tableGroup'] === null) {
-                    // A column can have no tableGroup (if it comes from an ORDER BY expression)
-                    continue;
-                }
-
-                // Let's cast the value according to its type
-                $value = $columnDescriptor['type']->convertToPHPValue($value, $this->databasePlatform);
-
-                $beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
-            }
-
-            $reflectionClassCache = [];
-            $firstBean = true;
-            foreach ($beansData as $beanData) {
-
-                // Let's find the bean class name associated to the bean.
-
-                list($actualClassName, $mainBeanTableName, $tablesUsed) = $this->tdbmService->_getClassNameFromBeanData($beanData);
-
-                if ($this->className !== null) {
-                    $actualClassName = $this->className;
-                }
-
-                // Let's filter out the beanData that is not used (because it belongs to a part of the hierarchy that is not fetched:
-                foreach ($beanData as $tableName => $descriptors) {
-                    if (!in_array($tableName, $tablesUsed)) {
-                        unset($beanData[$tableName]);
-                    }
-                }
-
-                // Must we create the bean? Let's see in the cache if we have a mapping DbRow?
-                // Let's get the first object mapping a row:
-                // We do this loop only for the first table
-
-                $primaryKeys = $this->tdbmService->_getPrimaryKeysFromObjectData($mainBeanTableName, $beanData[$mainBeanTableName]);
-                $hash = $this->tdbmService->getObjectHash($primaryKeys);
-
-                if ($this->objectStorage->has($mainBeanTableName, $hash)) {
-                    $dbRow = $this->objectStorage->get($mainBeanTableName, $hash);
-                    $bean = $dbRow->getTDBMObject();
-                } else {
-                    // Let's construct the bean
-                    if (!isset($reflectionClassCache[$actualClassName])) {
-                        $reflectionClassCache[$actualClassName] = new \ReflectionClass($actualClassName);
-                    }
-                    // Let's bypass the constructor when creating the bean!
-                    $bean = $reflectionClassCache[$actualClassName]->newInstanceWithoutConstructor();
-                    $bean->_constructFromData($beanData, $this->tdbmService);
-                }
-
-                // The first bean is the one containing the main table.
-                if ($firstBean) {
-                    $firstBean = false;
-                    $this->current = $bean;
-                }
-            }
-
-            ++$this->key;
-        } else {
-            $this->current = null;
-        }
-    }
-
-    /**
-     * Moves the cursor to the beginning of the result set.
-     */
-    public function rewind()
-    {
-        $this->executeQuery();
-        $this->key = -1;
-        $this->next();
-    }
-    /**
-     * Checks if the cursor is reading a valid result.
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return $this->current !== null;
-    }
-
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
-    }
-
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
-    }
-
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        throw new TDBMInvalidOperationException('You can set values in a TDBM result set.');
-    }
-
-    /**
-     * Offset to unset.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetUnset($offset)
-    {
-        throw new TDBMInvalidOperationException('You can unset values in a TDBM result set.');
-    }
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
+
+	protected $fetchStarted = false;
+	private $objectStorage;
+	private $className;
+
+	private $tdbmService;
+	private $magicSql;
+	private $parameters;
+	private $limit;
+	private $offset;
+	private $columnDescriptors;
+	private $magicQuery;
+
+	/**
+	 * The key of the current retrieved object.
+	 *
+	 * @var int
+	 */
+	protected $key = -1;
+
+	protected $current = null;
+
+	private $databasePlatform;
+
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
+
+	public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, LoggerInterface $logger)
+	{
+		$this->magicSql = $magicSql;
+		$this->objectStorage = $objectStorage;
+		$this->className = $className;
+		$this->tdbmService = $tdbmService;
+		$this->parameters = $parameters;
+		$this->limit = $limit;
+		$this->offset = $offset;
+		$this->columnDescriptors = $columnDescriptors;
+		$this->magicQuery = $magicQuery;
+		$this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
+		$this->logger = $logger;
+	}
+
+	protected function executeQuery()
+	{
+		$sql = $this->magicQuery->build($this->magicSql, $this->parameters);
+		$sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
+
+		$this->logger->debug('Running SQL request: '.$sql);
+
+		$this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters);
+
+		$this->fetchStarted = true;
+	}
+
+	/**
+	 * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		if (!$this->fetchStarted) {
+			$this->executeQuery();
+		}
+
+		return $this->statement->rowCount();
+	}
+
+	/**
+	 * Fetches record at current cursor.
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	public function current()
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Returns the current result's key.
+	 *
+	 * @return int
+	 */
+	public function key()
+	{
+		return $this->key;
+	}
+
+	/**
+	 * Advances the cursor to the next result.
+	 * Casts the database result into one (or several) beans.
+	 */
+	public function next()
+	{
+		$row = $this->statement->fetch(\PDO::FETCH_LAZY);
+		if ($row) {
+
+			// array<tablegroup, array<table, array<column, value>>>
+			$beansData = [];
+			foreach ($row as $key => $value) {
+				if (!isset($this->columnDescriptors[$key])) {
+					continue;
+				}
+
+				$columnDescriptor = $this->columnDescriptors[$key];
+
+				if ($columnDescriptor['tableGroup'] === null) {
+					// A column can have no tableGroup (if it comes from an ORDER BY expression)
+					continue;
+				}
+
+				// Let's cast the value according to its type
+				$value = $columnDescriptor['type']->convertToPHPValue($value, $this->databasePlatform);
+
+				$beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
+			}
+
+			$reflectionClassCache = [];
+			$firstBean = true;
+			foreach ($beansData as $beanData) {
+
+				// Let's find the bean class name associated to the bean.
+
+				list($actualClassName, $mainBeanTableName, $tablesUsed) = $this->tdbmService->_getClassNameFromBeanData($beanData);
+
+				if ($this->className !== null) {
+					$actualClassName = $this->className;
+				}
+
+				// Let's filter out the beanData that is not used (because it belongs to a part of the hierarchy that is not fetched:
+				foreach ($beanData as $tableName => $descriptors) {
+					if (!in_array($tableName, $tablesUsed)) {
+						unset($beanData[$tableName]);
+					}
+				}
+
+				// Must we create the bean? Let's see in the cache if we have a mapping DbRow?
+				// Let's get the first object mapping a row:
+				// We do this loop only for the first table
+
+				$primaryKeys = $this->tdbmService->_getPrimaryKeysFromObjectData($mainBeanTableName, $beanData[$mainBeanTableName]);
+				$hash = $this->tdbmService->getObjectHash($primaryKeys);
+
+				if ($this->objectStorage->has($mainBeanTableName, $hash)) {
+					$dbRow = $this->objectStorage->get($mainBeanTableName, $hash);
+					$bean = $dbRow->getTDBMObject();
+				} else {
+					// Let's construct the bean
+					if (!isset($reflectionClassCache[$actualClassName])) {
+						$reflectionClassCache[$actualClassName] = new \ReflectionClass($actualClassName);
+					}
+					// Let's bypass the constructor when creating the bean!
+					$bean = $reflectionClassCache[$actualClassName]->newInstanceWithoutConstructor();
+					$bean->_constructFromData($beanData, $this->tdbmService);
+				}
+
+				// The first bean is the one containing the main table.
+				if ($firstBean) {
+					$firstBean = false;
+					$this->current = $bean;
+				}
+			}
+
+			++$this->key;
+		} else {
+			$this->current = null;
+		}
+	}
+
+	/**
+	 * Moves the cursor to the beginning of the result set.
+	 */
+	public function rewind()
+	{
+		$this->executeQuery();
+		$this->key = -1;
+		$this->next();
+	}
+	/**
+	 * Checks if the cursor is reading a valid result.
+	 *
+	 * @return bool
+	 */
+	public function valid()
+	{
+		return $this->current !== null;
+	}
+
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
+	}
+
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
+	}
+
+	/**
+	 * Offset to set.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to assign the value to.
+	 *                      </p>
+	 * @param mixed $value  <p>
+	 *                      The value to set.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		throw new TDBMInvalidOperationException('You can set values in a TDBM result set.');
+	}
+
+	/**
+	 * Offset to unset.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to unset.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetUnset($offset)
+	{
+		throw new TDBMInvalidOperationException('You can unset values in a TDBM result set.');
+	}
 }