thecodingmachine / tdbm

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/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']));

src/PageIterator.php

Spacing +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
      */
     public function jsonSerialize()
     {
-        return array_map(function (AbstractTDBMObject $item) {
+        return array_map(function(AbstractTDBMObject $item) {
             return $item->jsonSerialize();
         }, $this->toArray());
     }

src/Utils/AbstractBeanPropertyDescriptor.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
      */
     public function getParamAnnotation(): ParamTag
     {
-        return new ParamTag($this->getSafeVariableName(), [ $this->getPhpType() ]);
+        return new ParamTag($this->getSafeVariableName(), [$this->getPhpType()]);
     }
 
     public function getVariableName(): string
@@ -77,7 +77,7 @@ 
 
     public function getSafeVariableName(): string
     {
-        return '$' . StringUtils::getValidVariableName(ltrim($this->getVariableName(), '$'));
+        return '$'.StringUtils::getValidVariableName(ltrim($this->getVariableName(), '$'));
     }
 
     public function getSetterName(): string

src/Utils/ObjectBeanPropertyDescriptor.php

Spacing +11 added lines, -11 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function getPhpType(): string
     {
-        return '\\' . $this->beanNamespace . '\\' . $this->getClassName();
+        return '\\'.$this->beanNamespace.'\\'.$this->getClassName();
     }
 
     /**
@@ -160,7 +160,7 @@ 
         $referencedBeanName = $this->namingStrategy->getBeanClassName($this->foreignKey->getForeignTableName());
 
         $getter = new MethodGenerator($getterName);
-        $getter->setDocBlock(new DocBlockGenerator('Returns the ' . $referencedBeanName . ' object bound to this object via the ' . implode(' and ', $this->foreignKey->getUnquotedLocalColumns()) . ' column.'));
+        $getter->setDocBlock(new DocBlockGenerator('Returns the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getUnquotedLocalColumns()).' column.'));
 
         /*$types = [ $referencedBeanName ];
         if ($isNullable) {
@@ -168,10 +168,10 @@ 
         }
         $getter->getDocBlock()->setTag(new ReturnTag($types));*/
 
-        $getter->setReturnType(($isNullable ? '?' : '') . $this->beanNamespace . '\\' . $referencedBeanName);
+        $getter->setReturnType(($isNullable ? '?' : '').$this->beanNamespace.'\\'.$referencedBeanName);
         $tdbmFk = ForeignKey::createFromFk($this->foreignKey);
 
-        $getter->setBody('return $this->getRef(' . var_export($tdbmFk->getCacheKey(), true) . ', ' . var_export($tableName, true) . ');');
+        $getter->setBody('return $this->getRef('.var_export($tdbmFk->getCacheKey(), true).', '.var_export($tableName, true).');');
 
         if ($this->isGetterProtected()) {
             $getter->setVisibility(AbstractMemberGenerator::VISIBILITY_PROTECTED);
@@ -179,13 +179,13 @@ 
 
         if (!$this->isReadOnly()) {
             $setter = new MethodGenerator($setterName);
-            $setter->setDocBlock(new DocBlockGenerator('The setter for the ' . $referencedBeanName . ' object bound to this object via the ' . implode(' and ', $this->foreignKey->getUnquotedLocalColumns()) . ' column.'));
+            $setter->setDocBlock(new DocBlockGenerator('The setter for the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getUnquotedLocalColumns()).' column.'));
 
-            $setter->setParameter(new ParameterGenerator('object', ($isNullable ? '?' : '') . $this->beanNamespace . '\\' . $referencedBeanName));
+            $setter->setParameter(new ParameterGenerator('object', ($isNullable ? '?' : '').$this->beanNamespace.'\\'.$referencedBeanName));
 
             $setter->setReturnType('void');
 
-            $setter->setBody('$this->setRef(' . var_export($tdbmFk->getCacheKey(), true) . ', $object, ' . var_export($tableName, true) . ');');
+            $setter->setBody('$this->setRef('.var_export($tdbmFk->getCacheKey(), true).', $object, '.var_export($tableName, true).');');
 
             if ($this->isSetterProtected()) {
                 $setter->setVisibility(AbstractMemberGenerator::VISIBILITY_PROTECTED);
@@ -224,7 +224,7 @@ 
             /** @var Annotation\JsonFormat|null $jsonFormat */
             $jsonFormat = $this->findAnnotation(Annotation\JsonFormat::class);
             if ($jsonFormat !== null) {
-                $method = $jsonFormat->method ?? 'get' . ucfirst($jsonFormat->property);
+                $method = $jsonFormat->method ?? 'get'.ucfirst($jsonFormat->property);
                 $format = "$method()";
             } else {
                 $stopRecursion = $this->findAnnotation(Annotation\JsonRecursive::class) ? '' : 'true';
@@ -280,10 +280,10 @@ 
             } elseif ($descriptor instanceof ScalarBeanPropertyDescriptor) {
                 $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";
             } else {
-                throw new TDBMException('PropertyDescriptor of class `' . get_class($descriptor) . '` cannot be serialized.');
+                throw new TDBMException('PropertyDescriptor of class `'.get_class($descriptor).'` cannot be serialized.');
             }
         }
-        return '[' . implode(', ', $rows) . ']';
+        return '['.implode(', ', $rows).']';
     }
 
     private function getBeanPropertyDescriptor(string $column): AbstractBeanPropertyDescriptor
@@ -296,7 +296,7 @@ 
                 return $descriptor;
             }
         }
-        throw new TDBMException('PropertyDescriptor for `'.$this->table->getName().'`.`' . $column . '` not found in `' . $this->foreignBeanDescriptor->getTable()->getName() . '`');
+        throw new TDBMException('PropertyDescriptor for `'.$this->table->getName().'`.`'.$column.'` not found in `'.$this->foreignBeanDescriptor->getTable()->getName().'`');
     }
 
     /**

src/Utils/ManyToManyRelationshipPathDescriptor.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 
     public static function generateModelKey(ForeignKeyConstraint $remoteFk, ForeignKeyConstraint $localFk): string
     {
-        return $remoteFk->getLocalTableName() . "." . implode("__", $localFk->getUnquotedLocalColumns());
+        return $remoteFk->getLocalTableName().".".implode("__", $localFk->getUnquotedLocalColumns());
     }
 
     public function getPivotName(): string
@@ -71,7 +71,7 @@ 
             $join[] = sprintf('%s.%s = %s.%s', $mainTable, $column, $pivotTable, $this->joinLocalKeys[$key]);
         }
 
-        return $mainTable . ' JOIN ' . $pivotTable . ' ON ' . implode(' AND ', $join);
+        return $mainTable.' JOIN '.$pivotTable.' ON '.implode(' AND ', $join);
     }
 
     public function getPivotWhere(): string
@@ -91,7 +91,7 @@ 
     {
         $params = [];
         foreach ($primaryKeys as $key => $primaryKeyValue) {
-            $params['param' . $key] = $primaryKeyValue;
+            $params['param'.$key] = $primaryKeyValue;
         }
         return $params;
     }

src/TDBMService.php

Spacing +11 added lines, -11 removed lines

@@ -422,7 +422,7 @@ 
                 }
             }
 
-            return ['(' . implode(') AND (', $sqlParts) . ')', $parameters, $counter];
+            return ['('.implode(') AND (', $sqlParts).')', $parameters, $counter];
         } elseif ($filter_bag instanceof ResultIterator) {
             $subQuery = $filter_bag->_getSubQuery();
             return [$subQuery, [], $counter];
@@ -1000,7 +1000,7 @@ 
 
         return $this->fromCache(
             $this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
-            function () use ($tables) {
+            function() use ($tables) {
                 return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
             }
         );
@@ -1048,7 +1048,7 @@ 
      */
     public function _getRelatedTablesByInheritance(string $table): array
     {
-        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
+        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function() use ($table) {
             return $this->_getRelatedTablesByInheritanceWithoutCache($table);
         });
     }
@@ -1137,7 +1137,7 @@ 
     public function findObjects(string $mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), ?int $mode = null, string $className = null, string $resultIteratorClass = ResultIterator::class): ResultIterator
     {
         if (!is_a($resultIteratorClass, ResultIterator::class, true)) {
-            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.');
+            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.');
         }
         // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
@@ -1174,7 +1174,7 @@ 
     public function findObjectsFromSql(string $mainTable, string $from, $filter = null, array $parameters = array(), $orderString = null, ?int $mode = null, string $className = null, string $resultIteratorClass = ResultIterator::class): ResultIterator
     {
         if (!is_a($resultIteratorClass, ResultIterator::class, true)) {
-            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.');
+            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.');
         }
         // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
@@ -1291,18 +1291,18 @@ 
         if ($count > 1) {
             $additionalErrorInfos = '';
             if (is_string($filter) && !empty($parameters)) {
-                $additionalErrorInfos = ' for filter "' . $filter.'"';
+                $additionalErrorInfos = ' for filter "'.$filter.'"';
                 foreach ($parameters as $fieldName => $parameter) {
                     if (is_array($parameter)) {
-                        $value = '(' . implode(',', $parameter) . ')';
+                        $value = '('.implode(',', $parameter).')';
                     } else {
                         $value = $parameter;
                     }
-                    $additionalErrorInfos = str_replace(':' . $fieldName, var_export($value, true), $additionalErrorInfos);
+                    $additionalErrorInfos = str_replace(':'.$fieldName, var_export($value, true), $additionalErrorInfos);
                 }
             }
             $additionalErrorInfos .= '.';
-            throw new DuplicateRowException("Error while querying an object in table '$mainTable': More than 1 row have been returned, but we should have received at most one" . $additionalErrorInfos);
+            throw new DuplicateRowException("Error while querying an object in table '$mainTable': More than 1 row have been returned, but we should have received at most one".$additionalErrorInfos);
         } elseif ($count === 0) {
             return null;
         }
@@ -1345,7 +1345,7 @@ 
     public function findObjectsFromRawSql(string $mainTable, string $sql, array $parameters = array(), ?int $mode = null, string $className = null, string $sqlCount = null, string $resultIteratorClass = ResultIterator::class): ResultIterator
     {
         if (!is_a($resultIteratorClass, ResultIterator::class, true)) {
-            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.');
+            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.');
         }
         // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
@@ -1475,7 +1475,7 @@ 
         $table1 = $fks[0]->getForeignTableName();
         $table2 = $fks[1]->getForeignTableName();
 
-        $beanTables = array_map(function (DbRow $dbRow) {
+        $beanTables = array_map(function(DbRow $dbRow) {
             return $dbRow->_getDbTableName();
         }, $bean->_getDbRows());