doctrine / orm

tools/sandbox/index.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 use Entities\Address;
 use Entities\User;
 
-$em = require_once __DIR__ . '/bootstrap.php';
+$em = require_once __DIR__.'/bootstrap.php';
 
 ## PUT YOUR TEST CODE BELOW
 
 $user = new User;
 $address = new Address;
 
-echo 'Hello World!' . PHP_EOL;
+echo 'Hello World!'.PHP_EOL;

tools/sandbox/bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
 
 // Path to composer autoloader. You can use different provided by your favorite framework,
 // if you want to.
-$loaderPath = __DIR__ . '/../../vendor/autoload.php';
-if(!is_readable($loaderPath)){
+$loaderPath = __DIR__.'/../../vendor/autoload.php';
+if ( ! is_readable($loaderPath)) {
     throw new LogicException('Run php composer.phar install at first');
 }
 $loader = require $loaderPath;
@@ -19,7 +19,7 @@ 
 $config = new \Doctrine\ORM\Configuration();
 
 // Set up Metadata Drivers
-$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__ . "/Entities"));
+$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__."/Entities"));
 $config->setMetadataDriverImpl($driverImpl);
 
 // Set up caches, depending on $debug variable.
@@ -29,7 +29,7 @@ 
 $config->setQueryCacheImpl($cache);
 
 // Proxy configuration
-$config->setProxyDir(__DIR__ . '/Proxies');
+$config->setProxyDir(__DIR__.'/Proxies');
 $config->setProxyNamespace('Proxies');
 
 // Database connection information

lib/Shitty/ORM/Query/Parser.php

Spacing +14 added lines, -14 removed lines

@@ -396,7 +396,7 @@ 
             $this->queryComponents = $treeWalkerChain->getQueryComponents();
         }
 
-        $outputWalkerClass = $this->customOutputWalker ?: __NAMESPACE__ . '\SqlWalker';
+        $outputWalkerClass = $this->customOutputWalker ?: __NAMESPACE__.'\SqlWalker';
         $outputWalker      = new $outputWalkerClass($this->query, $this->parserResult, $this->queryComponents);
 
         // Assign an SQL executor to the parser result
@@ -491,7 +491,7 @@ 
         $tokenStr = substr($dql, $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL()));
     }
@@ -638,7 +638,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -690,13 +690,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->name.".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->name . " must contain the identifier.",
+                    "The partial field selection of class ".$class->name." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -767,7 +767,7 @@ 
             // Check if field or association exists
             if ( ! isset($class->associationMappings[$field]) && ! isset($class->fieldMappings[$field])) {
                 $this->semanticalError(
-                    'Class ' . $class->name . ' has no field or association named ' . $field,
+                    'Class '.$class->name.' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -807,8 +807,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= (count($expectedStringTypes) == 1)
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -981,7 +981,7 @@ 
 
             list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']);
 
-            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
         }
 
         return $schemaName;
@@ -996,7 +996,7 @@ 
      */
     private function validateAbstractSchemaName($schemaName)
     {
-        if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
+        if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
             $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token);
         }
     }
