thecodingmachine / database.tdbm

src/views/installStep2.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 <input type="hidden" id="selfedit" name="selfedit" value="<?php echo plainstring_to_htmlprotected($this->selfedit) ?>" />
 
 <?php if (!$this->autoloadDetected) {
-    ?>
+	?>
 <div class="alert">Warning! TDBM could not detect the autoload section of your composer.json file.
 Unless you are developing your own autoload system, you should configure <strong>composer.json</strong> to <a href="http://getcomposer.org/doc/01-basic-usage.md#autoloading" target="_blank">define a source directory and a root namespace using PSR-0</a>.</div>
 <?php

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

Indentation +44 added lines, -44 removed lines

@@ -11,58 +11,58 @@
 class MoufDiListener implements GeneratorListenerInterface
 {
 
-    /**
-     * @param ConfigurationInterface $configuration
-     * @param BeanDescriptorInterface[] $beanDescriptors
-     */
-    public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
-    {
-        // Let's generate the needed instance in Mouf.
-        $moufManager = MoufManager::getMoufManager();
+	/**
+	 * @param ConfigurationInterface $configuration
+	 * @param BeanDescriptorInterface[] $beanDescriptors
+	 */
+	public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
+	{
+		// Let's generate the needed instance in Mouf.
+		$moufManager = MoufManager::getMoufManager();
 
-        $daoFactoryInstanceName = null;
-        if ($configuration instanceof MoufConfiguration) {
-            $daoFactoryInstanceName = $configuration->getDaoFactoryInstanceName();
-            $daoFactoryClassName = $configuration->getDaoNamespace().'\\Generated\\'.$configuration->getNamingStrategy()->getDaoFactoryClassName();
-            $moufManager->declareComponent($daoFactoryInstanceName, $daoFactoryClassName, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
-        }
+		$daoFactoryInstanceName = null;
+		if ($configuration instanceof MoufConfiguration) {
+			$daoFactoryInstanceName = $configuration->getDaoFactoryInstanceName();
+			$daoFactoryClassName = $configuration->getDaoNamespace().'\\Generated\\'.$configuration->getNamingStrategy()->getDaoFactoryClassName();
+			$moufManager->declareComponent($daoFactoryInstanceName, $daoFactoryClassName, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
+		}
 
-        $tdbmServiceInstanceName = $this->getTdbmInstanceName($configuration);
+		$tdbmServiceInstanceName = $this->getTdbmInstanceName($configuration);
 
-        foreach ($beanDescriptors as $beanDescriptor) {
-            $daoName = $beanDescriptor->getDaoClassName();
+		foreach ($beanDescriptors as $beanDescriptor) {
+			$daoName = $beanDescriptor->getDaoClassName();
 
-            $instanceName = TDBMDaoGenerator::toVariableName($daoName);
-            if (!$moufManager->instanceExists($instanceName)) {
-                $moufManager->declareComponent($instanceName, $configuration->getDaoNamespace().'\\'.$daoName);
-            }
-            $moufManager->setParameterViaConstructor($instanceName, 0, $tdbmServiceInstanceName, 'object');
-            if ($daoFactoryInstanceName !== null) {
-                $moufManager->bindComponentViaSetter($daoFactoryInstanceName, 'set'.$daoName, $instanceName);
-            }
-        }
+			$instanceName = TDBMDaoGenerator::toVariableName($daoName);
+			if (!$moufManager->instanceExists($instanceName)) {
+				$moufManager->declareComponent($instanceName, $configuration->getDaoNamespace().'\\'.$daoName);
+			}
+			$moufManager->setParameterViaConstructor($instanceName, 0, $tdbmServiceInstanceName, 'object');
+			if ($daoFactoryInstanceName !== null) {
+				$moufManager->bindComponentViaSetter($daoFactoryInstanceName, 'set'.$daoName, $instanceName);
+			}
+		}
 
-        $moufManager->rewriteMouf();
-    }
+		$moufManager->rewriteMouf();
+	}
 
-    private function getTdbmInstanceName(ConfigurationInterface $configuration) : string
-    {
-        $moufManager = MoufManager::getMoufManager();
+	private function getTdbmInstanceName(ConfigurationInterface $configuration) : string
+	{
+		$moufManager = MoufManager::getMoufManager();
 
-        $configurationInstanceName = $moufManager->findInstanceName($configuration);
-        if (!$configurationInstanceName) {
-            throw new \TDBMException('Could not find TDBM instance for configuration object.');
-        }
+		$configurationInstanceName = $moufManager->findInstanceName($configuration);
+		if (!$configurationInstanceName) {
+			throw new \TDBMException('Could not find TDBM instance for configuration object.');
+		}
 
-        // Let's find the configuration
-        $tdbmServicesNames = $moufManager->findInstances(TDBMService::class);
+		// Let's find the configuration
+		$tdbmServicesNames = $moufManager->findInstances(TDBMService::class);
 
-        foreach ($tdbmServicesNames as $name) {
-            if ($moufManager->getInstanceDescriptor($name)->getConstructorArgumentProperty('configuration')->getValue()->getName() === $configurationInstanceName) {
-                return $name;
-            }
-        }
+		foreach ($tdbmServicesNames as $name) {
+			if ($moufManager->getInstanceDescriptor($name)->getConstructorArgumentProperty('configuration')->getValue()->getName() === $configurationInstanceName) {
+				return $name;
+			}
+		}
 
-        throw new \TDBMException('Could not find TDBMService instance.');
-    }
+		throw new \TDBMException('Could not find TDBMService instance.');
+	}
 }

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;
+	}
 }