thecodingmachine / tdbm

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

Spacing +30 added lines, -30 removed lines

@@ -214,7 +214,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();
         });
 
@@ -229,7 +229,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();
         });
 
@@ -243,7 +243,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();
         });
 
@@ -349,7 +349,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;
             }
@@ -398,7 +398,7 @@ 
             $assigns[] = $property->assignToDefaultCode()."\n";
         }
 
-        $body = $parentConstructorCode . implode('', $assigns);
+        $body = $parentConstructorCode.implode('', $assigns);
 
         $constructor->setBody($body);
 
@@ -515,7 +515,7 @@ 
         foreach ($this->getExposedProperties() as $beanPropertyDescriptor) {
             $propertyCode = $beanPropertyDescriptor->getJsonSerializeCode();
             if (!empty($propertyCode)) {
-                $body .= PHP_EOL . $propertyCode;
+                $body .= PHP_EOL.$propertyCode;
             }
         }
 
@@ -523,11 +523,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);
 
@@ -622,7 +622,7 @@ 
         /** @var AddInterface[] $addInterfaceAnnotations */
         $addInterfaceAnnotations = $this->annotationParser->getTableAnnotations($this->table)->findAnnotations(AddInterface::class);
 
-        $interfaces = [ JsonSerializable::class ];
+        $interfaces = [JsonSerializable::class];
         foreach ($addInterfaceAnnotations as $annotation) {
             $interfaces[] = $annotation->getName();
         }
@@ -662,7 +662,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) {
@@ -810,7 +810,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.'
@@ -822,7 +822,7 @@ 
 
         $saveMethod = new MethodGenerator(
             'save',
-            [ new ParameterGenerator('obj', $beanClassName) ],
+            [new ParameterGenerator('obj', $beanClassName)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->tdbmService->save($obj);',
             (new DocBlockGenerator(
@@ -856,7 +856,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);
@@ -870,7 +870,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);
@@ -886,7 +886,7 @@ 
                 'getById',
                 $parameters,
                 MethodGenerator::FLAG_PUBLIC,
-                "return \$this->tdbmService->findObjectByPk('$tableName', [" . implode(', ', $primaryKeyFilter) . "], [], \$$lazyLoadingParameterName, '\\$beanClassName');",
+                "return \$this->tdbmService->findObjectByPk('$tableName', [".implode(', ', $primaryKeyFilter)."], [], \$$lazyLoadingParameterName, '\\$beanClassName');",
                 (new DocBlockGenerator(
                     "Get $beanClassWithoutNameSpace specified by its ID (its primary key).",
                     'If the primary key does not exist, an exception is thrown.',
@@ -963,7 +963,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);
@@ -1005,7 +1005,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);
@@ -1040,7 +1040,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);
@@ -1174,7 +1174,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);
@@ -1230,7 +1230,7 @@ 
                 }
             }
         }
-        usort($methods, static function (MethodGenerator $methodA, MethodGenerator $methodB) {
+        usort($methods, static function(MethodGenerator $methodA, MethodGenerator $methodB) {
             return $methodA->getName() <=> $methodB->getName();
         });
 
@@ -1379,11 +1379,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 = [
@@ -1392,12 +1392,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);
@@ -1714,17 +1714,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);
     }