thecodingmachine / tdbm

src/QueryFactory/AbstractQueryFactory.php

Spacing +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
         if (strlen($alias) <= 30) { // Older oracle version had a limit of 30 characters for identifiers
             return $alias;
         }
-        return substr($columnName, 0, 20) . crc32($tableName.'____'.$columnName);
+        return substr($columnName, 0, 20).crc32($tableName.'____'.$columnName);
     }
 
     abstract protected function compute(): void;

src/TDBMSchemaAnalyzer.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
     public function getIncomingForeignKeys(string $tableName): array
     {
         $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
-        $junctionTableNames = array_map(function (Table $table) {
+        $junctionTableNames = array_map(function(Table $table) {
             return $table->getName();
         }, $junctionTables);
         $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName);

src/Commands/GenerateCommand.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
         $fromLock = (bool) $input->getOption('from-lock');
 
-        $loggers = [ new ConsoleLogger($output) ];
+        $loggers = [new ConsoleLogger($output)];
 
         $logger = $alteredConf->getLogger();
         if ($logger) {

src/Utils/StringUtils.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     public static function getValidVariableName(string $variableName): string
     {
-        $valid = preg_replace_callback('/^(\d+)/', static function (array $match) {
+        $valid = preg_replace_callback('/^(\d+)/', static function(array $match) {
             $f = new \NumberFormatter('en', \NumberFormatter::SPELLOUT);
             $number = $f->format((int) $match[0]);
             return preg_replace('/[^a-z]+/i', '_', $number);

src/Utils/AbstractBeanPropertyDescriptor.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
      */
     public function getParamAnnotation(): ParamTag
     {
-        return new ParamTag($this->getSafeVariableName(), [ $this->getPhpType() ]);
+        return new ParamTag($this->getSafeVariableName(), [$this->getPhpType()]);
     }
 
     public function getVariableName(): string
@@ -77,7 +77,7 @@ 
 
     public function getSafeVariableName(): string
     {
-        return '$' . StringUtils::getValidVariableName(ltrim($this->getVariableName(), '$'));
+        return '$'.StringUtils::getValidVariableName(ltrim($this->getVariableName(), '$'));
     }
 
     public function getSetterName(): string

src/Utils/Logs/LevelFilter.php

Spacing +6 added lines, -6 removed lines

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

src/Utils/PivotTableMethodsDescriptor.php

Spacing +10 added lines, -10 removed lines

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

src/Utils/ObjectBeanPropertyDescriptor.php

Spacing +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
      */
     public function getPhpType(): string
     {
-        return '\\' . $this->beanNamespace . '\\' . $this->getClassName();
+        return '\\'.$this->beanNamespace.'\\'.$this->getClassName();
     }
 
     /**
@@ -168,17 +168,17 @@ 
         $referencedResultIteratorName = $this->namingStrategy->getResultIteratorClassName($foreignTableName);
 
         $getter = new MethodGenerator($getterName);
-        $getter->setDocBlock(new DocBlockGenerator('Returns the ' . $referencedBeanName . ' object bound to this object via the ' . implode(' and ', $this->foreignKey->getUnquotedLocalColumns()) . ' column.'));
+        $getter->setDocBlock(new DocBlockGenerator('Returns the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getUnquotedLocalColumns()).' column.'));
 
-        $getter->setReturnType(($isNullable ? '?' : '') . $this->beanNamespace . '\\' . $referencedBeanName);
+        $getter->setReturnType(($isNullable ? '?' : '').$this->beanNamespace.'\\'.$referencedBeanName);
         $tdbmFk = ForeignKey::createFromFk($this->foreignKey);
 
         $getter->setBody(sprintf(
             'return $this->getRef(%s, %s, %s, %s);',
             var_export($tdbmFk->getCacheKey(), true),
             var_export($tableName, true),
-            '\\' . $this->beanNamespace . '\\' . $referencedBeanName . '::class',
-            '\\' . $this->resultIteratorNamespace . '\\' . $referencedResultIteratorName . '::class'
+            '\\'.$this->beanNamespace.'\\'.$referencedBeanName.'::class',
+            '\\'.$this->resultIteratorNamespace.'\\'.$referencedResultIteratorName.'::class'
         ));
 
         if ($this->isGetterProtected()) {
@@ -187,9 +187,9 @@ 
 
         if (!$this->isReadOnly()) {
             $setter = new MethodGenerator($setterName);
-            $setter->setDocBlock(new DocBlockGenerator('The setter for the ' . $referencedBeanName . ' object bound to this object via the ' . implode(' and ', $this->foreignKey->getUnquotedLocalColumns()) . ' column.'));
+            $setter->setDocBlock(new DocBlockGenerator('The setter for the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getUnquotedLocalColumns()).' column.'));
 
-            $setter->setParameter(new ParameterGenerator('object', ($isNullable ? '?' : '') . $this->beanNamespace . '\\' . $referencedBeanName));
+            $setter->setParameter(new ParameterGenerator('object', ($isNullable ? '?' : '').$this->beanNamespace.'\\'.$referencedBeanName));
 
             $setter->setReturnType('void');
 
@@ -198,8 +198,8 @@ 
                 var_export($tdbmFk->getCacheKey(), true),
                 '$object',
                 var_export($tableName, true),
-                '\\' . $this->beanNamespace . '\\' . $referencedBeanName . '::class',
-                '\\' . $this->resultIteratorNamespace . '\\' . $referencedResultIteratorName . '::class'
+                '\\'.$this->beanNamespace.'\\'.$referencedBeanName.'::class',
+                '\\'.$this->resultIteratorNamespace.'\\'.$referencedResultIteratorName.'::class'
             ));
 
             if ($this->isSetterProtected()) {
@@ -239,7 +239,7 @@ 
             /** @var Annotation\JsonFormat|null $jsonFormat */
             $jsonFormat = $this->findAnnotation(Annotation\JsonFormat::class);
             if ($jsonFormat !== null) {
-                $method = $jsonFormat->method ?? 'get' . ucfirst($jsonFormat->property);
+                $method = $jsonFormat->method ?? 'get'.ucfirst($jsonFormat->property);
                 $format = "$method()";
             } else {
                 $stopRecursion = $this->findAnnotation(Annotation\JsonRecursive::class) ? '' : 'true';
@@ -295,10 +295,10 @@ 
             } elseif ($descriptor instanceof ScalarBeanPropertyDescriptor) {
                 $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";
             } else {
-                throw new TDBMException('PropertyDescriptor of class `' . get_class($descriptor) . '` cannot be serialized.');
+                throw new TDBMException('PropertyDescriptor of class `'.get_class($descriptor).'` cannot be serialized.');
             }
         }
-        return '[' . implode(', ', $rows) . ']';
+        return '['.implode(', ', $rows).']';
     }
 
     private function getBeanPropertyDescriptor(string $column): AbstractBeanPropertyDescriptor
@@ -311,7 +311,7 @@ 
                 return $descriptor;
             }
         }
-        throw new TDBMException('PropertyDescriptor for `'.$this->table->getName().'`.`' . $column . '` not found in `' . $this->foreignBeanDescriptor->getTable()->getName() . '`');
+        throw new TDBMException('PropertyDescriptor for `'.$this->table->getName().'`.`'.$column.'` not found in `'.$this->foreignBeanDescriptor->getTable()->getName().'`');
     }
 
     /**

tests/TDBMServiceTest.php

Spacing +5 added lines, -5 removed lines

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