@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function add($arg) |
88 | 88 | { |
89 | - if ( $arg !== null && (!$arg instanceof self || $arg->count() > 0) ) { |
|
89 | + if ($arg !== null && ( ! $arg instanceof self || $arg->count() > 0)) { |
|
90 | 90 | // If we decide to keep Expr\Base instances, we can use this check |
91 | 91 | if ( ! is_string($arg)) { |
92 | 92 | $class = get_class($arg); |
@@ -119,6 +119,6 @@ discard block |
||
119 | 119 | return (string) $this->parts[0]; |
120 | 120 | } |
121 | 121 | |
122 | - return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator; |
|
122 | + return $this->preSeparator.implode($this->separator, $this->parts).$this->postSeparator; |
|
123 | 123 | } |
124 | 124 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | public function add($sort, $order = null) |
76 | 76 | { |
77 | 77 | $order = ! $order ? 'ASC' : $order; |
78 | - $this->parts[] = $sort . ' '. $order; |
|
78 | + $this->parts[] = $sort.' '.$order; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -99,6 +99,6 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function __tostring() |
101 | 101 | { |
102 | - return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator; |
|
102 | + return $this->preSeparator.implode($this->separator, $this->parts).$this->postSeparator; |
|
103 | 103 | } |
104 | 104 | } |
@@ -86,7 +86,7 @@ |
||
86 | 86 | */ |
87 | 87 | public function __toString() |
88 | 88 | { |
89 | - return $this->from . ' ' . $this->alias . |
|
90 | - ($this->indexBy ? ' INDEX BY ' . $this->indexBy : ''); |
|
89 | + return $this->from.' '.$this->alias. |
|
90 | + ($this->indexBy ? ' INDEX BY '.$this->indexBy : ''); |
|
91 | 91 | } |
92 | 92 | } |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause() |
78 | 78 | $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 't0', $primaryDqlAlias); |
79 | 79 | |
80 | - $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')' |
|
81 | - . ' SELECT t0.' . implode(', t0.', $idColumnNames); |
|
80 | + $this->_insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnList.')' |
|
81 | + . ' SELECT t0.'.implode(', t0.', $idColumnNames); |
|
82 | 82 | |
83 | 83 | $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $primaryDqlAlias); |
84 | 84 | $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array()))); |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | } |
91 | 91 | |
92 | 92 | // 2. Create ID subselect statement used in DELETE ... WHERE ... IN (subselect) |
93 | - $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable; |
|
93 | + $idSubselect = 'SELECT '.$idColumnList.' FROM '.$tempTable; |
|
94 | 94 | |
95 | 95 | // 3. Create and store DELETE statements |
96 | 96 | $classNames = array_merge($primaryClass->parentClasses, array($primaryClass->name), $primaryClass->subClasses); |
97 | 97 | foreach (array_reverse($classNames) as $className) { |
98 | 98 | $tableName = $quoteStrategy->getTableName($em->getClassMetadata($className), $platform); |
99 | - $this->_sqlStatements[] = 'DELETE FROM ' . $tableName |
|
100 | - . ' WHERE (' . $idColumnList . ') IN (' . $idSubselect . ')'; |
|
99 | + $this->_sqlStatements[] = 'DELETE FROM '.$tableName |
|
100 | + . ' WHERE ('.$idColumnList.') IN ('.$idSubselect.')'; |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | // 4. Store DDL for temporary identifier table. |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | 'type' => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)), |
109 | 109 | ); |
110 | 110 | } |
111 | - $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' (' |
|
112 | - . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')'; |
|
111 | + $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' (' |
|
112 | + . $platform->getColumnDeclarationListSQL($columnDefinitions).')'; |
|
113 | 113 | $this->_dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable); |
114 | 114 | } |
115 | 115 |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause() |
89 | 89 | $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 't0', $updateClause->aliasIdentificationVariable); |
90 | 90 | |
91 | - $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')' |
|
92 | - . ' SELECT t0.' . implode(', t0.', $idColumnNames); |
|
91 | + $this->_insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnList.')' |
|
92 | + . ' SELECT t0.'.implode(', t0.', $idColumnNames); |
|
93 | 93 | |
94 | 94 | $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $updateClause->aliasIdentificationVariable); |
95 | 95 | $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array()))); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $this->_insertSql .= $sqlWalker->walkFromClause($fromClause); |
98 | 98 | |
99 | 99 | // 2. Create ID subselect statement used in UPDATE ... WHERE ... IN (subselect) |
100 | - $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable; |
|
100 | + $idSubselect = 'SELECT '.$idColumnList.' FROM '.$tempTable; |
|
101 | 101 | |
102 | 102 | // 3. Create and store UPDATE statements |
103 | 103 | $classNames = array_merge($primaryClass->parentClasses, array($primaryClass->name), $primaryClass->subClasses); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | foreach (array_reverse($classNames) as $className) { |
107 | 107 | $affected = false; |
108 | 108 | $class = $em->getClassMetadata($className); |
109 | - $updateSql = 'UPDATE ' . $quoteStrategy->getTableName($class, $platform) . ' SET '; |
|
109 | + $updateSql = 'UPDATE '.$quoteStrategy->getTableName($class, $platform).' SET '; |
|
110 | 110 | |
111 | 111 | foreach ($updateItems as $updateItem) { |
112 | 112 | $field = $updateItem->pathExpression->field; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | |
135 | 135 | if ($affected) { |
136 | - $this->_sqlStatements[$i] = $updateSql . ' WHERE (' . $idColumnList . ') IN (' . $idSubselect . ')'; |
|
136 | + $this->_sqlStatements[$i] = $updateSql.' WHERE ('.$idColumnList.') IN ('.$idSubselect.')'; |
|
137 | 137 | } |
138 | 138 | } |
139 | 139 | |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | ); |
153 | 153 | } |
154 | 154 | |
155 | - $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' (' |
|
156 | - . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')'; |
|
155 | + $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' (' |
|
156 | + . $platform->getColumnDeclarationListSQL($columnDefinitions).')'; |
|
157 | 157 | |
158 | 158 | $this->_dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable); |
159 | 159 | } |
@@ -65,7 +65,7 @@ |
||
65 | 65 | */ |
66 | 66 | public function startProduction($name) |
67 | 67 | { |
68 | - $this->println('(' . $name); |
|
68 | + $this->println('('.$name); |
|
69 | 69 | $this->_indent++; |
70 | 70 | } |
71 | 71 |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $expressionList[] = $this->dispatch($child); |
115 | 115 | } |
116 | 116 | |
117 | - switch($expr->getType()) { |
|
117 | + switch ($expr->getType()) { |
|
118 | 118 | case CompositeExpression::TYPE_AND: |
119 | 119 | return new Expr\Andx($expressionList); |
120 | 120 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | return new Expr\Orx($expressionList); |
123 | 123 | |
124 | 124 | default: |
125 | - throw new \RuntimeException("Unknown composite " . $expr->getType()); |
|
125 | + throw new \RuntimeException("Unknown composite ".$expr->getType()); |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | |
@@ -136,10 +136,10 @@ discard block |
||
136 | 136 | throw new QueryException('No aliases are set before invoking walkComparison().'); |
137 | 137 | } |
138 | 138 | |
139 | - $field = $this->queryAliases[0] . '.' . $comparison->getField(); |
|
139 | + $field = $this->queryAliases[0].'.'.$comparison->getField(); |
|
140 | 140 | |
141 | - foreach($this->queryAliases as $alias) { |
|
142 | - if(strpos($comparison->getField() . '.', $alias . '.') === 0) { |
|
141 | + foreach ($this->queryAliases as $alias) { |
|
142 | + if (strpos($comparison->getField().'.', $alias.'.') === 0) { |
|
143 | 143 | $field = $comparison->getField(); |
144 | 144 | break; |
145 | 145 | } |
@@ -149,13 +149,13 @@ discard block |
||
149 | 149 | |
150 | 150 | foreach ($this->parameters as $parameter) { |
151 | 151 | if ($parameter->getName() === $parameterName) { |
152 | - $parameterName .= '_' . count($this->parameters); |
|
152 | + $parameterName .= '_'.count($this->parameters); |
|
153 | 153 | break; |
154 | 154 | } |
155 | 155 | } |
156 | 156 | |
157 | 157 | $parameter = new Parameter($parameterName, $this->walkValue($comparison->getValue())); |
158 | - $placeholder = ':' . $parameterName; |
|
158 | + $placeholder = ':'.$parameterName; |
|
159 | 159 | |
160 | 160 | switch ($comparison->getOperator()) { |
161 | 161 | case Comparison::IN: |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | |
183 | 183 | return $this->expr->neq($field, $placeholder); |
184 | 184 | case Comparison::CONTAINS: |
185 | - $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType()); |
|
185 | + $parameter->setValue('%'.$parameter->getValue().'%', $parameter->getType()); |
|
186 | 186 | $this->parameters[] = $parameter; |
187 | 187 | |
188 | 188 | return $this->expr->like($field, $placeholder); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | ); |
199 | 199 | } |
200 | 200 | |
201 | - throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator()); |
|
201 | + throw new \RuntimeException("Unknown comparison operator: ".$comparison->getOperator()); |
|
202 | 202 | } |
203 | 203 | } |
204 | 204 |
@@ -21,7 +21,6 @@ |
||
21 | 21 | |
22 | 22 | use Doctrine\Common\Collections\ArrayCollection; |
23 | 23 | use Doctrine\Common\Collections\Criteria; |
24 | - |
|
25 | 24 | use Doctrine\ORM\Query\Expr; |
26 | 25 | use Doctrine\ORM\Query\QueryExpressionVisitor; |
27 | 26 |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | */ |
101 | 101 | final public function getParameter($name) |
102 | 102 | { |
103 | - if (!isset($this->parameters[$name])) { |
|
104 | - throw new \InvalidArgumentException("Parameter '" . $name . "' does not exist."); |
|
103 | + if ( ! isset($this->parameters[$name])) { |
|
104 | + throw new \InvalidArgumentException("Parameter '".$name."' does not exist."); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | return $this->em->getConnection()->quote($this->parameters[$name]['value'], $this->parameters[$name]['type']); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | */ |
117 | 117 | final public function hasParameter($name) |
118 | 118 | { |
119 | - if (!isset($this->parameters[$name])) { |
|
119 | + if ( ! isset($this->parameters[$name])) { |
|
120 | 120 | return false; |
121 | 121 | } |
122 | 122 |
@@ -41,7 +41,7 @@ |
||
41 | 41 | */ |
42 | 42 | public function getRepository(EntityManagerInterface $entityManager, $entityName) |
43 | 43 | { |
44 | - $repositoryHash = $entityManager->getClassMetadata($entityName)->getName() . spl_object_hash($entityManager); |
|
44 | + $repositoryHash = $entityManager->getClassMetadata($entityName)->getName().spl_object_hash($entityManager); |
|
45 | 45 | |
46 | 46 | if (isset($this->repositoryList[$repositoryHash])) { |
47 | 47 | return $this->repositoryList[$repositoryHash]; |