@@ -1052,7 +1052,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1066,7 +1066,7 @@ 
         $class = $qComp['metadata'];
 
         if ( ! $class->hasAssociation($field)) {
-            $this->semanticalError('Class ' . $class->name . ' has no association named ' . $field);
+            $this->semanticalError('Class '.$class->name.' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2488,7 +2488,7 @@ 
         // Peek beyond the matching closing parenthesis ')'
         $peek = $this->peekBeyondClosingParenthesis();
 
-        if (in_array($peek['value'], array("=",  "<", "<=", "<>", ">", ">=", "!=")) ||
+        if (in_array($peek['value'], array("=", "<", "<=", "<>", ">", ">=", "!=")) ||
             in_array($peek['type'], array(Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS)) ||
             $this->isMathOperator($peek)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
@@ -2593,7 +2593,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

lib/Shitty/ORM/Query/Expr.php

Spacing +8 added lines, -8 removed lines

@@ -268,7 +268,7 @@ 
      */
     public function countDistinct($x)
     {
-        return 'COUNT(DISTINCT ' . implode(', ', func_get_args()) . ')';
+        return 'COUNT(DISTINCT '.implode(', ', func_get_args()).')';
     }
 
     /**
@@ -450,7 +450,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' IN', (array) $y);
+        return new Expr\Func($x.' IN', (array) $y);
     }
 
     /**
@@ -471,7 +471,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' NOT IN', (array) $y);
+        return new Expr\Func($x.' NOT IN', (array) $y);
     }
 
     /**
@@ -483,7 +483,7 @@ 
      */
     public function isNull($x)
     {
-        return $x . ' IS NULL';
+        return $x.' IS NULL';
     }
 
     /**
@@ -495,7 +495,7 @@ 
      */
     public function isNotNull($x)
     {
-        return $x . ' IS NOT NULL';
+        return $x.' IS NOT NULL';
     }
 
     /**
@@ -613,12 +613,12 @@ 
      */
     private function _quoteLiteral($literal)
     {
-        if (is_numeric($literal) && !is_string($literal)) {
+        if (is_numeric($literal) && ! is_string($literal)) {
             return (string) $literal;
         } else if (is_bool($literal)) {
             return $literal ? "true" : "false";
         } else {
-            return "'" . str_replace("'", "''", $literal) . "'";
+            return "'".str_replace("'", "''", $literal)."'";
         }
     }
 
@@ -633,7 +633,7 @@ 
      */
     public function between($val, $x, $y)
     {
-        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
+        return $val.' BETWEEN '.$x.' AND '.$y;
     }
 
     /**

lib/Shitty/ORM/Query/Lexer.php

Spacing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
             // Recognize identifiers, aliased or qualified names
             case (ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\'):
-                $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
+                $name = 'Doctrine\ORM\Query\Lexer::T_'.strtoupper($value);
 
                 if (defined($name)) {
                     $type = constant($name);

lib/Shitty/ORM/Query/QueryException.php

Spacing +13 added lines, -13 removed lines

@@ -49,7 +49,7 @@ 
      */
     public static function syntaxError($message, $previous = null)
     {
-        return new self('[Syntax Error] ' . $message, 0, $previous);
+        return new self('[Syntax Error] '.$message, 0, $previous);
     }
 
     /**
@@ -60,7 +60,7 @@ 
      */
     public static function semanticalError($message, $previous = null)
     {
-        return new self('[Semantical Error] ' . $message, 0, $previous);
+        return new self('[Semantical Error] '.$message, 0, $previous);
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     public static function invalidParameterType($expected, $received)
     {
-        return new self('Invalid parameter type, ' . $received . ' given, but ' . $expected . ' expected.');
+        return new self('Invalid parameter type, '.$received.' given, but '.$expected.' expected.');
     }
 
     /**
@@ -89,7 +89,7 @@ 
      */
     public static function invalidParameterPosition($pos)
     {
-        return new self('Invalid parameter position: ' . $pos);
+        return new self('Invalid parameter position: '.$pos);
     }
 
     /**
@@ -100,7 +100,7 @@ 
      */
     public static function tooManyParameters($expected, $received)
     {
-        return new self('Too many parameters: the query defines ' . $expected . ' parameters and you bound ' . $received);
+        return new self('Too many parameters: the query defines '.$expected.' parameters and you bound '.$received);
     }
 
     /**
@@ -111,7 +111,7 @@ 
      */
     public static function tooFewParameters($expected, $received)
     {
-        return new self('Too few parameters: the query defines ' . $expected . ' parameters but you only bound ' . $received);
+        return new self('Too few parameters: the query defines '.$expected.' parameters but you only bound '.$received);
     }
 
     /**
@@ -150,7 +150,7 @@ 
     public static function invalidPathExpression($pathExpr)
     {
         return new self(
-            "Invalid PathExpression '" . $pathExpr->identificationVariable . "." . $pathExpr->field . "'."
+            "Invalid PathExpression '".$pathExpr->identificationVariable.".".$pathExpr->field."'."
         );
     }
 
@@ -183,8 +183,8 @@ 
     public static function partialObjectsAreDangerous()
     {
         return new self(
-            "Loading partial objects is dangerous. Fetch full objects or consider " .
-            "using a different fetch mode. If you really want partial objects, " .
+            "Loading partial objects is dangerous. Fetch full objects or consider ".
+            "using a different fetch mode. If you really want partial objects, ".
             "set the doctrine.forcePartialLoad query hint to TRUE."
         );
     }
@@ -222,8 +222,8 @@ 
     public static function iterateWithFetchJoinNotAllowed($assoc)
     {
         return new self(
-            "Iterate with fetch join in class " . $assoc['sourceEntity'] .
-            " using association " . $assoc['fieldName'] . " not allowed."
+            "Iterate with fetch join in class ".$assoc['sourceEntity'].
+            " using association ".$assoc['fieldName']." not allowed."
         );
     }
 
@@ -247,7 +247,7 @@ 
      */
     public static function instanceOfUnrelatedClass($className, $rootClass)
     {
-        return new self("Cannot check if a child of '" . $rootClass . "' is instanceof '" . $className . "', " .
+        return new self("Cannot check if a child of '".$rootClass."' is instanceof '".$className."', ".
             "inheritance hierarchy does not exists between these two classes.");
     }
 
@@ -259,7 +259,7 @@ 
     public static function invalidQueryComponent($dqlAlias)
     {
         return new self(
-            "Invalid query component given for DQL alias '" . $dqlAlias . "', ".
+            "Invalid query component given for DQL alias '".$dqlAlias."', ".
             "requires 'metadata', 'parent', 'relation', 'map', 'nestingLevel' and 'token' keys."
         );
     }

lib/Shitty/ORM/Query/ResultSetMappingBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -204,7 +204,7 @@ 
     {
         switch ($mode) {
             case self::COLUMN_RENAMING_INCREMENT:
-                return $columnName . $this->sqlCounter++;
+                return $columnName.$this->sqlCounter++;
 
             case self::COLUMN_RENAMING_CUSTOM:
                 return isset($customRenameColumns[$columnName])
@@ -327,19 +327,19 @@ 
         $counter        = 0;
         $resultMapping  = $class->getSqlResultSetMapping($resultSetMappingName);
         $rootShortName  = $class->reflClass->getShortName();
-        $rootAlias      = strtolower($rootShortName[0]) . $counter;
+        $rootAlias      = strtolower($rootShortName[0]).$counter;
 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityMapping) {
-                $classMetadata  = $this->em->getClassMetadata($entityMapping['entityClass']);
+                $classMetadata = $this->em->getClassMetadata($entityMapping['entityClass']);
 
                 if ($class->reflClass->name == $classMetadata->reflClass->name) {
                     $this->addEntityResult($classMetadata->name, $rootAlias);
                     $this->addNamedNativeQueryEntityResultMapping($classMetadata, $entityMapping, $rootAlias);
                 } else {
                     $shortName      = $classMetadata->reflClass->getShortName();
-                    $joinAlias      = strtolower($shortName[0]) . ++ $counter;
+                    $joinAlias      = strtolower($shortName[0]).++ $counter;
                     $associations   = $class->getAssociationsByTargetClass($classMetadata->name);
 
                     $this->addNamedNativeQueryEntityResultMapping($classMetadata, $entityMapping, $joinAlias);
@@ -387,7 +387,7 @@ 
             $this->addMetaResult($alias, $discriminatorColumn, $discriminatorColumn, false, $discriminatorType);
         }
 
-        if (isset($entityMapping['fields']) && !empty($entityMapping['fields'])) {
+        if (isset($entityMapping['fields']) && ! empty($entityMapping['fields'])) {
             foreach ($entityMapping['fields'] as $field) {
                 $fieldName = $field['name'];
                 $relation  = null;
@@ -449,7 +449,7 @@ 
                 $sql .= ", ";
             }
 
-            $sql .= $tableAlias . ".";
+            $sql .= $tableAlias.".";
 
             if (isset($this->fieldMappings[$columnName])) {
                 $class = $this->em->getClassMetadata($this->declaringClasses[$columnName]);
@@ -460,7 +460,7 @@ 
                 $sql .= $this->discriminatorColumns[$dqlAlias];
             }
 
-            $sql .= " AS " . $columnName;
+            $sql .= " AS ".$columnName;
         }
 
         return $sql;

lib/Shitty/ORM/Query/Exec/MultiTableDeleteExecutor.php

Spacing +7 added lines, -7 removed lines

@@ -77,8 +77,8 @@ 
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 't0', $primaryDqlAlias);
 
-        $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')'
-                . ' SELECT t0.' . implode(', t0.', $idColumnNames);
+        $this->_insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnList.')'
+                . ' SELECT t0.'.implode(', t0.', $idColumnNames);
 
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $primaryDqlAlias);
         $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array())));
@@ -90,14 +90,14 @@ 
         }
 
         // 2. Create ID subselect statement used in DELETE ... WHERE ... IN (subselect)
-        $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable;
+        $idSubselect = 'SELECT '.$idColumnList.' FROM '.$tempTable;
 
         // 3. Create and store DELETE statements
         $classNames = array_merge($primaryClass->parentClasses, array($primaryClass->name), $primaryClass->subClasses);
         foreach (array_reverse($classNames) as $className) {
             $tableName = $quoteStrategy->getTableName($em->getClassMetadata($className), $platform);
-            $this->_sqlStatements[] = 'DELETE FROM ' . $tableName
-                    . ' WHERE (' . $idColumnList . ') IN (' . $idSubselect . ')';
+            $this->_sqlStatements[] = 'DELETE FROM '.$tableName
+                    . ' WHERE ('.$idColumnList.') IN ('.$idSubselect.')';
         }
 
         // 4. Store DDL for temporary identifier table.
@@ -108,8 +108,8 @@ 
                 'type'    => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)),
             );
         }
