thecodingmachine / tdbm

src/QueryFactory/FindObjectsFromRawSqlQueryFactory.php

Spacing +5 added lines, -5 removed lines

@@ -139,7 +139,7 @@ 
         // Let's add the ORDER BY if any
         if (isset($parsedSql['0']['ORDER'])) {
             $orderByBuilder = new OrderByBuilder();
-            $processedSql .= " " . $orderByBuilder->build($parsedSql['0']['ORDER']);
+            $processedSql .= " ".$orderByBuilder->build($parsedSql['0']['ORDER']);
         }
 
         return [$processedSql, $sqlCount ?? $processedSqlCount, $columnDescriptors];
@@ -152,8 +152,8 @@ 
     {
         $selectBuilder = new SelectStatementBuilder();
 
-        return implode(' UNION ', array_map(function ($clause) use ($selectBuilder) {
-            return '(' . $selectBuilder->build($clause) . ')';
+        return implode(' UNION ', array_map(function($clause) use ($selectBuilder) {
+            return '('.$selectBuilder->build($clause).')';
         }, $parsed['UNION']));
     }
 
@@ -235,7 +235,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' => [
@@ -323,7 +323,7 @@ 
                 return $this->generateWrappedSqlCount($parsedSql);
             }
 
-            $countSubExpr = array_map(function (array $item) {
+            $countSubExpr = array_map(function(array $item) {
                 unset($item['alias']);
                 return $item;
             }, $parsedSql['SELECT']);

tests/Performance/ManyToOneBench.php

Spacing +3 added lines, -3 removed lines

@@ -96,8 +96,8 @@ 
         $schemaLockFileDumper = new SchemaLockFileDumper($connection, new ArrayCache(), Configuration::getDefaultLockFilePath());
         $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($connection, new ArrayCache(), $schemaAnalyzer, $schemaLockFileDumper);
         $tdbmDaoGenerator = new TDBMDaoGenerator(self::createConfiguration(), $tdbmSchemaAnalyzer);
-        $rootPath = __DIR__ . '/../';
-        self::recursiveDelete(__DIR__. '/../../src/Test/Dao/');
+        $rootPath = __DIR__.'/../';
+        self::recursiveDelete(__DIR__.'/../../src/Test/Dao/');
 
         $tdbmDaoGenerator->generateAllDaosAndBeans();
     }
@@ -113,7 +113,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) {
                 self::recursiveDelete($path);
             }

src/Utils/BeanDescriptor.php

Spacing +31 added lines, -31 removed lines

@@ -217,7 +217,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();
         });
 
@@ -232,7 +232,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();
         });
 
@@ -246,7 +246,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();
         });
 
@@ -352,7 +352,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;
             }
@@ -401,7 +401,7 @@ 
             $assigns[] = $property->assignToDefaultCode()."\n";
         }
 
-        $body = $parentConstructorCode . implode('', $assigns);
+        $body = $parentConstructorCode.implode('', $assigns);
 
         $constructor->setBody($body);
 
@@ -475,7 +475,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;
@@ -533,7 +533,7 @@ 
         foreach ($this->getExposedProperties() as $beanPropertyDescriptor) {
             $propertyCode = $beanPropertyDescriptor->getJsonSerializeCode();
             if (!empty($propertyCode)) {
-                $body .= PHP_EOL . $propertyCode;
+                $body .= PHP_EOL.$propertyCode;
             }
         }
 
@@ -541,11 +541,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);
 
@@ -641,10 +641,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;
         }
 
@@ -683,7 +683,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) {
@@ -813,7 +813,7 @@ 
         $interfaces = [];
         foreach ($addInterfaceOnDaoAnnotations as $annotation) {
             /** @phpstan-var class-string $className */
-            $className =  $annotation->getName();
+            $className = $annotation->getName();
             $interfaces[] = $className;
         }
 
@@ -835,7 +835,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.'
@@ -847,7 +847,7 @@ 
 
         $saveMethod = new MethodGenerator(
             'save',
-            [ new ParameterGenerator('obj', $beanClassName) ],
+            [new ParameterGenerator('obj', $beanClassName)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->tdbmService->save($obj);',
             (new DocBlockGenerator(
@@ -895,7 +895,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);
@@ -911,7 +911,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.',
@@ -1199,7 +1199,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);
         }
@@ -1207,7 +1207,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);
@@ -1263,7 +1263,7 @@ 
                 }
             }
         }
-        usort($methods, static function (MethodGenerator $methodA, MethodGenerator $methodB) {
+        usort($methods, static function(MethodGenerator $methodA, MethodGenerator $methodB) {
             return $methodA->getName() <=> $methodB->getName();
         });
 
@@ -1412,11 +1412,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 = [
@@ -1425,12 +1425,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);
@@ -1490,8 +1490,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'
                 );
             }
         }
@@ -1772,10 +1772,10 @@ 
             $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

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

src/SchemaVersionControl/SchemaBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
                 $foreignColumns = [$foreignColumns];
             }
         }
-        $options = array_diff_key($constraintDesc, ['column' => 0,'columns' => 0,'references' => 0]);
+        $options = array_diff_key($constraintDesc, ['column' => 0, 'columns' => 0, 'references' => 0]);
         $table->addForeignKeyConstraint($foreignTable, $localColumns, $foreignColumns, $options, $name);
     }
 
@@ -153,7 +153,7 @@ 
             $name = implode('_', $columns);
         }
 
-        $options = array_diff_key($indexDesc, ['column' => 0,'columns' => 0]);
+        $options = array_diff_key($indexDesc, ['column' => 0, 'columns' => 0]);
         if (isset($indexDesc['unique']) && $indexDesc['unique'] === true) {
             $table->addUniqueIndex($columns, $name, [], $options);
         } else {

src/Utils/TDBMDaoGenerator.php

Spacing +14 added lines, -14 removed lines

@@ -93,11 +93,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);
         });
 
@@ -178,7 +178,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);
 
@@ -240,7 +240,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);
 
@@ -278,7 +278,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;
     }
 
     /**
@@ -289,7 +289,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) {
@@ -298,7 +298,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);
@@ -363,7 +363,7 @@ 
 
         $constructorMethod = new MethodGenerator(
             '__construct',
-            [ new ParameterGenerator('container', ContainerInterface::class) ],
+            [new ParameterGenerator('container', ContainerInterface::class)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->container = $container;'
         );
@@ -379,7 +379,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);
@@ -392,7 +392,7 @@ 
 BODY;
 
             $getterMethod = new MethodGenerator(
-                'get' . $daoClassName,
+                'get'.$daoClassName,
                 [],
                 MethodGenerator::FLAG_PUBLIC,
                 $getterBody
@@ -404,10 +404,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);
@@ -427,7 +427,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);
         }

tests/TDBMAbstractServiceTest.php

Spacing +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
 
         $db->table('users')
             ->addAnnotation('AddTrait', ['name' => TestUserTrait::class], false)
-            ->addAnnotation('AddTrait', ['name' => TestOtherUserTrait::class, 'modifiers' => ['\\' . TestOtherUserTrait::class . '::method1 insteadof \\' . TestUserTrait::class, '\\' . TestUserTrait::class . '::method1 as method1renamed']], false)
+            ->addAnnotation('AddTrait', ['name' => TestOtherUserTrait::class, 'modifiers' => ['\\'.TestOtherUserTrait::class.'::method1 insteadof \\'.TestUserTrait::class, '\\'.TestUserTrait::class.'::method1 as method1renamed']], false)
             ->addAnnotation('AddTraitOnDao', ['name' => TestUserDaoTrait::class], false)
             ->implementsInterface(TestUserInterface::class)
             ->implementsInterfaceOnDao(TestUserDaoInterface::class)