|
@@ -106,7 +106,7 @@ discard block |
|
|
block discarded – undo |
|
106
|
106
|
|
|
107
|
107
|
$needle = $prevEntityAlias . "_" . $currentEntityAlias; |
|
108
|
108
|
|
|
109
|
|
- return ! in_array($needle, $this->joins); |
|
|
109
|
+ return !in_array($needle, $this->joins); |
|
110
|
110
|
} |
|
111
|
111
|
|
|
112
|
112
|
private function storeJoin($prevEntityAlias, $currentEntityAlias) |
|
@@ -276,7 +276,7 @@ discard block |
|
|
block discarded – undo |
|
276
|
276
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
277
|
277
|
|
|
278
|
278
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
279
|
|
- $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
279
|
+ $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
280
|
280
|
|
|
281
|
281
|
$salt = ''; |
|
282
|
282
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -395,7 +395,7 @@ discard block |
|
|
block discarded – undo |
|
395
|
395
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
396
|
396
|
|
|
397
|
397
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
398
|
|
- $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
398
|
+ $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
399
|
399
|
|
|
400
|
400
|
$salt = ''; |
|
401
|
401
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -466,7 +466,7 @@ discard block |
|
|
block discarded – undo |
|
466
|
466
|
|
|
467
|
467
|
if (in_array($fieldName, $this->fields)) { |
|
468
|
468
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
469
|
|
- $this->qBuilder->addOrderBy($this->entityAlias .'.'. $fieldName, $direction); |
|
|
469
|
+ $this->qBuilder->addOrderBy($this->entityAlias . '.' . $fieldName, $direction); |
|
470
|
470
|
} |
|
471
|
471
|
|
|
472
|
472
|
if (strstr($sort, '_embedded.')) { |
|
@@ -477,7 +477,7 @@ discard block |
|
|
block discarded – undo |
|
477
|
477
|
$fieldName = $this->parser->camelize($embeddedFields[2]); |
|
478
|
478
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
479
|
479
|
|
|
480
|
|
- $this->qBuilder->addOrderBy($relationEntityAlias.'.'.$fieldName, $direction); |
|
|
480
|
+ $this->qBuilder->addOrderBy($relationEntityAlias . '.' . $fieldName, $direction); |
|
481
|
481
|
} |
|
482
|
482
|
|
|
483
|
483
|
} |
|
@@ -565,7 +565,7 @@ discard block |
|
|
block discarded – undo |
|
565
|
565
|
return $this->pageLength; |
|
566
|
566
|
} |
|
567
|
567
|
|
|
568
|
|
- public function setSelect( $select) : QueryBuilderFactory |
|
|
568
|
+ public function setSelect($select) : QueryBuilderFactory |
|
569
|
569
|
{ |
|
570
|
570
|
$this->select = $select; |
|
571
|
571
|
|