@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | $needle = $prevEntityAlias . "_" . $currentEntityAlias; |
103 | 103 | |
104 | - return ! in_array($needle, $this->joins); |
|
104 | + return !in_array($needle, $this->joins); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | private function storeJoin($prevEntityAlias, $currentEntityAlias) |
@@ -222,12 +222,12 @@ discard block |
||
222 | 222 | |
223 | 223 | if ($filtering->hasOperator()) { |
224 | 224 | if ('list' == $filtering->getOperator()) { |
225 | - $whereCondition = $this->entityAlias.'.'.$fieldName.' '. |
|
225 | + $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . |
|
226 | 226 | $op->getMeta() |
227 | - .' (:field_'.$fieldName . $salt . ')'; |
|
227 | + .' (:field_' . $fieldName . $salt . ')'; |
|
228 | 228 | } else if ('field_eq' == $filtering->getOperator()) { |
229 | 229 | $whereCondition = |
230 | - $this->entityAlias . '.' . $fieldName . ' '. |
|
230 | + $this->entityAlias . '.' . $fieldName . ' ' . |
|
231 | 231 | $op->getMeta() . ' ' . |
232 | 232 | $this->entityAlias . '.' . $value |
233 | 233 | ; |
@@ -236,9 +236,9 @@ discard block |
||
236 | 236 | $op->getMeta() . ' :field_' . $fieldName . $salt; |
237 | 237 | } |
238 | 238 | } else { |
239 | - $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . |
|
239 | + $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . |
|
240 | 240 | $op->getMeta() . |
241 | - ' ' . ':field_' . $fieldName . $salt; |
|
241 | + ' ' . ':field_' . $fieldName . $salt; |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | $this->qBuilder->andWhere($whereCondition); |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | } else { |
260 | 260 | $isNotARelation = 0 !== strpos($fieldName, 'Embedded.'); |
261 | 261 | if ($isNotARelation) { |
262 | - $whereCondition = $this->entityAlias.'.'.$fieldName.' '. |
|
262 | + $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . |
|
263 | 263 | $op->getMeta() |
264 | 264 | .' ' . $this->entityAlias . '.' . $value; |
265 | 265 | $this->qBuilder->andWhere($whereCondition); |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $relationEntityAlias = $this->getRelationEntityAlias(); |
273 | 273 | |
274 | 274 | $embeddedFields = explode('.', $fieldName); |
275 | - $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
275 | + $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
276 | 276 | |
277 | 277 | $salt = ''; |
278 | 278 | foreach ($this->qBuilder->getParameters() as $parameter) { |
@@ -284,11 +284,11 @@ discard block |
||
284 | 284 | if ($filtering->hasOperator() && 'list' == $filtering->getOperator()) { |
285 | 285 | $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . |
286 | 286 | $op->getMeta() . |
287 | - ' (:field_'.$fieldName . $salt . ')'; |
|
287 | + ' (:field_' . $fieldName . $salt . ')'; |
|
288 | 288 | } else { |
289 | 289 | $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . |
290 | 290 | $op->getMeta() . |
291 | - ' :field_'.$fieldName . $salt; |
|
291 | + ' :field_' . $fieldName . $salt; |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | $this->qBuilder->andWhere($whereCondition); |
@@ -328,12 +328,12 @@ discard block |
||
328 | 328 | |
329 | 329 | if ($filtering->hasOperator()) { |
330 | 330 | if ('list' == $filtering->getOperator()) { |
331 | - $whereCondition = $this->entityAlias.'.'.$fieldName.' '. |
|
331 | + $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . |
|
332 | 332 | $op->getMeta() |
333 | - .' (:field_'.$fieldName . $salt . ')'; |
|
333 | + .' (:field_' . $fieldName . $salt . ')'; |
|
334 | 334 | } else if ('field_eq' == $filtering->getOperator()) { |
335 | 335 | $whereCondition = |
336 | - $this->entityAlias . '.' . $fieldName . ' '. |
|
336 | + $this->entityAlias . '.' . $fieldName . ' ' . |
|
337 | 337 | $op->getMeta() |
338 | 338 | . '' . |
339 | 339 | $this->entityAlias . '.' . $value |
@@ -343,12 +343,12 @@ discard block |
||
343 | 343 | //'Oops! Eccezzione' |
344 | 344 | //); |
345 | 345 | } else { |
346 | - $whereCondition = $this->entityAlias.'.'.$fieldName.' '. |
|
346 | + $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . |
|
347 | 347 | $op->getMeta() |
348 | - .' :field_'.$fieldName . $salt; |
|
348 | + .' :field_' . $fieldName . $salt; |
|
349 | 349 | } |
350 | 350 | } else { |
351 | - $whereCondition = $this->entityAlias.'.'.$fieldName.' = :field_'.$fieldName . $salt; |
|
351 | + $whereCondition = $this->entityAlias . '.' . $fieldName . ' = :field_' . $fieldName . $salt; |
|
352 | 352 | } |
353 | 353 | |
354 | 354 | if ($orCondition['orCondition'] != null) { |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | } else { |
377 | 377 | $isNotARelation = 0 !== strpos($fieldName, 'Embedded.'); |
378 | 378 | if ($isNotARelation) { |
379 | - $whereCondition = $this->entityAlias.'.'.$fieldName.' '. |
|
379 | + $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . |
|
380 | 380 | $op->getMeta() |
381 | 381 | .' ' . $this->entityAlias . '.' . $value; |
382 | 382 | if ($orCondition['orCondition'] != null) { |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | $relationEntityAlias = $this->getRelationEntityAlias(); |
396 | 396 | |
397 | 397 | $embeddedFields = explode('.', $fieldName); |
398 | - $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
398 | + $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
399 | 399 | |
400 | 400 | $salt = ''; |
401 | 401 | foreach ($this->qBuilder->getParameters() as $parameter) { |
@@ -405,13 +405,13 @@ discard block |
||
405 | 405 | } |
406 | 406 | |
407 | 407 | if ($filtering->hasOperator() && 'list' == $filtering->getOperator()) { |
408 | - $whereCondition = $relationEntityAlias.'.'.$fieldName.' '. |
|
408 | + $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . |
|
409 | 409 | $op->getMeta() |
410 | - .' (:field_'.$fieldName . $salt . ')'; |
|
410 | + .' (:field_' . $fieldName . $salt . ')'; |
|
411 | 411 | } else { |
412 | - $whereCondition = $relationEntityAlias.'.'.$fieldName.' '. |
|
412 | + $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . |
|
413 | 413 | $op->getMeta() |
414 | - .' :field_'.$fieldName . $salt; |
|
414 | + .' :field_' . $fieldName . $salt; |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | if ($orCondition['orCondition'] != null) { |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | |
463 | 463 | if (in_array($fieldName, $this->fields)) { |
464 | 464 | $direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
465 | - $this->qBuilder->addOrderBy($this->entityAlias .'.'. $fieldName, $direction); |
|
465 | + $this->qBuilder->addOrderBy($this->entityAlias . '.' . $fieldName, $direction); |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | if (strstr($sort, '_embedded.')) { |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | $fieldName = $this->parser->camelize($embeddedFields[2]); |
474 | 474 | $direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
475 | 475 | |
476 | - $this->qBuilder->addOrderBy($relationEntityAlias.'.'.$fieldName, $direction); |
|
476 | + $this->qBuilder->addOrderBy($relationEntityAlias . '.' . $fieldName, $direction); |
|
477 | 477 | } |
478 | 478 | |
479 | 479 | } |