fabarea / vidi

Classes/Persistence/Storage/VidiDbBackend.php

Spacing +44 added lines, -44 removed lines

@@ -127,7 +127,7 @@ 
         $fieldNames = array_keys($identifier);
         $suffixedFieldNames = [];
         foreach ($fieldNames as $fieldName) {
-            $suffixedFieldNames[] = $fieldName . '=?';
+            $suffixedFieldNames[] = $fieldName.'=?';
         }
         return implode(' AND ', $suffixedFieldNames);
     }
@@ -188,7 +188,7 @@ 
             if (isset($statementParts['keywords']['distinct'])) {
                 unset($statementParts['keywords']['distinct']);
                 $distinctField = $this->query->getDistinct() ? $this->query->getDistinct() : 'uid';
-                $statementParts['fields'] = array('COUNT(DISTINCT ' . reset($statementParts['tables']) . '.' . $distinctField . ')');
+                $statementParts['fields'] = array('COUNT(DISTINCT '.reset($statementParts['tables']).'.'.$distinctField.')');
             }
 
             $statement = $this->buildQuery($statementParts);
@@ -258,14 +258,14 @@ 
             // tx_domain_model_foo0 (the alias) <--> tx_domain_model_foo (the origin table name)
             $values = [];
             foreach ($statementParts['fields'] as $key => $value) {
-                $values[$key] = str_replace($tableName, $tableName . '0', $value);
+                $values[$key] = str_replace($tableName, $tableName.'0', $value);
             }
             $statementParts['fields'] = $values;
 
             // Same comment as above.
             $values = [];
             foreach ($statementParts['where'] as $key => $value) {
-                $values[$key] = str_replace($tableName . '0', $tableName, $value);
+                $values[$key] = str_replace($tableName.'0', $tableName, $value);
             }
             $statementParts['where'] = $values;
 
@@ -304,25 +304,25 @@ 
         if (!empty($statementParts['unions'])) {
             foreach ($statementParts['unions'] as $tableName => $unionPart) {
                 if (!empty($statementParts['additionalWhereClause'][$tableName])) {
-                    $statementParts['unions'][$tableName] .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
+                    $statementParts['unions'][$tableName] .= ' AND '.implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
                 }
             }
         }
 
-        $statement = 'SELECT ' . implode(' ', $statementParts['keywords']) . ' ' . implode(',', $statementParts['fields']) . ' FROM ' . implode(' ', $statementParts['tables']) . ' ' . implode(' ', $statementParts['unions']);
+        $statement = 'SELECT '.implode(' ', $statementParts['keywords']).' '.implode(',', $statementParts['fields']).' FROM '.implode(' ', $statementParts['tables']).' '.implode(' ', $statementParts['unions']);
         if (!empty($statementParts['where'])) {
-            $statement .= ' WHERE ' . implode('', $statementParts['where']);
+            $statement .= ' WHERE '.implode('', $statementParts['where']);
             if (!empty($statementParts['additionalWhereClause'][$this->query->getType()])) {
-                $statement .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+                $statement .= ' AND '.implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
             }
         } elseif (!empty($statementParts['additionalWhereClause'])) {
-            $statement .= ' WHERE ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+            $statement .= ' WHERE '.implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
         }
         if (!empty($statementParts['orderings'])) {
-            $statement .= ' ORDER BY ' . implode(', ', $statementParts['orderings']);
+            $statement .= ' ORDER BY '.implode(', ', $statementParts['orderings']);
         }
         if (!empty($statementParts['limit'])) {
-            $statement .= ' LIMIT ' . $statementParts['limit'];
+            $statement .= ' LIMIT '.$statementParts['limit'];
         }
 
         return $statement;
