QueryBuilderComposer has static methods

MortalFlesh · Jul 30, 2017 · 41bf849 · 41bf849
1 parent fe7667a
commit 41bf849
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/QueryBuilderComposer.php b/src/QueryBuilderComposer.php
@@ -38,7 +38,7 @@ class QueryBuilderComposer
      * @param array $parts
      * @return QueryBuilder
      */
-    public function compose(QueryBuilder $queryBuilder, array $parts): QueryBuilder
+    public static function compose(QueryBuilder $queryBuilder, array $parts): QueryBuilder
     {
         return compose($parts, $queryBuilder);
     }
@@ -54,8 +54,8 @@ public function compose(QueryBuilder $queryBuilder, array $parts): QueryBuilder
      * @param array[] ...$partGroups
      * @return QueryBuilder
      */
-    public function mergeCompose(QueryBuilder $queryBuilder, array ...$partGroups): QueryBuilder
+    public static function mergeCompose(QueryBuilder $queryBuilder, array ...$partGroups): QueryBuilder
     {
-        return $this->compose($queryBuilder, mergePartGroups($partGroups));
+        return self::compose($queryBuilder, mergePartGroups($partGroups));
     }
 }
diff --git a/tests/QueryBuilderComposerTest.php b/tests/QueryBuilderComposerTest.php
@@ -5,22 +5,17 @@
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use MF\QueryBuilderComposer\Curry;
-use MF\QueryBuilderComposer\QueryBuilderComposer;
+use MF\QueryBuilderComposer\QueryBuilderComposer as QBC;
 use MF\QueryBuilderComposer\Tests\Fixture\GroupByModifier;
 use Mockery as m;
 
 class QueryBuilderComposerTest extends QueryBuilderComposerTestCase
 {
-    /** @var QueryBuilderComposer */
-    private $composer;
-
     /** @var QueryBuilder|m\MockInterface */
     private $queryBuilder;
 
     public function setUp()
     {
-        $this->composer = new QueryBuilderComposer();
-
         $this->queryBuilder = m::mock(QueryBuilder::class);
     }
 
@@ -68,7 +63,7 @@ public function testShouldComposeAndApplyRulesToQueryBuilder()
             ->once()
             ->andReturn($this->queryBuilder);
 
-        $queryBuilder = $this->composer->compose($this->queryBuilder, $parts);
+        $queryBuilder = QBC::compose($this->queryBuilder, $parts);
 
         $this->assertSame($this->queryBuilder, $queryBuilder);
     }
@@ -110,7 +105,7 @@ public function testShouldComposeMergedPartsAndApplyRulesToQueryBuilder()
             ->once()
             ->andReturn($this->queryBuilder);
 
-        $queryBuilder = $this->composer->compose($this->queryBuilder, array_merge($customParts, $approvedMature));
+        $queryBuilder = QBC::compose($this->queryBuilder, array_merge($customParts, $approvedMature));
 
         $this->assertSame($this->queryBuilder, $queryBuilder);
     }
@@ -147,7 +142,7 @@ public function testShouldMergeComposePartsAndApplyRulesToQueryBuilder()
             ->once()
             ->andReturn($this->queryBuilder);
 
-        $queryBuilder = $this->composer->mergeCompose($this->queryBuilder, $customParts, $approvedMature);
+        $queryBuilder = QBC::mergeCompose($this->queryBuilder, $customParts, $approvedMature);
 
         $this->assertSame($this->queryBuilder, $queryBuilder);
     }
@@ -159,6 +154,7 @@ public function testShouldComposeRulesAndApplyRulesToQueryBuilder()
             'from student s',
         ];
 
+
         $this->queryBuilder->shouldReceive('select')
             ->with('s.id', 's.name', 's.age')
             ->once()
@@ -168,7 +164,7 @@ public function testShouldComposeRulesAndApplyRulesToQueryBuilder()
             ->once()
             ->andReturn($this->queryBuilder);
 
-        $queryBuilder = $this->composer->compose($this->queryBuilder, $parts);
+        $queryBuilder = QBC::compose($this->queryBuilder, $parts);
 
         $this->assertSame($this->queryBuilder, $queryBuilder);
     }
@@ -189,7 +185,7 @@ public function testShouldComposeRulesBySingleStringAndApplyRulesToQueryBuilder(
             ->once()
             ->andReturn($this->queryBuilder);
 
-        $queryBuilder = $this->composer->compose($this->queryBuilder, $parts);
+        $queryBuilder = QBC::compose($this->queryBuilder, $parts);
 
         $this->assertSame($this->queryBuilder, $queryBuilder);
     }