Added support for index by and changing selection set

Happyr · Apr 4, 2019 · 923fb90 · 923fb90
1 parent 2fcfef3
commit 923fb90
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/Query/AbstractSelectionSet.php b/src/Query/AbstractSelectionSet.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\QueryBuilder;
 
 /**
- * Class AbstractSelectionSet
+ * Class AbstractSelectionSet.
  */
 abstract class AbstractSelectionSet implements QueryModifier
 {
@@ -36,21 +36,11 @@ public function __construct($fields, $dqlAlias = null)
     }
 
     /**
-     * Modify selection set in given query builder
-     *
-     * @param string[]     $fields Prepared set of fields
-     * @param QueryBuilder $qb     Query builder object
-     *
-     * @return mixed
-     */
-    abstract protected function modifySelection(array $fields, QueryBuilder $qb);
-
-    /**
-     * @inheritDoc
+     * {@inheritdoc}
      */
     final public function modify(QueryBuilder $qb, $dqlAlias)
     {
-        if ($this->dqlAlias !== null) {
+        if (null !== $this->dqlAlias) {
             $dqlAlias = $this->dqlAlias;
         }
 
@@ -59,6 +49,15 @@ final public function modify(QueryBuilder $qb, $dqlAlias)
         $this->modifySelection($fields, $qb);
     }
 
+    /**
+     * Modify selection set in given query builder.
+     *
+     * @param string[]     $fields Prepared set of fields
+     * @param QueryBuilder $qb     Query builder object
+     *
+     * @return mixed
+     */
+    abstract protected function modifySelection(array $fields, QueryBuilder $qb);
 
     /**
      * Return fields selection.
@@ -75,7 +74,7 @@ private function getSelection($dqlAlias)
             $fieldName = $isAliased ? $k : $v;
 
             list($fieldAlias, $fieldName) = explode('.', $fieldName, 2) + [null, null];
-            if ($fieldName === null) {
+            if (null === $fieldName) {
                 $fieldName = $fieldAlias;
                 $fieldAlias = $dqlAlias;
             }

diff --git a/src/Query/AddSelectionSet.php b/src/Query/AddSelectionSet.php
@@ -10,7 +10,7 @@
 class AddSelectionSet extends AbstractSelectionSet
 {
     /**
-     * @inheritDoc
+     * {@inheritdoc}
      */
     protected function modifySelection(array $fields, QueryBuilder $qb)
     {

diff --git a/src/Query/IndexBy.php b/src/Query/IndexBy.php
@@ -40,7 +40,7 @@ public function __construct($field, $dqlAlias = null)
      */
     public function modify(QueryBuilder $qb, $dqlAlias)
     {
-        if ($this->dqlAlias !== null) {
+        if (null !== $this->dqlAlias) {
             $dqlAlias = $this->dqlAlias;
         }
 

diff --git a/src/Query/SelectionSet.php b/src/Query/SelectionSet.php
@@ -10,7 +10,7 @@
 class SelectionSet extends AbstractSelectionSet
 {
     /**
-     * @inheritDoc
+     * {@inheritdoc}
      */
     protected function modifySelection(array $fields, QueryBuilder $qb)
     {

diff --git a/tests/Query/IndexBySpec.php b/tests/Query/IndexBySpec.php
@@ -12,6 +12,7 @@
 class IndexBySpec extends ObjectBehavior
 {
     private $field = 'the_field';
+
     private $alias = 'f';
 
     public function let()