@@ -339,10 +339,10 @@ 
     {
         if ($source instanceof SelectorInterface) {
             $tableName = $source->getNodeTypeName();
-            $sql['fields'][$tableName] = $tableName . '.*';
+            $sql['fields'][$tableName] = $tableName.'.*';
             $sql['tables'][$tableName] = $tableName;
             if ($this->query->getDistinct()) {
-                $sql['fields'][$tableName] = $tableName . '.' . $this->query->getDistinct();
+                $sql['fields'][$tableName] = $tableName.'.'.$this->query->getDistinct();
                 $sql['keywords']['distinct'] = 'DISTINCT';
             }
         } elseif ($source instanceof JoinInterface) {
@@ -367,15 +367,15 @@ 
             $rightTableName = $rightSource->getLeft()->getSelectorName();
         } else {
             $rightTableName = $rightSource->getSelectorName();
-            $sql['fields'][$leftTableName] = $rightTableName . '.*';
+            $sql['fields'][$leftTableName] = $rightTableName.'.*';
         }
         $sql['tables'][$leftTableName] = $leftTableName;
-        $sql['unions'][$rightTableName] = 'LEFT JOIN ' . $rightTableName;
+        $sql['unions'][$rightTableName] = 'LEFT JOIN '.$rightTableName;
         $joinCondition = $join->getJoinCondition();
         if ($joinCondition instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\EquiJoinCondition) {
             $column1Name = $joinCondition->getProperty1Name();
             $column2Name = $joinCondition->getProperty2Name();
-            $sql['unions'][$rightTableName] .= ' ON ' . $joinCondition->getSelector1Name() . '.' . $column1Name . ' = ' . $joinCondition->getSelector2Name() . '.' . $column2Name;
+            $sql['unions'][$rightTableName] .= ' ON '.$joinCondition->getSelector1Name().'.'.$column1Name.' = '.$joinCondition->getSelector2Name().'.'.$column2Name;
         }
         if ($rightSource instanceof JoinInterface) {
             $this->parseJoin($rightSource, $sql);
@@ -513,7 +513,7 @@ 
             if ($realInput instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
                 return $realInput->getUid();
             } else {
-                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "' . get_class($realInput) . '" could not be converted to a plain value.', 1274799934);
+                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "'.get_class($realInput).'" could not be converted to a plain value.', 1274799934);
             }
         } elseif (is_bool($input)) {
             return $input === true ? 1 : 0;
@@ -558,9 +558,9 @@ 
             $operator = $this->resolveOperator($operator);
             $constraintSQL = '';
             if ($valueFunction === null) {
-                $constraintSQL .= (!empty($tableName) ? $tableName . '.' : '') . $columnName . ' ' . $operator . ' ?';
+                $constraintSQL .= (!empty($tableName) ? $tableName.'.' : '').$columnName.' '.$operator.' ?';
             } else {
-                $constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName . ') ' . $operator . ' ?';
+                $constraintSQL .= $valueFunction.'('.(!empty($tableName) ? $tableName.'.' : '').$columnName.') '.$operator.' ?';
             }
 
             if (isset($tableName) && !empty($this->currentChildTableNameAlias)) {
@@ -590,7 +590,7 @@ 
         // to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
         $parts = explode('.', $propertyPath, 3);
         if ($table->field($fieldName)->isGroup() && count($parts) > 2) {
-            $explodedPropertyPath[0] = $parts[0] . '.' . $parts[1];
+            $explodedPropertyPath[0] = $parts[0].'.'.$parts[1];
             $explodedPropertyPath[1] = $parts[2];
             $fieldName = $explodedPropertyPath[0];
         }
@@ -599,16 +599,16 @@ 
         $childTableName = $table->field($fieldName)->getForeignTable();
 
         if ($childTableName === null) {
-            throw new Exception\InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
+            throw new Exception\InvalidRelationConfigurationException('The relation information for property "'.$fieldName.'" of class "'.$tableName.'" is missing.', 1353170925);
         }
 
         if ($table->field($fieldName)->hasOne()) { // includes relation "one-to-one" and "many-to-one"
             // sometimes the opposite relation is not defined. We don't want to force this config for backward compatibility reasons.
             // $parentKeyFieldName === null does the trick somehow. Before condition was if (isset($parentKeyFieldName))
             if ($table->field($fieldName)->hasRelationManyToOne() || $parentKeyFieldName === null) {
-                $sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.' . $fieldName . '=' . $childTableName . '.uid';
+                $sql['unions'][$childTableName] = 'LEFT JOIN '.$childTableName.' ON '.$tableName.'.'.$fieldName.'='.$childTableName.'.uid';
             } else {
-                $sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.uid=' . $childTableName . '.' . $parentKeyFieldName;
+                $sql['unions'][$childTableName] = 'LEFT JOIN '.$childTableName.' ON '.$tableName.'.uid='.$childTableName.'.'.$parentKeyFieldName;
             }
         } elseif ($table->field($fieldName)->hasRelationManyToMany()) {
             $relationTableName = $table->field($fieldName)->getManyToManyTable();
@@ -773,11 +773,11 @@ 
                     foreach ($parameter as $item) {
                         $items[] = $this->databaseHandle->fullQuoteStr($item, $tableName);
                     }
-                    $parameter = '(' . implode(',', $items) . ')';
+                    $parameter = '('.implode(',', $items).')';
                 } else {
                     $parameter = $this->databaseHandle->fullQuoteStr($parameter, $tableName);
                 }
-                $sqlString = substr($sqlString, 0, $markPosition) . $parameter . substr($sqlString, ($markPosition + 1));
+                $sqlString = substr($sqlString, 0, $markPosition).$parameter.substr($sqlString, ($markPosition + 1));
             }
             $offset = $markPosition + strlen($parameter);
         }
@@ -878,18 +878,18 @@ 
         // If the table is found to have "workspace" support, add the corresponding fields in the statement.
         if (Tca::table($tableName)->hasWorkspaceSupport()) {
             if ($this->getBackendUser()->workspace === 0) {
-                $statement .= ' AND ' . $tableName . '.t3ver_state<=' . new VersionState(VersionState::DEFAULT_STATE);
+                $statement .= ' AND '.$tableName.'.t3ver_state<='.new VersionState(VersionState::DEFAULT_STATE);
             } else {
                 // Show only records of live and of the current workspace
                 // In case we are in a Versioning preview
-                $statement .= ' AND (' .
-                    $tableName . '.t3ver_wsid=0 OR ' .
-                    $tableName . '.t3ver_wsid=' . (int)$this->getBackendUser()->workspace .
+                $statement .= ' AND ('.
+                    $tableName.'.t3ver_wsid=0 OR '.
+                    $tableName.'.t3ver_wsid='.(int)$this->getBackendUser()->workspace.
                     ')';
             }
 
             // Check if this segment make sense here or whether it should be in the "if" part when we have workspace = 0
-            $statement .= ' AND ' . $tableName . '.pid<>-1';
+            $statement .= ' AND '.$tableName.'.pid<>-1';
         }
 
         if (!$includeDeleted) {
@@ -915,25 +915,25 @@ 
         if (is_array($GLOBALS['TCA'][$tableName]['ctrl'])) {
             if (!empty($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])) {
                 // Select all entries for the current language
-                $additionalWhereClause = $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' IN (' . intval($querySettings->getLanguageUid()) . ',-1)';
+                $additionalWhereClause = $tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].' IN ('.intval($querySettings->getLanguageUid()).',-1)';
                 // If any language is set -> get those entries which are not translated yet
                 // They will be removed by t3lib_page::getRecordOverlay if not matching overlay mode
                 if (isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
                     && $querySettings->getLanguageUid() > 0
                 ) {
-                    $additionalWhereClause .= ' OR (' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0' .
-                        ' AND ' . $tableNameOrAlias . '.uid NOT IN (SELECT ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] .
-                        ' FROM ' . $tableName .
-                        ' WHERE ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] . '>0' .
-                        ' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '>0';
+                    $additionalWhereClause .= ' OR ('.$tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'=0'.
+                        ' AND '.$tableNameOrAlias.'.uid NOT IN (SELECT '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'].
+                        ' FROM '.$tableName.
+                        ' WHERE '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'].'>0'.
+                        ' AND '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'>0';
 
                     // Add delete clause to ensure all entries are loaded
                     if (isset($GLOBALS['TCA'][$tableName]['ctrl']['delete'])) {
-                        $additionalWhereClause .= ' AND ' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['delete'] . '=0';
+                        $additionalWhereClause .= ' AND '.$tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['delete'].'=0';
                     }
                     $additionalWhereClause .= '))';
                 }
-                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = '(' . $additionalWhereClause . ')';
+                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = '('.$additionalWhereClause.')';
             }
         }
     }
