thecodingmachine / tdbm

src/QueryFactory/AbstractQueryFactory.php

Spacing +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
         if (strlen($alias) <= 30) { // Older oracle version had a limit of 30 characters for identifiers
             return $alias;
         }
-        return substr($columnName, 0, 20) . crc32($tableName.'____'.$columnName);
+        return substr($columnName, 0, 20).crc32($tableName.'____'.$columnName);
     }
 
     abstract protected function compute(): void;

src/ResultIterator.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
      */
     public static function createResultIterator(QueryFactory $queryFactory, array $parameters, ObjectStorageInterface $objectStorage, ?string $className, TDBMService $tdbmService, MagicQuery $magicQuery, int $mode, LoggerInterface $logger): self
     {
-        $iterator =  new static();
+        $iterator = new static();
         if ($mode !== TDBMService::MODE_CURSOR && $mode !== TDBMService::MODE_ARRAY) {
             throw new TDBMException("Unknown fetch mode: '".$mode."'");
         }
@@ -281,7 +281,7 @@ 
      */
     public function jsonSerialize($stopRecursion = false)
     {
-        return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
+        return array_map(function(AbstractTDBMObject $item) use ($stopRecursion) {
             return $item->jsonSerialize($stopRecursion);
         }, $this->toArray());
     }

src/TDBMSchemaAnalyzer.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
     public function getIncomingForeignKeys(string $tableName): array
     {
         $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
-        $junctionTableNames = array_map(function (Table $table) {
+        $junctionTableNames = array_map(function(Table $table) {
             return $table->getName();
         }, $junctionTables);
         $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName);

src/Commands/GenerateCommand.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
         $fromLock = (bool) $input->getOption('from-lock');
 
-        $loggers = [ new ConsoleLogger($output) ];
+        $loggers = [new ConsoleLogger($output)];
 
         $logger = $alteredConf->getLogger();
         if ($logger) {

src/PageIterator.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
      */
     public static function createResultIterator(ResultIterator $parentResult, string $magicSql, array $parameters, int $limit, int $offset, array $columnDescriptors, ObjectStorageInterface $objectStorage, ?string $className, TDBMService $tdbmService, MagicQuery $magicQuery, int $mode, LoggerInterface $logger): self
     {
-        $iterator =  new self();
+        $iterator = new self();
         $iterator->parentResult = $parentResult;
         $iterator->magicSql = $magicSql;
         $iterator->objectStorage = $objectStorage;
@@ -277,7 +277,7 @@ 
      */
     public function jsonSerialize()
     {
-        return array_map(function (AbstractTDBMObject $item) {
+        return array_map(function(AbstractTDBMObject $item) {
             return $item->jsonSerialize();
         }, $this->toArray());
     }

src/InnerResultIterator.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      */
     public static function createInnerResultIterator(string $magicSql, array $parameters, ?int $limit, ?int $offset, array $columnDescriptors, ObjectStorageInterface $objectStorage, ?string $className, TDBMService $tdbmService, MagicQuery $magicQuery, LoggerInterface $logger): self
     {
-        $iterator =  new static();
+        $iterator = new static();
         $iterator->magicSql = $magicSql;
         $iterator->objectStorage = $objectStorage;
         $iterator->className = $className;

src/Utils/StringUtils.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     public static function getValidVariableName(string $variableName): string
     {
-        $valid = preg_replace_callback('/^(\d+)/', static function (array $match) {
+        $valid = preg_replace_callback('/^(\d+)/', static function(array $match) {
             $f = new \NumberFormatter('en', \NumberFormatter::SPELLOUT);
             $number = $f->format((int) $match[0]);
             return preg_replace('/[^a-z]+/i', '_', $number);

src/QueryFactory/FindObjectsFromRawSqlQueryFactory.php

Spacing +3 added lines, -3 removed lines

@@ -215,7 +215,7 @@ 
                 $alias = AbstractQueryFactory::getColumnAlias($tableName, $columnName);
                 $astColumn = [
                     'expr_type' => 'colref',
-                    'base_expr' => $connection->quoteIdentifier($tableName) . '.' . $connection->quoteIdentifier($columnName),
+                    'base_expr' => $connection->quoteIdentifier($tableName).'.'.$connection->quoteIdentifier($columnName),
                     'no_quotes' => [
                         'delim' => '.',
                         'parts' => [
@@ -303,7 +303,7 @@ 
                 return $this->generateWrappedSqlCount($parsedSql);
             }
 
-            $countSubExpr = array_map(function (array $item) {
+            $countSubExpr = array_map(function(array $item) {
                 unset($item['alias']);
                 return $item;
             }, $parsedSql['SELECT']);
@@ -380,7 +380,7 @@ 
                 $item['delim'] = ',';
                 $innerColumns[] = $item;
             }
-            $innerColumns[count($innerColumns)-1]['delim'] = false;
+            $innerColumns[count($innerColumns) - 1]['delim'] = false;
             $parsedSql['SELECT'] = $innerColumns;
 
             $parsedSql = [

tests/TDBMDaoGeneratorTest.php

Spacing +12 added lines, -12 removed lines

@@ -110,7 +110,7 @@ 
         $schemaLockFileDumper = new SchemaLockFileDumper($this->tdbmService->getConnection(), new ArrayCache(), Configuration::getDefaultLockFilePath());
         $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($this->tdbmService->getConnection(), new ArrayCache(), $schemaAnalyzer, $schemaLockFileDumper);
         $this->tdbmDaoGenerator = new TDBMDaoGenerator($this->getConfiguration(), $tdbmSchemaAnalyzer);
-        $this->rootPath = __DIR__ . '/../';
+        $this->rootPath = __DIR__.'/../';
         //$this->tdbmDaoGenerator->setComposerFile($this->rootPath.'composer.json');
     }
 
@@ -132,10 +132,10 @@ 
     public function testDaoGeneration(): void
     {
         // Remove all previously generated files.
-        $this->recursiveDelete($this->rootPath . 'src/Test/Dao/');
-        mkdir($this->rootPath . 'src/Test/Dao/Generated', 0755, true);
+        $this->recursiveDelete($this->rootPath.'src/Test/Dao/');
+        mkdir($this->rootPath.'src/Test/Dao/Generated', 0755, true);
         // Let's generate a dummy file to see it is indeed removed.
-        $dummyFile = $this->rootPath . 'src/Test/Dao/Generated/foobar.php';
+        $dummyFile = $this->rootPath.'src/Test/Dao/Generated/foobar.php';
         touch($dummyFile);
         $this->assertFileExists($dummyFile);
 
@@ -154,7 +154,7 @@ 
 
         // Let's require all files to check they are valid PHP!
         // Test the daoFactory
-        require_once $this->rootPath . 'src/Test/Dao/Generated/DaoFactory.php';
+        require_once $this->rootPath.'src/Test/Dao/Generated/DaoFactory.php';
         // Test the others
 
         $beanDescriptors = $this->getDummyGeneratorListener()->getBeanDescriptors();
@@ -164,10 +164,10 @@ 
             $daoBaseName = $beanDescriptor->getBaseDaoClassName();
             $beanName = $beanDescriptor->getBeanClassName();
             $baseBeanName = $beanDescriptor->getBaseBeanClassName();
-            require_once $this->rootPath . 'src/Test/Dao/Bean/Generated/' . $baseBeanName . '.php';
-            require_once $this->rootPath . 'src/Test/Dao/Bean/' . $beanName . '.php';
-            require_once $this->rootPath . 'src/Test/Dao/Generated/' . $daoBaseName . '.php';
-            require_once $this->rootPath . 'src/Test/Dao/' . $daoName . '.php';
+            require_once $this->rootPath.'src/Test/Dao/Bean/Generated/'.$baseBeanName.'.php';
+            require_once $this->rootPath.'src/Test/Dao/Bean/'.$beanName.'.php';
+            require_once $this->rootPath.'src/Test/Dao/Generated/'.$daoBaseName.'.php';
+            require_once $this->rootPath.'src/Test/Dao/'.$daoName.'.php';
         }
 
         // Check that pivot tables do not generate DAOs or beans.
@@ -183,7 +183,7 @@ 
         $schemaLockFileDumper = new SchemaLockFileDumper($this->tdbmService->getConnection(), new ArrayCache(), Configuration::getDefaultLockFilePath());
         $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($this->tdbmService->getConnection(), new ArrayCache(), $schemaAnalyzer, $schemaLockFileDumper);
         $tdbmDaoGenerator = new TDBMDaoGenerator($configuration, $tdbmSchemaAnalyzer);
-        $this->rootPath = __DIR__ . '/../../../../';
+        $this->rootPath = __DIR__.'/../../../../';
         //$tdbmDaoGenerator->setComposerFile($this->rootPath.'composer.json');
 
         $this->expectException(NoPathFoundException::class);
@@ -201,7 +201,7 @@ 
         if (is_file($str)) {
             return @unlink($str);
         } elseif (is_dir($str)) {
-            $scan = glob(rtrim($str, '/') . '/*');
+            $scan = glob(rtrim($str, '/').'/*');
             foreach ($scan as $index => $path) {
                 $this->recursiveDelete($path);
             }
@@ -2037,7 +2037,7 @@ 
 
         $artists = new ArtistDao($this->tdbmService);
         $pinkFloyd = $artists->getById(1);
-        $animals =  $pinkFloyd->getAlbums()[0];
+        $animals = $pinkFloyd->getAlbums()[0];
         $json = $pinkFloyd->jsonSerialize();
         // Collection name properly handled ('discography' instead of default 'albums')
         self::assertTrue(isset($json['discography']));