thecodingmachine / tdbm

src/Utils/TDBMDaoGenerator.php

Spacing +15 added lines, -15 removed lines

@@ -89,11 +89,11 @@ 
 
         // Remove all beans and daos from junction tables
         $junctionTables = $this->configuration->getSchemaAnalyzer()->detectJunctionTables(true);
-        $junctionTableNames = array_map(function (Table $table) {
+        $junctionTableNames = array_map(function(Table $table) {
             return $table->getName();
         }, $junctionTables);
 
-        $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
+        $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) {
             return !in_array($table->getName(), $junctionTableNames, true);
         });
 
@@ -174,7 +174,7 @@ 
         $fileContent = $this->psr2Fix($fileContent);
         // Add the declare strict-types directive
         $commentEnd = strpos($fileContent, ' */') + 3;
-        $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1);
+        $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1);
 
         $this->dumpFile($possibleBaseFileName, $fileContent);
 
@@ -236,7 +236,7 @@ 
         $fileContent = $this->psr2Fix($fileContent);
         // Add the declare strict-types directive
         $commentEnd = strpos($fileContent, ' */') + 3;
-        $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1);
+        $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1);
 
         $this->dumpFile($possibleBaseFileName, $fileContent);
 
@@ -274,7 +274,7 @@ 
     private function psr2Fix(string $content): string
     {
         // Removes the extra blank line at the end (before: `\n\n`, after: `\n`)
-        return rtrim($content, PHP_EOL) . PHP_EOL;
+        return rtrim($content, PHP_EOL).PHP_EOL;
     }
 
     /**
@@ -285,7 +285,7 @@ 
         $resultIteratorClassName = $beanDescriptor->getResultIteratorClassName();
         $resultIteratorBaseClassName = $beanDescriptor->getBaseResultIteratorClassName();
         $resultIteratorNamespace = $this->configuration->getResultIteratorNamespace();
-        $resultIteratorBaseNamespace = $resultIteratorNamespace . '\\Generated';
+        $resultIteratorBaseNamespace = $resultIteratorNamespace.'\\Generated';
         $beanClassWithoutNameSpace = $beanDescriptor->getBeanClassName();
         $file = $beanDescriptor->generateResultIteratorPhpCode();
         if ($file === null) {
@@ -294,7 +294,7 @@ 
 
         $fileContent = $this->psr2Fix($file->generate());
         $commentEnd = strpos($fileContent, ' */') + 3;
-        $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1);
+        $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1);
 
         $baseResultIteratorFilePath = $this->configuration->getPathFinder()->getPath($resultIteratorBaseNamespace.'\\'.$resultIteratorBaseClassName)->getPathname();
         $this->dumpFile($baseResultIteratorFilePath, $fileContent);
@@ -359,7 +359,7 @@ 
 
         $constructorMethod = new MethodGenerator(
             '__construct',
-            [ new ParameterGenerator('container', ContainerInterface::class) ],
+            [new ParameterGenerator('container', ContainerInterface::class)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->container = $container;'
         );
@@ -375,7 +375,7 @@ 
 
             $daoInstanceProperty = new PropertyGenerator($daoInstanceName);
             $daoInstanceProperty->setVisibility(AbstractMemberGenerator::VISIBILITY_PRIVATE);
-            $daoInstanceProperty->setDocBlock(new DocBlockGenerator(null, null, [new VarTag(null, ['\\' . $daoNamespace . '\\' . $daoClassName, 'null'])]));
+            $daoInstanceProperty->setDocBlock(new DocBlockGenerator(null, null, [new VarTag(null, ['\\'.$daoNamespace.'\\'.$daoClassName, 'null'])]));
             $class->addPropertyFromGenerator($daoInstanceProperty);
 
             $fullClassNameVarExport = var_export($daoNamespace.'\\'.$daoClassName, true);
@@ -388,7 +388,7 @@ 
 BODY;
 
             $getterMethod = new MethodGenerator(
-                'get' . $daoClassName,
+                'get'.$daoClassName,
                 [],
                 MethodGenerator::FLAG_PUBLIC,
                 $getterBody
@@ -400,10 +400,10 @@ 
             }
 
             $setterMethod = new MethodGenerator(
-                'set' . $daoClassName,
-                [new ParameterGenerator($daoInstanceName, '\\' . $daoNamespace . '\\' . $daoClassName)],
+                'set'.$daoClassName,
+                [new ParameterGenerator($daoInstanceName, '\\'.$daoNamespace.'\\'.$daoClassName)],
                 MethodGenerator::FLAG_PUBLIC,
-                '$this->' . $daoInstanceName . ' = $' . $daoInstanceName . ';'
+                '$this->'.$daoInstanceName.' = $'.$daoInstanceName.';'
             );
             $setterMethod->setReturnType('void');
             $setterMethod = $this->configuration->getCodeGeneratorListener()->onDaoFactorySetterGenerated($setterMethod, $beanDescriptor, $this->configuration, $class);
@@ -423,7 +423,7 @@ 
             $fileContent = $this->psr2Fix($fileContent);
             // Add the declare strict-types directive
             $commentEnd = strpos($fileContent, ' */') + 3;
-            $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1);
+            $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1);
 
             $this->dumpFile($possibleFileName, $fileContent);
         }
@@ -530,7 +530,7 @@ 
         $map = [
             Type::TARRAY => 'array',
             Type::SIMPLE_ARRAY => 'array',
-            'json' => 'array',  // 'json' is supported from Doctrine DBAL 2.6 only.
+            'json' => 'array', // 'json' is supported from Doctrine DBAL 2.6 only.
             Type::JSON_ARRAY => 'array',
             Type::BIGINT => 'string',
             Type::BOOLEAN => 'bool',

src/Utils/Logs/LevelFilter.php

Spacing +6 added lines, -6 removed lines

@@ -19,12 +19,12 @@
      */
     private const LEVELS = array(
         LogLevel::EMERGENCY, // 0
-        LogLevel::ALERT,     // 1
-        LogLevel::CRITICAL,  // 2
-        LogLevel::ERROR,     // 3
-        LogLevel::WARNING,   // 4
-        LogLevel::NOTICE,    // 5
-        LogLevel::INFO,      // 6
+        LogLevel::ALERT, // 1
+        LogLevel::CRITICAL, // 2
+        LogLevel::ERROR, // 3
+        LogLevel::WARNING, // 4
+        LogLevel::NOTICE, // 5
+        LogLevel::INFO, // 6
         LogLevel::DEBUG      // 7
     );
 

src/Utils/PivotTableMethodsDescriptor.php

Spacing +10 added lines, -10 removed lines

@@ -184,7 +184,7 @@ 
             $this->getArrayInlineCode($this->remoteFk->getUnquotedForeignColumns()),
             $this->getArrayInlineCode($this->remoteFk->getUnquotedLocalColumns()),
             $this->getArrayInlineCode($this->localFk->getUnquotedLocalColumns()),
-            '\\' . $this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName() . '::class'
+            '\\'.$this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName().'::class'
         );
     }
 
@@ -226,7 +226,7 @@ 
 
         $getter = new MethodGenerator($this->getName());
         $getterDocBlock = new DocBlockGenerator(sprintf('Returns the list of %s associated to this bean via the %s pivot table.', $remoteBeanName, $this->pivotTable->getName()));
-        $getterDocBlock->setTag(new ReturnTag([ $fqcnRemoteBeanName.'[]' ]));
+        $getterDocBlock->setTag(new ReturnTag([$fqcnRemoteBeanName.'[]']));
         $getterDocBlock->setWordWrap(false);
         $getter->setDocBlock($getterDocBlock);
         $getter->setReturnType('array');
@@ -235,7 +235,7 @@ 
 
         $adder = new MethodGenerator('add'.$singularName);
         $adderDocBlock = new DocBlockGenerator(sprintf('Adds a relationship with %s associated to this bean via the %s pivot table.', $remoteBeanName, $this->pivotTable->getName()));
-        $adderDocBlock->setTag(new ParamTag($variableName, [ $fqcnRemoteBeanName ]));
+        $adderDocBlock->setTag(new ParamTag($variableName, [$fqcnRemoteBeanName]));
         $adderDocBlock->setWordWrap(false);
         $adder->setDocBlock($adderDocBlock);
         $adder->setReturnType('void');
@@ -244,7 +244,7 @@ 
 
         $remover = new MethodGenerator('remove'.$singularName);
         $removerDocBlock = new DocBlockGenerator(sprintf('Deletes the relationship with %s associated to this bean via the %s pivot table.', $remoteBeanName, $this->pivotTable->getName()));
-        $removerDocBlock->setTag(new ParamTag($variableName, [ $fqcnRemoteBeanName ]));
+        $removerDocBlock->setTag(new ParamTag($variableName, [$fqcnRemoteBeanName]));
         $removerDocBlock->setWordWrap(false);
         $remover->setDocBlock($removerDocBlock);
         $remover->setReturnType('void');
@@ -253,8 +253,8 @@ 
 
         $has = new MethodGenerator('has'.$singularName);
         $hasDocBlock = new DocBlockGenerator(sprintf('Returns whether this bean is associated with %s via the %s pivot table.', $remoteBeanName, $this->pivotTable->getName()));
-        $hasDocBlock->setTag(new ParamTag($variableName, [ $fqcnRemoteBeanName ]));
-        $hasDocBlock->setTag(new ReturnTag([ 'bool' ]));
+        $hasDocBlock->setTag(new ParamTag($variableName, [$fqcnRemoteBeanName]));
+        $hasDocBlock->setTag(new ReturnTag(['bool']));
         $hasDocBlock->setWordWrap(false);
         $has->setDocBlock($hasDocBlock);
         $has->setReturnType('bool');
@@ -264,15 +264,15 @@ 
         $setter = new MethodGenerator('set'.$pluralName);
         $setterDocBlock = new DocBlockGenerator(sprintf('Sets all relationships with %s associated to this bean via the %s pivot table.
 Exiting relationships will be removed and replaced by the provided relationships.', $remoteBeanName, $this->pivotTable->getName()));
-        $setterDocBlock->setTag(new ParamTag($pluralVariableName, [ $fqcnRemoteBeanName.'[]' ]));
-        $setterDocBlock->setTag(new ReturnTag([ 'void' ]));
+        $setterDocBlock->setTag(new ParamTag($pluralVariableName, [$fqcnRemoteBeanName.'[]']));
+        $setterDocBlock->setTag(new ReturnTag(['void']));
         $setterDocBlock->setWordWrap(false);
         $setter->setDocBlock($setterDocBlock);
         $setter->setReturnType('void');
         $setter->setParameter(new ParameterGenerator($pluralVariableName, 'array'));
         $setter->setBody(sprintf('$this->setRelationships(%s, $%s);', $pathKey, $pluralVariableName));
 
-        return [ $getter, $adder, $remover, $has, $setter ];
+        return [$getter, $adder, $remover, $has, $setter];
     }
 
     /**
@@ -301,7 +301,7 @@ 
         /** @var Annotation\JsonFormat|null $jsonFormat */
         $jsonFormat = $this->findRemoteAnnotation(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->findRemoteAnnotation(Annotation\JsonRecursive::class) ? '' : 'true';

src/Utils/ObjectBeanPropertyDescriptor.php

Spacing +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
      */
     public function getPhpType(): string
     {
-        return '\\' . $this->beanNamespace . '\\' . $this->getClassName();
+        return '\\'.$this->beanNamespace.'\\'.$this->getClassName();
     }
 
     /**
@@ -168,17 +168,17 @@ 
         $referencedResultIteratorName = $this->namingStrategy->getResultIteratorClassName($foreignTableName);
 
         $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.'));
 
-        $getter->setReturnType(($isNullable ? '?' : '') . $this->beanNamespace . '\\' . $referencedBeanName);
+        $getter->setReturnType(($isNullable ? '?' : '').$this->beanNamespace.'\\'.$referencedBeanName);
         $tdbmFk = ForeignKey::createFromFk($this->foreignKey);
 
         $getter->setBody(sprintf(
             'return $this->getRef(%s, %s, %s, %s);',
             var_export($tdbmFk->getCacheKey(), true),
             var_export($tableName, true),
-            '\\' . $this->beanNamespace . '\\' . $referencedBeanName . '::class',
-            '\\' . $this->resultIteratorNamespace . '\\' . $referencedResultIteratorName . '::class'
+            '\\'.$this->beanNamespace.'\\'.$referencedBeanName.'::class',
+            '\\'.$this->resultIteratorNamespace.'\\'.$referencedResultIteratorName.'::class'
         ));
 
         if ($this->isGetterProtected()) {
@@ -187,9 +187,9 @@ 
 
         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');
 
@@ -198,8 +198,8 @@ 
                 var_export($tdbmFk->getCacheKey(), true),
                 '$object',
                 var_export($tableName, true),
-                '\\' . $this->beanNamespace . '\\' . $referencedBeanName . '::class',
-                '\\' . $this->resultIteratorNamespace . '\\' . $referencedResultIteratorName . '::class'
+                '\\'.$this->beanNamespace.'\\'.$referencedBeanName.'::class',
+                '\\'.$this->resultIteratorNamespace.'\\'.$referencedResultIteratorName.'::class'
             ));
 
             if ($this->isSetterProtected()) {
@@ -239,7 +239,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';
@@ -295,10 +295,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
@@ -311,7 +311,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().'`');
     }
 
     /**

tests/TDBMServiceTest.php

Spacing +5 added lines, -5 removed lines

@@ -454,7 +454,7 @@ 
     {
         $beans = $this->tdbmService->findObjects('person', null, [], 'person.id ASC', [], null, TDBMObject::class, ResultIterator::class);
 
-        $results = $beans->map(function ($item) {
+        $results = $beans->map(function($item) {
             return $item->getProperty('id', 'person');
         })->toArray();
 
@@ -463,7 +463,7 @@ 
         // Same test with page
         $page = $beans->take(0, 2);
 
-        $results = $page->map(function ($item) {
+        $results = $page->map(function($item) {
             return $item->getProperty('id', 'person');
         })->toArray();
 
@@ -843,7 +843,7 @@ 
     public function testFindObjectsMethodWithoutResultIteratorClass(): void
     {
         $this->expectException(TDBMInvalidArgumentException::class);
-        $this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
+        $this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `'.preg_quote(ResultIterator::class, '/').'`. `(.*)` provided\.$/');
         $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         $tdbmService->findObjects('', null, [], null, [], null, null, self::class);
@@ -852,7 +852,7 @@ 
     public function testFindObjectsFromSqlMethodWithoutResultIteratorClass(): void
     {
         $this->expectException(TDBMInvalidArgumentException::class);
-        $this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
+        $this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `'.preg_quote(ResultIterator::class, '/').'`. `(.*)` provided\.$/');
         $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         $tdbmService->findObjectsFromSql('', '', null, [], null, null, null, self::class);
@@ -861,7 +861,7 @@ 
     public function testFindObjectsFromRawSqlMethodWithoutResultIteratorClass(): void
     {
         $this->expectException(TDBMInvalidArgumentException::class);
-        $this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
+        $this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `'.preg_quote(ResultIterator::class, '/').'`. `(.*)` provided\.$/');
         $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         $tdbmService->findObjectsFromRawSql('', '', [], null, null, null, self::class);

src/Utils/ManyToManyRelationshipPathDescriptor.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function __construct(string $targetTable, string $pivotTable, array $joinForeignKeys, array $joinLocalKeys, array $whereKeys, string $resultIteratorClass)
     {
-        assert(is_a($resultIteratorClass, ResultIterator::class, true), new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.'));
+        assert(is_a($resultIteratorClass, ResultIterator::class, true), new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.'));
         $this->targetTable = $targetTable;
         $this->pivotTable = $pivotTable;
         $this->joinForeignKeys = $joinForeignKeys;
@@ -57,7 +57,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
@@ -91,7 +91,7 @@ 
             );
         }
 
-        return $platform->quoteIdentifier($mainTable) . ' JOIN ' . $platform->quoteIdentifier($pivotTable) . ' ON ' . implode(' AND ', $join);
+        return $platform->quoteIdentifier($mainTable).' JOIN '.$platform->quoteIdentifier($pivotTable).' ON '.implode(' AND ', $join);
     }
 
     /**
@@ -116,7 +116,7 @@ 
     {
         $params = [];
         foreach ($primaryKeys as $key => $primaryKeyValue) {
-            $params['param' . $key] = $primaryKeyValue;
+            $params['param'.$key] = $primaryKeyValue;
         }
         return $params;
     }

tests/TDBMDaoGeneratorTest.php

Spacing +13 added lines, -13 removed lines

@@ -112,7 +112,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');
     }
 
@@ -134,10 +134,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);
 
@@ -156,7 +156,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();
@@ -166,10 +166,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.
@@ -185,7 +185,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);
@@ -203,7 +203,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);
             }
@@ -1643,7 +1643,7 @@ 
 
         // executes after the command finishes
         if (!$process->isSuccessful()) {
-            $this->fail('Generated code is not PSR-2 compliant' . PHP_EOL . $process->getErrorOutput());
+            $this->fail('Generated code is not PSR-2 compliant'.PHP_EOL.$process->getErrorOutput());
         }
         $this->assertTrue($process->isSuccessful());
     }
@@ -2082,7 +2082,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/Utils/BeanDescriptor.php

Spacing +32 added lines, -32 removed lines

@@ -215,7 +215,7 @@ 
      */
     public function getConstructorProperties(): array
     {
-        $constructorProperties = array_filter($this->beanPropertyDescriptors, static function (AbstractBeanPropertyDescriptor $property) {
+        $constructorProperties = array_filter($this->beanPropertyDescriptors, static function(AbstractBeanPropertyDescriptor $property) {
             return !$property instanceof InheritanceReferencePropertyDescriptor && $property->isCompulsory() && !$property->isReadOnly();
         });
 
@@ -230,7 +230,7 @@ 
     public function getPropertiesWithDefault(): array
     {
         $properties = $this->getPropertiesForTable($this->table);
-        $defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
+        $defaultProperties = array_filter($properties, function(AbstractBeanPropertyDescriptor $property) {
             return $property->hasDefault();
         });
 
@@ -244,7 +244,7 @@ 
      */
     public function getExposedProperties(): array
     {
-        $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+        $exposedProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) {
             return !$property instanceof InheritanceReferencePropertyDescriptor && $property->getTable()->getName() === $this->table->getName();
         });
 
@@ -350,7 +350,7 @@ 
         foreach ($beanPropertyDescriptors as $beanDescriptor) {
             $name = $beanDescriptor->getGetterName();
             if (isset($names[$name])) {
-                throw new TDBMException('Unsolvable name conflict while generating method name "' . $name . '"');
+                throw new TDBMException('Unsolvable name conflict while generating method name "'.$name.'"');
             } else {
                 $names[$name] = $beanDescriptor;
             }
@@ -399,7 +399,7 @@ 
             $assigns[] = $property->assignToDefaultCode()."\n";
         }
 
-        $body = $parentConstructorCode . implode('', $assigns);
+        $body = $parentConstructorCode.implode('', $assigns);
 
         $constructor->setBody($body);
 
@@ -473,7 +473,7 @@ 
         $this->descriptorsByMethodName[$name][] = $descriptor;
         $descriptors = $this->descriptorsByMethodName[$name];
         if (count($descriptors) > 1) {
-            $properties = array_filter($descriptors, function ($descriptor) {
+            $properties = array_filter($descriptors, function($descriptor) {
                 return $descriptor instanceof AbstractBeanPropertyDescriptor;
             });
             $renameProperties = count($properties) > 1;
@@ -524,7 +524,7 @@ 
         foreach ($this->getExposedProperties() as $beanPropertyDescriptor) {
             $propertyCode = $beanPropertyDescriptor->getJsonSerializeCode();
             if (!empty($propertyCode)) {
-                $body .= PHP_EOL . $propertyCode;
+                $body .= PHP_EOL.$propertyCode;
             }
         }
 
@@ -532,11 +532,11 @@ 
         foreach ($this->getMethodDescriptors() as $methodDescriptor) {
             $methodCode = $methodDescriptor->getJsonSerializeCode();
             if (!empty($methodCode)) {
-                $body .= PHP_EOL . $methodCode;
+                $body .= PHP_EOL.$methodCode;
             }
         }
 
-        $body .= PHP_EOL . 'return $array;';
+        $body .= PHP_EOL.'return $array;';
 
         $method->setBody($body);
 
@@ -632,10 +632,10 @@ 
         /** @var AddInterface[] $addInterfaceAnnotations */
         $addInterfaceAnnotations = $this->annotationParser->getTableAnnotations($this->table)->findAnnotations(AddInterface::class);
 
-        $interfaces = [ JsonSerializable::class ];
+        $interfaces = [JsonSerializable::class];
         foreach ($addInterfaceAnnotations as $annotation) {
             /** @phpstan-var class-string $className */
-            $className =  $annotation->getName();
+            $className = $annotation->getName();
             $interfaces[] = $className;
         }
 
@@ -674,7 +674,7 @@ 
                 }
             } elseif ($methodDescriptor instanceof PivotTableMethodsDescriptor) {
                 $pivotTableMethodsDescriptors[] = $methodDescriptor;
-                [ $getter, $adder, $remover, $has, $setter ] = $methodDescriptor->getCode();
+                [$getter, $adder, $remover, $has, $setter] = $methodDescriptor->getCode();
                 $methods = $this->codeGeneratorListener->onBaseBeanManyToManyGenerated($getter, $adder, $remover, $has, $setter, $methodDescriptor, $this, $this->configuration, $class);
                 foreach ($methods as $method) {
                     if ($method) {
@@ -804,7 +804,7 @@ 
         $interfaces = [];
         foreach ($addInterfaceOnDaoAnnotations as $annotation) {
             /** @phpstan-var class-string $className */
-            $className =  $annotation->getName();
+            $className = $annotation->getName();
             $interfaces[] = $className;
         }
 
@@ -826,7 +826,7 @@ 
 
         $constructorMethod = new MethodGenerator(
             '__construct',
-            [ new ParameterGenerator('tdbmService', TDBMService::class) ],
+            [new ParameterGenerator('tdbmService', TDBMService::class)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->tdbmService = $tdbmService;',
             'Sets the TDBM service used by this DAO.'
@@ -838,7 +838,7 @@ 
 
         $saveMethod = new MethodGenerator(
             'save',
-            [ new ParameterGenerator('obj', $beanClassName) ],
+            [new ParameterGenerator('obj', $beanClassName)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->tdbmService->save($obj);',
             (new DocBlockGenerator(
@@ -886,7 +886,7 @@ 
 
             foreach ($primaryKeyColumns as $primaryKeyColumn) {
                 if ($primaryKeyColumn === $lazyLoadingParameterName) {
-                    throw new TDBMException('Primary Column name `' . $lazyLoadingParameterName . '` is not allowed.');
+                    throw new TDBMException('Primary Column name `'.$lazyLoadingParameterName.'` is not allowed.');
                 }
                 $phpType = TDBMDaoGenerator::dbalTypeToPhpType($this->table->getColumn($primaryKeyColumn)->getType());
                 $parameters[] = new ParameterGenerator($primaryKeyColumn, $phpType);
@@ -902,7 +902,7 @@ 
                 'getById',
                 $parameters,
                 MethodGenerator::FLAG_PUBLIC,
-                "return \$this->tdbmService->findObjectByPk('$tableName', [" . implode(', ', $primaryKeyFilter) . "], [], \$$lazyLoadingParameterName, \\$beanClassName::class, \\$resultIteratorClass::class);",
+                "return \$this->tdbmService->findObjectByPk('$tableName', [".implode(', ', $primaryKeyFilter)."], [], \$$lazyLoadingParameterName, \\$beanClassName::class, \\$resultIteratorClass::class);",
                 (new DocBlockGenerator(
                     "Get $beanClassWithoutNameSpace specified by its ID (its primary key).",
                     'If the primary key does not exist, an exception is thrown.',
@@ -1190,7 +1190,7 @@ 
             $class->addUse(ResultIterator::class);
             $class->setExtendedClass(ResultIterator::class);
         } else {
-            $class->addUse($this->resultIteratorNamespace . '\\' . $extends);
+            $class->addUse($this->resultIteratorNamespace.'\\'.$extends);
             /** @var class-string $extends */
             $class->setExtendedClass($extends);
         }
@@ -1198,7 +1198,7 @@ 
         $class->setDocBlock((new DocBlockGenerator(
             "The $baseClassName class will iterate over results of $beanClassWithoutNameSpace class.",
             null,
-            [new Tag\MethodTag('getIterator', ['\\' . $beanClassName . '[]']), new Tag\MethodTag('toArray', ['\\' . $beanClassName . '[]'])]
+            [new Tag\MethodTag('getIterator', ['\\'.$beanClassName.'[]']), new Tag\MethodTag('toArray', ['\\'.$beanClassName.'[]'])]
         ))->setWordWrap(false));
 
         $file = $this->codeGeneratorListener->onBaseResultIteratorGenerated($file, $this, $this->configuration);
@@ -1254,7 +1254,7 @@ 
                 }
             }
         }
-        usort($methods, static function (MethodGenerator $methodA, MethodGenerator $methodB) {
+        usort($methods, static function(MethodGenerator $methodA, MethodGenerator $methodB) {
             return $methodA->getName() <=> $methodB->getName();
         });
 
@@ -1403,11 +1403,11 @@ 
 
         if ($index->isUnique()) {
             $parameters[] = new ParameterGenerator('additionalTablesFetch', 'array', []);
-            $params[] = new ParamTag('additionalTablesFetch', [ 'string[]' ], 'A list of additional tables to fetch (for performance improvement)');
-            $params[] = new ReturnTag([ '\\'.$beanNamespace.'\\'.$beanClassName, 'null' ]);
+            $params[] = new ParamTag('additionalTablesFetch', ['string[]'], 'A list of additional tables to fetch (for performance improvement)');
+            $params[] = new ReturnTag(['\\'.$beanNamespace.'\\'.$beanClassName, 'null']);
             $method->setReturnType('?\\'.$beanNamespace.'\\'.$beanClassName);
 
-            $docBlock = new DocBlockGenerator("Get a $beanClassName filtered by ".implode(', ', $commentArguments). '.', null, $params);
+            $docBlock = new DocBlockGenerator("Get a $beanClassName filtered by ".implode(', ', $commentArguments).'.', null, $params);
             $docBlock->setWordWrap(false);
 
             $body = "\$filter = [
@@ -1416,12 +1416,12 @@ 
 ";
         } else {
             $parameters[] = (new ParameterGenerator('orderBy'))->setDefaultValue(null);
-            $params[] = new ParamTag('orderBy', [ 'mixed' ], 'The order string');
+            $params[] = new ParamTag('orderBy', ['mixed'], 'The order string');
             $parameters[] = new ParameterGenerator('additionalTablesFetch', 'array', []);
-            $params[] = new ParamTag('additionalTablesFetch', [ 'string[]' ], 'A list of additional tables to fetch (for performance improvement)');
+            $params[] = new ParamTag('additionalTablesFetch', ['string[]'], 'A list of additional tables to fetch (for performance improvement)');
             $parameters[] = (new ParameterGenerator('mode', '?int'))->setDefaultValue(null);
-            $params[] = new ParamTag('mode', [ 'int', 'null' ], 'Either TDBMService::MODE_ARRAY or TDBMService::MODE_CURSOR (for large datasets). Defaults to TDBMService::MODE_ARRAY.');
-            $method->setReturnType($this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName());
+            $params[] = new ParamTag('mode', ['int', 'null'], 'Either TDBMService::MODE_ARRAY or TDBMService::MODE_CURSOR (for large datasets). Defaults to TDBMService::MODE_ARRAY.');
+            $method->setReturnType($this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName());
 
             $docBlock = new DocBlockGenerator("Get a list of $beanClassName filtered by ".implode(', ', $commentArguments).".", null, $params);
             $docBlock->setWordWrap(false);
@@ -1481,8 +1481,8 @@ 
                     var_export($tdbmFk->getCacheKey(), true),
                     'null',
                     var_export($this->table->getName(), true),
-                    '\\' . $this->beanNamespace . '\\' . $this->namingStrategy->getBeanClassName($foreignTableName) . '::class',
-                    '\\' . $this->resultIteratorNamespace . '\\' . $this->namingStrategy->getResultIteratorClassName($foreignTableName) . '::class'
+                    '\\'.$this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($foreignTableName).'::class',
+                    '\\'.$this->resultIteratorNamespace.'\\'.$this->namingStrategy->getResultIteratorClassName($foreignTableName).'::class'
                 );
             }
         }
@@ -1756,17 +1756,17 @@ 
      * @param string $indent
      * @return string
      */
-    private function psr2VarExport($var, string $indent=''): string
+    private function psr2VarExport($var, string $indent = ''): string
     {
         if (is_array($var)) {
             $indexed = array_keys($var) === range(0, count($var) - 1);
             $r = [];
             foreach ($var as $key => $value) {
                 $r[] = "$indent    "
-                    . ($indexed ? '' : $this->psr2VarExport($key) . ' => ')
+                    . ($indexed ? '' : $this->psr2VarExport($key).' => ')
                     . $this->psr2VarExport($value, "$indent    ");
             }
-            return "[\n" . implode(",\n", $r) . "\n" . $indent . ']';
+            return "[\n".implode(",\n", $r)."\n".$indent.']';
         }
         return var_export($var, true);
     }

src/InnerResultIterator.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
         if ($this->fetchStarted && $this->tdbmService->getConnection()->getDatabasePlatform() instanceof MySqlPlatform) {
             // Optimisation: we don't need a separate "count" SQL request in MySQL.
             assert($this->statement instanceof Statement);
-            $this->count = (int)$this->statement->rowCount();
+            $this->count = (int) $this->statement->rowCount();
             return $this->count;
         }
         return $this->getRowCountViaSqlQuery();