|
@@ -132,7 +132,7 @@ discard block |
|
|
block discarded – undo |
|
132
|
132
|
|
|
133
|
133
|
$needle = $prevEntityAlias . "_" . $currentEntityAlias; |
|
134
|
134
|
|
|
135
|
|
- return ! in_array($needle, $this->joins); |
|
|
135
|
+ return !in_array($needle, $this->joins); |
|
136
|
136
|
} |
|
137
|
137
|
|
|
138
|
138
|
private function storeJoin($prevEntityAlias, $currentEntityAlias) |
|
@@ -232,7 +232,7 @@ discard block |
|
|
block discarded – undo |
|
232
|
232
|
$fieldName = $this->parser->camelize($filtering->getFieldName()); |
|
233
|
233
|
|
|
234
|
234
|
$operator = Operators::getDefaultOperator(); |
|
235
|
|
- if($filtering->hasOperator()){ |
|
|
235
|
+ if ($filtering->hasOperator()) { |
|
236
|
236
|
$operator = Operators::get($filtering->getOperator()); |
|
237
|
237
|
} |
|
238
|
238
|
|
|
@@ -249,18 +249,18 @@ discard block |
|
|
block discarded – undo |
|
249
|
249
|
|
|
250
|
250
|
if ($filtering->hasOperator()) { |
|
251
|
251
|
if ('list' == $filtering->getOperator()) { |
|
252
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' '.$operator['meta'].' (:field_'.$fieldName . $salt . ')'; |
|
|
252
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' (:field_' . $fieldName . $salt . ')'; |
|
253
|
253
|
} else if ('field_eq' == $filtering->getOperator()) { |
|
254
|
254
|
$whereCondition = |
|
255
|
|
- $this->entityAlias . '.' . $fieldName . ' '. |
|
|
255
|
+ $this->entityAlias . '.' . $fieldName . ' ' . |
|
256
|
256
|
$operator['meta'] . '' . |
|
257
|
257
|
$this->entityAlias . '.' . $value |
|
258
|
258
|
; |
|
259
|
259
|
} else { |
|
260
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' '.$operator['meta'].' :field_'.$fieldName . $salt; |
|
|
260
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' :field_' . $fieldName . $salt; |
|
261
|
261
|
} |
|
262
|
262
|
} else { |
|
263
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' = :field_'.$fieldName . $salt; |
|
|
263
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' = :field_' . $fieldName . $salt; |
|
264
|
264
|
} |
|
265
|
265
|
|
|
266
|
266
|
$this->qBuilder->andWhere($whereCondition); |
|
@@ -281,7 +281,7 @@ discard block |
|
|
block discarded – undo |
|
281
|
281
|
} else { |
|
282
|
282
|
$isNotARelation = 0 !== strpos($fieldName, 'Embedded.'); |
|
283
|
283
|
if ($isNotARelation) { |
|
284
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' '.$operator['meta'].' ' . $this->entityAlias . '.' . $value; |
|
|
284
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' ' . $this->entityAlias . '.' . $value; |
|
285
|
285
|
$this->qBuilder->andWhere($whereCondition); |
|
286
|
286
|
} |
|
287
|
287
|
} |
|
@@ -294,7 +294,7 @@ discard block |
|
|
block discarded – undo |
|
294
|
294
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
295
|
295
|
|
|
296
|
296
|
$embeddedFields = explode('.', $fieldName); |
|
297
|
|
- $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
297
|
+ $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
298
|
298
|
|
|
299
|
299
|
$salt = ''; |
|
300
|
300
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -304,9 +304,9 @@ discard block |
|
|
block discarded – undo |
|
304
|
304
|
} |
|
305
|
305
|
|
|
306
|
306
|
if ($filtering->hasOperator() && 'list' == $filtering->getOperator()) { |
|
307
|
|
- $whereCondition = $relationEntityAlias.'.'.$fieldName.' '.$operator['meta'].' (:field_'.$fieldName . $salt . ')'; |
|
|
307
|
+ $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' (:field_' . $fieldName . $salt . ')'; |
|
308
|
308
|
} else { |
|
309
|
|
- $whereCondition = $relationEntityAlias.'.'.$fieldName.' '.$operator['meta'].' :field_'.$fieldName . $salt; |
|
|
309
|
+ $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' :field_' . $fieldName . $salt; |
|
310
|
310
|
} |
|
311
|
311
|
|
|
312
|
312
|
$this->qBuilder->andWhere($whereCondition); |
|
@@ -334,7 +334,7 @@ discard block |
|
|
block discarded – undo |
|
334
|
334
|
$fieldName = $this->parser->camelize($filtering->getFieldName()); |
|
335
|
335
|
|
|
336
|
336
|
$operator = Operators::getDefaultOperator(); |
|
337
|
|
- if($filtering->hasOperator()) { |
|
|
337
|
+ if ($filtering->hasOperator()) { |
|
338
|
338
|
$operator = Operators::get($filtering->getOperator()); |
|
339
|
339
|
} |
|
340
|
340
|
|
|
@@ -351,18 +351,18 @@ discard block |
|
|
block discarded – undo |
|
351
|
351
|
|
|
352
|
352
|
if ($filtering->hasOperator()) { |
|
353
|
353
|
if ('list' == $filtering->getOperator()) { |
|
354
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' '.$operator['meta'].' (:field_'.$fieldName . $salt . ')'; |
|
|
354
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' (:field_' . $fieldName . $salt . ')'; |
|
355
|
355
|
} else if ('field_eq' == $filtering->getOperator()) { |
|
356
|
356
|
$whereCondition = |
|
357
|
|
- $this->entityAlias . '.' . $fieldName . ' '. |
|
|
357
|
+ $this->entityAlias . '.' . $fieldName . ' ' . |
|
358
|
358
|
$operator['meta'] . '' . |
|
359
|
359
|
$this->entityAlias . '.' . $value |
|
360
|
360
|
; |
|
361
|
361
|
} else { |
|
362
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' '.$operator['meta'].' :field_'.$fieldName . $salt; |
|
|
362
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' :field_' . $fieldName . $salt; |
|
363
|
363
|
} |
|
364
|
364
|
} else { |
|
365
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' = :field_'.$fieldName . $salt; |
|
|
365
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' = :field_' . $fieldName . $salt; |
|
366
|
366
|
} |
|
367
|
367
|
|
|
368
|
368
|
if ($orCondition['orCondition'] != null) { |
|
@@ -390,7 +390,7 @@ discard block |
|
|
block discarded – undo |
|
390
|
390
|
} else { |
|
391
|
391
|
$isNotARelation = 0 !== strpos($fieldName, 'Embedded.'); |
|
392
|
392
|
if ($isNotARelation) { |
|
393
|
|
- $whereCondition = $this->entityAlias.'.'.$fieldName.' '.$operator['meta'].' ' . $this->entityAlias . '.' . $value; |
|
|
393
|
+ $whereCondition = $this->entityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' ' . $this->entityAlias . '.' . $value; |
|
394
|
394
|
if ($orCondition['orCondition'] != null) { |
|
395
|
395
|
$orCondition['orCondition'] .= ' OR ' . $whereCondition; |
|
396
|
396
|
} else { |
|
@@ -407,7 +407,7 @@ discard block |
|
|
block discarded – undo |
|
407
|
407
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
408
|
408
|
|
|
409
|
409
|
$embeddedFields = explode('.', $fieldName); |
|
410
|
|
- $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
410
|
+ $fieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
411
|
411
|
|
|
412
|
412
|
$salt = ''; |
|
413
|
413
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -417,9 +417,9 @@ discard block |
|
|
block discarded – undo |
|
417
|
417
|
} |
|
418
|
418
|
|
|
419
|
419
|
if ($filtering->hasOperator() && 'list' == $filtering->getOperator()) { |
|
420
|
|
- $whereCondition = $relationEntityAlias.'.'.$fieldName.' '.$operator['meta'].' (:field_'.$fieldName . $salt . ')'; |
|
|
420
|
+ $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' (:field_' . $fieldName . $salt . ')'; |
|
421
|
421
|
} else { |
|
422
|
|
- $whereCondition = $relationEntityAlias.'.'.$fieldName.' '.$operator['meta'].' :field_'.$fieldName . $salt; |
|
|
422
|
+ $whereCondition = $relationEntityAlias . '.' . $fieldName . ' ' . $operator['meta'] . ' :field_' . $fieldName . $salt; |
|
423
|
423
|
} |
|
424
|
424
|
|
|
425
|
425
|
if ($orCondition['orCondition'] != null) { |
|
@@ -461,7 +461,7 @@ discard block |
|
|
block discarded – undo |
|
461
|
461
|
|
|
462
|
462
|
if (in_array($fieldName, $this->fields)) { |
|
463
|
463
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
464
|
|
- $this->qBuilder->addOrderBy($this->entityAlias .'.'. $fieldName, $direction); |
|
|
464
|
+ $this->qBuilder->addOrderBy($this->entityAlias . '.' . $fieldName, $direction); |
|
465
|
465
|
} |
|
466
|
466
|
|
|
467
|
467
|
if (strstr($sort, '_embedded.')) { |
|
@@ -472,7 +472,7 @@ discard block |
|
|
block discarded – undo |
|
472
|
472
|
$fieldName = $this->parser->camelize($embeddedFields[2]); |
|
473
|
473
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
474
|
474
|
|
|
475
|
|
- $this->qBuilder->addOrderBy($relationEntityAlias.'.'.$fieldName, $direction); |
|
|
475
|
+ $this->qBuilder->addOrderBy($relationEntityAlias . '.' . $fieldName, $direction); |
|
476
|
476
|
} |
|
477
|
477
|
|
|
478
|
478
|
} |