@@ -978,7 +978,7 @@ 
     protected function parseLimitAndOffset($limit, $offset, array &$sql)
     {
         if ($limit !== null && $offset !== null) {
-            $sql['limit'] = intval($offset) . ', ' . intval($limit);
+            $sql['limit'] = intval($offset).', '.intval($limit);
         } elseif ($limit !== null) {
             $sql['limit'] = intval($limit);
         }
@@ -1045,10 +1045,10 @@ 
                 && $row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] > 0
             ) {
                 $row = $this->databaseHandle->exec_SELECTgetSingleRow(
-                    $tableName . '.*',
+                    $tableName.'.*',
                     $tableName,
-                    $tableName . '.uid=' . (int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] .
-                    ' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0'
+                    $tableName.'.uid='.(int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']].
+                    ' AND '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'=0'
                 );
             }
         }
@@ -1107,7 +1107,7 @@ 
         }
 
         $numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
-        $tableNameAlias = $tableName . $numberOfAliases;
+        $tableNameAlias = $tableName.$numberOfAliases;
 
         $this->tableNameAliases['aliasIncrement'][$tableName]++;
         $this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;
@@ -1186,7 +1186,7 @@ 
     {
         $error = $this->databaseHandle->sql_error();
         if ($error !== '') {
-            $error .= $sql ? ': ' . $sql : '';
+            $error .= $sql ? ': '.$sql : '';
             throw new \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\SqlErrorException($error, 1247602160);
         }
     }