-        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
         $this->_dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }
 

lib/Shitty/ORM/Query/Exec/MultiTableUpdateExecutor.php

Spacing +7 added lines, -7 removed lines

@@ -88,8 +88,8 @@ 
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 't0', $updateClause->aliasIdentificationVariable);
 
-        $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')'
-                . ' SELECT t0.' . implode(', t0.', $idColumnNames);
+        $this->_insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnList.')'
+                . ' SELECT t0.'.implode(', t0.', $idColumnNames);
 
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $updateClause->aliasIdentificationVariable);
         $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array())));
@@ -97,7 +97,7 @@ 
         $this->_insertSql .= $sqlWalker->walkFromClause($fromClause);
 
         // 2. Create ID subselect statement used in UPDATE ... WHERE ... IN (subselect)
-        $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable;
+        $idSubselect = 'SELECT '.$idColumnList.' FROM '.$tempTable;
 
         // 3. Create and store UPDATE statements
         $classNames = array_merge($primaryClass->parentClasses, array($primaryClass->name), $primaryClass->subClasses);
@@ -106,7 +106,7 @@ 
         foreach (array_reverse($classNames) as $className) {
             $affected = false;
             $class = $em->getClassMetadata($className);
-            $updateSql = 'UPDATE ' . $quoteStrategy->getTableName($class, $platform) . ' SET ';
+            $updateSql = 'UPDATE '.$quoteStrategy->getTableName($class, $platform).' SET ';
 
             foreach ($updateItems as $updateItem) {
                 $field = $updateItem->pathExpression->field;
@@ -133,7 +133,7 @@ 
             }
 
             if ($affected) {
-                $this->_sqlStatements[$i] = $updateSql . ' WHERE (' . $idColumnList . ') IN (' . $idSubselect . ')';
+                $this->_sqlStatements[$i] = $updateSql.' WHERE ('.$idColumnList.') IN ('.$idSubselect.')';
             }
         }
 
@@ -152,8 +152,8 @@ 
             );
         }
 
-        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->_dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }