thecodingmachine / tdbm

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/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/BeanDescriptor.php

Spacing +33 added lines, -33 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);
 
@@ -631,10 +631,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;
         }
 
@@ -673,7 +673,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) {
@@ -801,7 +801,7 @@ 
         $interfaces = [];
         foreach ($addInterfaceOnDaoAnnotations as $annotation) {
             /** @phpstan-var class-string $className */
-            $className =  $annotation->getName();
+            $className = $annotation->getName();
             $interfaces[] = $className;
         }
 
@@ -823,7 +823,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.'
@@ -835,7 +835,7 @@ 
 
         $saveMethod = new MethodGenerator(
             'save',
-            [ new ParameterGenerator('obj', $beanClassName) ],
+            [new ParameterGenerator('obj', $beanClassName)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->tdbmService->save($obj);',
             (new DocBlockGenerator(
@@ -869,7 +869,7 @@ 
             $findAllBody,
             (new DocBlockGenerator("Get all $beanClassWithoutNameSpace records."))->setWordWrap(false)
         );
-        $findAllMethod->setReturnType($this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName());
+        $findAllMethod->setReturnType($this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName());
         $findAllMethod = $this->codeGeneratorListener->onBaseDaoFindAllGenerated($findAllMethod, $this, $this->configuration, $class);
         if ($findAllMethod !== null) {
             $class->addMethodFromGenerator($findAllMethod);
@@ -883,7 +883,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);
@@ -899,7 +899,7 @@ 
                 'getById',
                 $parameters,
                 MethodGenerator::FLAG_PUBLIC,
-                "return \$this->tdbmService->findObjectByPk('$tableName', [" . implode(', ', $primaryKeyFilter) . "], [], \$$lazyLoadingParameterName);",
+                "return \$this->tdbmService->findObjectByPk('$tableName', [".implode(', ', $primaryKeyFilter)."], [], \$$lazyLoadingParameterName);",
                 (new DocBlockGenerator(
                     "Get $beanClassWithoutNameSpace specified by its ID (its primary key).",
                     'If the primary key does not exist, an exception is thrown.',
@@ -976,7 +976,7 @@ 
                 ]
             ))->setWordWrap(false)
         );
-        $findMethod->setReturnType($this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName());
+        $findMethod->setReturnType($this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName());
         $findMethod = $this->codeGeneratorListener->onBaseDaoFindGenerated($findMethod, $this, $this->configuration, $class);
         if ($findMethod !== null) {
             $class->addMethodFromGenerator($findMethod);
@@ -1018,7 +1018,7 @@ 
                 ]
             ))->setWordWrap(false)
         );
-        $findFromSqlMethod->setReturnType($this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName());
+        $findFromSqlMethod->setReturnType($this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName());
         $findFromSqlMethod = $this->codeGeneratorListener->onBaseDaoFindFromSqlGenerated($findFromSqlMethod, $this, $this->configuration, $class);
         if ($findFromSqlMethod !== null) {
             $class->addMethodFromGenerator($findFromSqlMethod);
@@ -1053,7 +1053,7 @@ 
                 ]
             ))->setWordWrap(false)
         );
-        $findFromRawSqlMethod->setReturnType($this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName());
+        $findFromRawSqlMethod->setReturnType($this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName());
         $findFromRawSqlMethod = $this->codeGeneratorListener->onBaseDaoFindFromRawSqlGenerated($findFromRawSqlMethod, $this, $this->configuration, $class);
         if ($findFromRawSqlMethod !== null) {
             $class->addMethodFromGenerator($findFromRawSqlMethod);
@@ -1187,7 +1187,7 @@ 
         $class->setDocBlock((new DocBlockGenerator(
             "The $baseClassName class will iterate over results of $beanClassWithoutNameSpace class.",
             null,
-            [new Tag\MethodTag('getIterator', ['\\' . $beanClassName . '[]'])]
+            [new Tag\MethodTag('getIterator', ['\\'.$beanClassName.'[]'])]
         ))->setWordWrap(false));
 
         $file = $this->codeGeneratorListener->onBaseResultIteratorGenerated($file, $this, $this->configuration);
@@ -1243,7 +1243,7 @@ 
                 }
             }
         }
-        usort($methods, static function (MethodGenerator $methodA, MethodGenerator $methodB) {
+        usort($methods, static function(MethodGenerator $methodA, MethodGenerator $methodB) {
             return $methodA->getName() <=> $methodB->getName();
         });
 
@@ -1392,11 +1392,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 = [
@@ -1405,12 +1405,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);
@@ -1727,17 +1727,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);
     }