thecodingmachine / tdbm

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

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,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;
@@ -56,7 +56,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
@@ -79,7 +79,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
@@ -99,7 +99,7 @@ 
     {
         $params = [];
         foreach ($primaryKeys as $key => $primaryKeyValue) {
-            $params['param' . $key] = $primaryKeyValue;
+            $params['param'.$key] = $primaryKeyValue;
         }
         return $params;
     }

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().'`');
     }
 
     /**

src/Utils/BeanDescriptor.php

Spacing +30 added lines, -30 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,7 +631,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();
         }
@@ -671,7 +671,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) {
@@ -821,7 +821,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.'
@@ -833,7 +833,7 @@ 
 
         $saveMethod = new MethodGenerator(
             'save',
-            [ new ParameterGenerator('obj', $beanClassName) ],
+            [new ParameterGenerator('obj', $beanClassName)],
             MethodGenerator::FLAG_PUBLIC,
             '$this->tdbmService->save($obj);',
             (new DocBlockGenerator(
@@ -881,7 +881,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);
@@ -897,7 +897,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.',
@@ -1185,14 +1185,14 @@ 
             $class->addUse(ResultIterator::class);
             $class->setExtendedClass(ResultIterator::class);
         } else {
-            $class->addUse($this->resultIteratorNamespace . '\\' . $extends);
+            $class->addUse($this->resultIteratorNamespace.'\\'.$extends);
             $class->setExtendedClass($extends);
         }
 
         $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);
@@ -1248,7 +1248,7 @@ 
                 }
             }
         }
-        usort($methods, static function (MethodGenerator $methodA, MethodGenerator $methodB) {
+        usort($methods, static function(MethodGenerator $methodA, MethodGenerator $methodB) {
             return $methodA->getName() <=> $methodB->getName();
         });
 
@@ -1397,11 +1397,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 = [
@@ -1410,12 +1410,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);
@@ -1475,8 +1475,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'
                 );
             }
         }
@@ -1750,17 +1750,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/Utils/DirectForeignKeyMethodDescriptor.php

Spacing +11 added lines, -11 removed lines

@@ -77,9 +77,9 @@ 
     public function getName() : string
     {
         if (!$this->useAlternateName) {
-            return 'get' . $this->getPropertyName();
+            return 'get'.$this->getPropertyName();
         } else {
-            $methodName = 'get' . $this->getPropertyName() . 'By';
+            $methodName = 'get'.$this->getPropertyName().'By';
 
             $camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->foreignKey->getUnquotedLocalColumns());
 
@@ -144,23 +144,23 @@ 
         $getter = new MethodGenerator($this->getName());
 
         if ($this->hasLocalUniqueIndex()) {
-            $classType = '\\' . $this->beanNamespace . '\\' . $beanClass;
+            $classType = '\\'.$this->beanNamespace.'\\'.$beanClass;
             $getterDocBlock = new DocBlockGenerator(sprintf('Returns the %s pointing to this bean via the %s column.', $beanClass, implode(', ', $this->foreignKey->getUnquotedLocalColumns())));
-            $getterDocBlock->setTag([new ReturnTag([$classType . '|null'])]);
+            $getterDocBlock->setTag([new ReturnTag([$classType.'|null'])]);
             $getterDocBlock->setWordWrap(false);
             $getter->setDocBlock($getterDocBlock);
-            $getter->setReturnType('?' . $classType);
+            $getter->setReturnType('?'.$classType);
 
             $code = sprintf(
                 'return $this->retrieveManyToOneRelationshipsStorage(%s, %s, %s, null, %s)->first();',
                 var_export($this->foreignKey->getLocalTableName(), true),
                 var_export($tdbmFk->getCacheKey(), true),
                 $this->getFilters($this->foreignKey),
-                '\\' . $this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName() .'::class'
+                '\\'.$this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName().'::class'
             );
         } else {
             $getterDocBlock = new DocBlockGenerator(sprintf('Returns the list of %s pointing to this bean via the %s column.', $beanClass, implode(', ', $this->foreignKey->getUnquotedLocalColumns())));
-            $getterDocBlock->setTag(new ReturnTag([$beanClass . '[]', '\\' . AlterableResultIterator::class]));
+            $getterDocBlock->setTag(new ReturnTag([$beanClass.'[]', '\\'.AlterableResultIterator::class]));
             $getterDocBlock->setWordWrap(false);
             $getter->setDocBlock($getterDocBlock);
             $getter->setReturnType(AlterableResultIterator::class);
@@ -170,7 +170,7 @@ 
                 var_export($this->foreignKey->getLocalTableName(), true),
                 var_export($tdbmFk->getCacheKey(), true),
                 $this->getFilters($this->foreignKey),
-                '\\' . $this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName() .'::class'
+                '\\'.$this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName().'::class'
             );
         }
 
@@ -180,7 +180,7 @@ 
             $getter->setVisibility(AbstractMemberGenerator::VISIBILITY_PROTECTED);
         }
 
-        return [ $getter ];
+        return [$getter];
     }
 
     private function getFilters(ForeignKeyConstraint $fk) : string
@@ -251,7 +251,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';
@@ -260,7 +260,7 @@ 
         $isIncluded = $this->findAnnotation(Annotation\JsonInclude::class) !== null;
         $index = $jsonCollection->key ?: lcfirst($this->getPropertyName());
         $class = $this->getBeanClassName();
-        $variableName = '$' . TDBMDaoGenerator::toVariableName($class);
+        $variableName = '$'.TDBMDaoGenerator::toVariableName($class);
         $getter = $this->getName();
         if ($this->hasLocalUniqueIndex()) {
             $code = "\$array['$index'] = (\$object = \$this->$getter()) ? \$object->$format : null;";

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

Spacing +2 added lines, -2 removed lines

@@ -253,7 +253,7 @@ 
 
     protected function setRef(string $foreignKeyName, ?AbstractTDBMObject $bean, string $tableName, string $className, string $resultIteratorClass): void
     {
-        assert($bean === null || is_a($bean, $className), new TDBMInvalidArgumentException('$bean should be `null` or `' . $className . '`. `' . ($bean === null ? 'null' : get_class($bean)) . '` provided.'));
+        assert($bean === null || is_a($bean, $className), new TDBMInvalidArgumentException('$bean should be `null` or `'.$className.'`. `'.($bean === null ? 'null' : get_class($bean)).'` provided.'));
 
         if (!isset($this->dbRows[$tableName])) {
             $this->registerTable($tableName);
@@ -515,7 +515,7 @@ 
      */
     protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, array $searchFilter, ?string $orderString, string $resultIteratorClass) : AlterableResultIterator
     {
-        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.'));
         $key = $tableName.'___'.$foreignKeyName;
         $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
         if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {

src/TDBMService.php

Spacing +18 added lines, -18 removed lines

@@ -377,8 +377,8 @@ 
                         null,
                         [],
                         null,
-                        $this->beanNamespace . '\\' . $this->namingStrategy->getBeanClassName($localTableName),
-                        $this->resultIteratorNamespace . '\\' . $this->namingStrategy->getResultIteratorClassName($localTableName)
+                        $this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($localTableName),
+                        $this->resultIteratorNamespace.'\\'.$this->namingStrategy->getResultIteratorClassName($localTableName)
                     );
 
                     foreach ($results as $bean) {
@@ -437,7 +437,7 @@ 
                 }
             }
 
