thecodingmachine / tdbm

src/QueryFactory/FindObjectsFromSqlQueryFactory.php

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 
         // Let's compute the COUNT.
         $pkColumnNames = $this->tdbmService->getPrimaryKeyColumns($this->mainTable);
-        $pkColumnNames = array_map(function ($pkColumn) use ($mySqlPlatform) {
+        $pkColumnNames = array_map(function($pkColumn) use ($mySqlPlatform) {
             return $mySqlPlatform->quoteIdentifier($this->mainTable).'.'.$mySqlPlatform->quoteIdentifier($pkColumn);
         }, $pkColumnNames);
 
@@ -115,7 +115,7 @@ 
      */
     private function getParentRelationshipForeignKeys(string $tableName): array
     {
-        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
+        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function() use ($tableName) {
             return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
         });
     }
@@ -144,7 +144,7 @@ 
      */
     private function getChildrenRelationshipForeignKeys(string $tableName): array
     {
-        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
+        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function() use ($tableName) {
             return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
         });
     }
@@ -159,7 +159,7 @@ 
         $children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
 
         if (!empty($children)) {
-            $fksTables = array_map(function (ForeignKeyConstraint $fk) {
+            $fksTables = array_map(function(ForeignKeyConstraint $fk) {
                 return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
             }, $children);
 

src/TDBMService.php

Spacing +18 added lines, -18 removed lines

@@ -367,10 +367,10 @@ 
 
                     $localTableName = $incomingFk->getLocalTableName();
 
-                    $className = $this->beanNamespace . '\\' . $this->namingStrategy->getBeanClassName($localTableName);
+                    $className = $this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($localTableName);
                     assert(class_exists($className));
 
-                    $resultIteratorClassName = $this->resultIteratorNamespace . '\\' . $this->namingStrategy->getResultIteratorClassName($localTableName);
+                    $resultIteratorClassName = $this->resultIteratorNamespace.'\\'.$this->namingStrategy->getResultIteratorClassName($localTableName);
                     assert(class_exists($resultIteratorClassName));
 
                     $results = $this->findObjects(
@@ -440,7 +440,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];
@@ -1019,7 +1019,7 @@ 
 
         return $this->fromCache(
             $this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
-            function () use ($tables) {
+            function() use ($tables) {
                 return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
             }
         );
@@ -1067,7 +1067,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);
         });
     }
@@ -1156,7 +1156,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)) {
@@ -1193,7 +1193,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)) {
@@ -1226,8 +1226,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);
 
@@ -1284,7 +1284,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);
     }
@@ -1306,18 +1306,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;
         }
@@ -1341,7 +1341,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);
     }
@@ -1362,7 +1362,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)) {
@@ -1393,7 +1393,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);
@@ -1506,7 +1506,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());
 

src/Utils/DirectForeignKeyMethodDescriptor.php

Spacing +11 added lines, -11 removed lines

@@ -70,9 +70,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());
 
@@ -137,23 +137,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);
@@ -163,7 +163,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'
             );
         }
 
@@ -173,7 +173,7 @@ 
             $getter->setVisibility(AbstractMemberGenerator::VISIBILITY_PROTECTED);
         }
 
-        return [ $getter ];
+        return [$getter];
     }
 
     private function getFilters(ForeignKeyConstraint $fk): string
@@ -245,7 +245,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';
@@ -254,7 +254,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;";

src/Utils/ScalarBeanPropertyDescriptor.php

Spacing +6 added lines, -6 removed lines

@@ -163,7 +163,7 @@ 
                 'time',
                 'time_immutable',
             ], true)) {
-                if ($default !== null && in_array(strtoupper($default), ['CURRENT_TIMESTAMP' /* MySQL */, 'NOW()' /* PostgreSQL */, 'SYSDATE' /* Oracle */ , 'CURRENT_TIMESTAMP()' /* MariaDB 10.3 */], true)) {
+                if ($default !== null && in_array(strtoupper($default), ['CURRENT_TIMESTAMP' /* MySQL */, 'NOW()' /* PostgreSQL */, 'SYSDATE' /* Oracle */, 'CURRENT_TIMESTAMP()' /* MariaDB 10.3 */], true)) {
                     $defaultCode = 'new \DateTimeImmutable()';
                 } else {
                     throw new TDBMException('Unable to set default value for date in "'.$this->table->getName().'.'.$this->column->getName().'". Database passed this default value: "'.$default.'"');
@@ -187,7 +187,7 @@ 
             case 'v4':
                 return 'Uuid::uuid4()->toString()';
             default:
-                throw new TDBMException('@UUID annotation accepts either "v1" or "v4" parameter. Unexpected parameter: ' . $comment);
+                throw new TDBMException('@UUID annotation accepts either "v1" or "v4" parameter. Unexpected parameter: '.$comment);
         }
     }
 
@@ -235,7 +235,7 @@ 
             $resourceTypeCheck = sprintf($resourceTypeCheck, $checkNullable, $variableName, $variableName);
         }
 
-        $types = [ $normalizedType ];
+        $types = [$normalizedType];
         if ($isNullable) {
             $types[] = 'null';
         }
@@ -338,11 +338,11 @@ 
                             break;
                         }
                     }
-                    $args = array_map(function ($v) {
+                    $args = array_map(function($v) {
                         return var_export($v, true);
                     }, $args);
-                    $args = empty($args) ? '' : ', ' . implode(', ', $args);
-                    $unit = $jsonFormat->unit ? ' . ' . var_export($jsonFormat->unit, true) : '';
+                    $args = empty($args) ? '' : ', '.implode(', ', $args);
+                    $unit = $jsonFormat->unit ? ' . '.var_export($jsonFormat->unit, true) : '';
                     if ($this->column->getNotnull()) {
                         return "\$array['$index'] = number_format(\$this->$getter()$args)$unit;";
                     } else {

src/AbstractTDBMObject.php

Spacing +2 added lines, -2 removed lines

@@ -258,7 +258,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);
@@ -522,7 +522,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/NoBeanFoundException.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */
     public static function missPrimaryKeyRecord(string $tableName, array $primaryKeys, string $className, Exception $previous): self
     {
-        $primaryKeysStringified = implode(' and ', array_map(function ($key, $value) {
+        $primaryKeysStringified = implode(' and ', array_map(function($key, $value) {
             return "'".$key."' = ".$value;
         }, array_keys($primaryKeys), $primaryKeys));
         $exception = new self("No result found for query on table '".$tableName."' for ".$primaryKeysStringified, 0, $previous);