-            return ['(' . implode(') AND (', $sqlParts) . ')', $parameters, $counter];
+            return ['('.implode(') AND (', $sqlParts).')', $parameters, $counter];
         } elseif ($filter_bag instanceof ResultIterator) {
             $subQuery = $filter_bag->_getSubQuery();
             return [$subQuery, [], $counter];
@@ -1015,7 +1015,7 @@ 
 
         return $this->fromCache(
             $this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
-            function () use ($tables) {
+            function() use ($tables) {
                 return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
             }
         );
@@ -1063,7 +1063,7 @@ 
      */
     public function _getRelatedTablesByInheritance(string $table): array
     {
-        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
+        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function() use ($table) {
             return $this->_getRelatedTablesByInheritanceWithoutCache($table);
         });
     }
@@ -1152,7 +1152,7 @@ 
     public function findObjects(string $mainTable, $filter, array $parameters, $orderString, array $additionalTablesFetch, ?int $mode, ?string $className, string $resultIteratorClass): ResultIterator
     {
         if (!is_a($resultIteratorClass, ResultIterator::class, true)) {
-            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.');
+            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.');
         }
         // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
@@ -1189,7 +1189,7 @@ 
     public function findObjectsFromSql(string $mainTable, string $from, $filter, array $parameters, $orderString, ?int $mode, ?string $className, string $resultIteratorClass): ResultIterator
     {
         if (!is_a($resultIteratorClass, ResultIterator::class, true)) {
-            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.');
+            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.');
         }
         // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
@@ -1222,8 +1222,8 @@ 
      */
     public function findObjectByPk(string $table, array $primaryKeys, array $additionalTablesFetch, bool $lazy, string $className, string $resultIteratorClass): AbstractTDBMObject
     {
-        assert(is_a($resultIteratorClass, ResultIterator::class, true), new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.'));
-        assert(is_a($className, AbstractTDBMObject::class, true), new TDBMInvalidArgumentException('$className should be a `'. AbstractTDBMObject::class. '`. `' . $className . '` provided.'));
+        assert(is_a($resultIteratorClass, ResultIterator::class, true), new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.'));
+        assert(is_a($className, AbstractTDBMObject::class, true), new TDBMInvalidArgumentException('$className should be a `'.AbstractTDBMObject::class.'`. `'.$className.'` provided.'));
         $primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
         $hash = $this->getObjectHash($primaryKeys);
 
@@ -1279,7 +1279,7 @@ 
      */
     public function findObject(string $mainTable, $filter, array $parameters, array $additionalTablesFetch, string $className, string $resultIteratorClass) : ?AbstractTDBMObject
     {
-        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.'));
         $objects = $this->findObjects($mainTable, $filter, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className, $resultIteratorClass);
         return $this->getAtMostOneObjectOrFail($objects, $mainTable, $filter, $parameters);
     }
@@ -1301,18 +1301,18 @@ 
         if ($count > 1) {
             $additionalErrorInfos = '';
             if (is_string($filter) && !empty($parameters)) {
-                $additionalErrorInfos = ' for filter "' . $filter.'"';
+                $additionalErrorInfos = ' for filter "'.$filter.'"';
                 foreach ($parameters as $fieldName => $parameter) {
                     if (is_array($parameter)) {
-                        $value = '(' . implode(',', $parameter) . ')';
+                        $value = '('.implode(',', $parameter).')';
                     } else {
                         $value = $parameter;
                     }
-                    $additionalErrorInfos = str_replace(':' . $fieldName, var_export($value, true), $additionalErrorInfos);
+                    $additionalErrorInfos = str_replace(':'.$fieldName, var_export($value, true), $additionalErrorInfos);
                 }
             }
             $additionalErrorInfos .= '.';
-            throw new DuplicateRowException("Error while querying an object in table '$mainTable': More than 1 row have been returned, but we should have received at most one" . $additionalErrorInfos);
+            throw new DuplicateRowException("Error while querying an object in table '$mainTable': More than 1 row have been returned, but we should have received at most one".$additionalErrorInfos);
         } elseif ($count === 0) {
             return null;
         }
@@ -1335,7 +1335,7 @@ 
      */
     public function findObjectFromSql(string $mainTable, string $from, $filter, array $parameters, ?string $className, string $resultIteratorClass) : ?AbstractTDBMObject
     {
-        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.'));
         $objects = $this->findObjectsFromSql($mainTable, $from, $filter, $parameters, null, self::MODE_ARRAY, $className, $resultIteratorClass);
         return $this->getAtMostOneObjectOrFail($objects, $mainTable, $filter, $parameters);
     }
@@ -1356,7 +1356,7 @@ 
     public function findObjectsFromRawSql(string $mainTable, string $sql, array $parameters, ?int $mode, ?string $className, ?string $sqlCount, string $resultIteratorClass): ResultIterator
     {
         if (!is_a($resultIteratorClass, ResultIterator::class, true)) {
-            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'. ResultIterator::class. '`. `' . $resultIteratorClass . '` provided.');
+            throw new TDBMInvalidArgumentException('$resultIteratorClass should be a `'.ResultIterator::class.'`. `'.$resultIteratorClass.'` provided.');
         }
         // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
@@ -1386,7 +1386,7 @@ 
      */
     public function findObjectOrFail(string $mainTable, $filter, array $parameters, array $additionalTablesFetch, string $className, string $resultIteratorClass): AbstractTDBMObject
     {
-        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.'));
         $bean = $this->findObject($mainTable, $filter, $parameters, $additionalTablesFetch, $className, $resultIteratorClass);
         if ($bean === null) {
             throw NoBeanFoundException::missFilterRecord($mainTable);
@@ -1496,7 +1496,7 @@ 
         $table1 = $fks[0]->getForeignTableName();
         $table2 = $fks[1]->getForeignTableName();
 
-        $beanTables = array_map(function (DbRow $dbRow) {
+        $beanTables = array_map(function(DbRow $dbRow) {
             return $dbRow->_getDbTableName();
         }, $bean->_getDbRows());