Merge pull request #280 from alcaeus/use-argument-unpacking

Use argument unpacking instead of call_user_func
doctrine · Nov 8, 2016 · 15275b2 · 15275b2
2 parents 362c67d + 80d05e5
commit 15275b2
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 34 deletions.
diff --git a/lib/Doctrine/MongoDB/Aggregation/Stage/Match.php b/lib/Doctrine/MongoDB/Aggregation/Stage/Match.php
@@ -330,7 +330,7 @@ public function geoWithinCenterSphere($x, $y, $radius)
      */
     public function geoWithinPolygon(/* array($x1, $y1), ... */)
     {
-        call_user_func_array([$this->query, 'geoWithinPolygon'], func_get_args());
+        $this->query->geoWithinPolygon(...func_get_args());
 
         return $this;
     }

diff --git a/lib/Doctrine/MongoDB/Aggregation/Stage/Operator.php b/lib/Doctrine/MongoDB/Aggregation/Stage/Operator.php
@@ -82,7 +82,7 @@ public function abs($number)
      */
     public function add($expression1, $expression2 /* , $expression3, ... */)
     {
-        call_user_func_array([$this->expr, 'add'], func_get_args());
+        $this->expr->add(...func_get_args());
 
         return $this;
     }
@@ -231,7 +231,7 @@ public function cmp($expression1, $expression2)
      */
     public function concat($expression1, $expression2 /* , $expression3, ... */)
     {
-        call_user_func_array([$this->expr, 'concat'], func_get_args());
+        $this->expr->concat(...func_get_args());
 
         return $this;
     }
@@ -253,7 +253,7 @@ public function concat($expression1, $expression2 /* , $expression3, ... */)
      */
     public function concatArrays($array1, $array2 /* , $array3, ... */)
     {
-        call_user_func_array([$this->expr, 'concatArrays'], func_get_args());
+        $this->expr->concatArrays(...func_get_args());
 
         return $this;
     }
@@ -822,7 +822,7 @@ public function month($expression)
      */
     public function multiply($expression1, $expression2 /* , $expression3, ... */)
     {
-        call_user_func_array([$this->expr, 'multiply'], func_get_args());
+        $this->expr->multiply(...func_get_args());
 
         return $this;
     }
@@ -935,7 +935,7 @@ public function setDifference($expression1, $expression2)
      */
     public function setEquals($expression1, $expression2 /* , $expression3, ... */)
     {
-        call_user_func_array([$this->expr, 'setEquals'], func_get_args());
+        $this->expr->setEquals(...func_get_args());
 
         return $this;
     }
@@ -955,7 +955,7 @@ public function setEquals($expression1, $expression2 /* , $expression3, ... */)
      */
     public function setIntersection($expression1, $expression2 /* , $expression3, ... */)
     {
-        call_user_func_array([$this->expr, 'setIntersection'], func_get_args());
+        $this->expr->setIntersection(...func_get_args());
 
         return $this;
     }
@@ -975,7 +975,7 @@ public function setIntersection($expression1, $expression2 /* , $expression3, ..
      */
     public function setIsSubset($expression1, $expression2)
     {
-        call_user_func_array([$this->expr, 'setIsSubset'], func_get_args());
+        $this->expr->setIsSubset($expression1, $expression2);
 
         return $this;
     }
@@ -995,7 +995,7 @@ public function setIsSubset($expression1, $expression2)
      */
     public function setUnion($expression1, $expression2 /* , $expression3, ... */)
     {
-        call_user_func_array([$this->expr, 'setUnion'], func_get_args());
+        $this->expr->setUnion(...func_get_args());
 
         return $this;
     }

diff --git a/lib/Doctrine/MongoDB/Connection.php b/lib/Doctrine/MongoDB/Connection.php
@@ -330,7 +330,7 @@ public function listDatabases()
     public function log(array $log)
     {
         if (null !== $this->config->getLoggerCallable()) {
-            call_user_func_array($this->config->getLoggerCallable(), [$log]);
+            call_user_func($this->config->getLoggerCallable(), $log);
         }
     }
 

diff --git a/lib/Doctrine/MongoDB/LoggableDatabase.php b/lib/Doctrine/MongoDB/LoggableDatabase.php
@@ -64,7 +64,7 @@ public function __construct(Connection $connection, \MongoDB $mongoDB, EventMana
     public function log(array $log)
     {
         $log['db'] = $this->getName();
-        call_user_func_array($this->loggerCallable, [$log]);
+        call_user_func($this->loggerCallable, $log);
     }
 
     /**

diff --git a/lib/Doctrine/MongoDB/Query/Builder.php b/lib/Doctrine/MongoDB/Query/Builder.php
@@ -710,7 +710,7 @@ public function geoWithinCenterSphere($x, $y, $radius)
      */
     public function geoWithinPolygon(/* array($x1, $y1), ... */)
     {
-        call_user_func_array([$this->expr, 'geoWithinPolygon'], func_get_args());
+        $this->expr->geoWithinPolygon(...func_get_args());
         return $this;
     }
 
@@ -1896,7 +1896,7 @@ public function withinCenterSphere($x, $y, $radius)
      */
     public function withinPolygon(/* array($x1, $y1), array($x2, $y2), ... */)
     {
-        call_user_func_array([$this->expr, 'withinPolygon'], func_get_args());
+        $this->expr->withinPolygon(...func_get_args());
         return $this;
     }
 

diff --git a/lib/Doctrine/MongoDB/Traits/LoggableCollectionTrait.php b/lib/Doctrine/MongoDB/Traits/LoggableCollectionTrait.php
@@ -41,7 +41,7 @@ public function log(array $log)
     {
         $log['db'] = $this->database->getName();
         $log['collection'] = $this->getName();
-        call_user_func_array($this->loggerCallable, [$log]);
+        call_user_func($this->loggerCallable, $log);
     }
 
     /**

diff --git a/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/GroupTest.php b/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/GroupTest.php
@@ -16,13 +16,15 @@ class GroupTest extends \PHPUnit_Framework_TestCase
     public function testProxiedExprMethods($method, array $args = [])
     {
         $expr = $this->getMockAggregationExpr();
-        $invocationMocker = $expr->expects($this->once())->method($method);
-        call_user_func_array([$invocationMocker, 'with'], $args);
+        $expr
+            ->expects($this->once())
+            ->method($method)
+            ->with(...$args);
 
         $stage = new GroupStub($this->getTestAggregationBuilder());
         $stage->setQuery($expr);
 
-        $this->assertSame($stage, call_user_func_array([$stage, $method], $args));
+        $this->assertSame($stage, $stage->$method(...$args));
     }
 
     public function provideProxiedExprMethods()

diff --git a/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/MatchTest.php b/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/MatchTest.php
@@ -36,13 +36,15 @@ public function testMatchFromBuilder()
     public function testProxiedExprMethods($method, array $args = [])
     {
         $expr = $this->getMockQueryExpr();
-        $invocationMocker = $expr->expects($this->once())->method($method);
-        call_user_func_array([$invocationMocker, 'with'], $args);
+        $expr
+            ->expects($this->once())
+            ->method($method)
+            ->with(...$args);
 
         $stage = $this->getStubStage();
         $stage->setQuery($expr);
 
-        $this->assertSame($stage, call_user_func_array([$stage, $method], $args));
+        $this->assertSame($stage, $stage->$method(...$args));
     }
 
     public function provideProxiedExprMethods()

diff --git a/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/OperatorTest.php b/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/OperatorTest.php
@@ -15,13 +15,15 @@ class OperatorTest extends \PHPUnit_Framework_TestCase
     public function testProxiedExprMethods($method, array $args = [])
     {
         $expr = $this->getMockAggregationExpr();
-        $invocationMocker = $expr->expects($this->once())->method($method);
-        call_user_func_array([$invocationMocker, 'with'], $args);
+        $expr
+            ->expects($this->once())
+            ->method($method)
+            ->with(...$args);
 
         $stage = $this->getStubStage();
         $stage->setQuery($expr);
 
-        $this->assertSame($stage, call_user_func_array([$stage, $method], $args));
+        $this->assertSame($stage, $stage->$method(...$args));
     }
 
     public function provideProxiedExprMethods()

diff --git a/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/ProjectTest.php b/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/ProjectTest.php
@@ -61,13 +61,15 @@ public function provideAccumulators()
     public function testProxiedExprMethods($method, array $args = [])
     {
         $expr = $this->getMockAggregationExpr();
-        $invocationMocker = $expr->expects($this->once())->method($method);
-        call_user_func_array([$invocationMocker, 'with'], $args);
+        $expr
+            ->expects($this->once())
+            ->method($method)
+            ->with(...$args);
 
         $stage = new GroupStub($this->getTestAggregationBuilder());
         $stage->setQuery($expr);
 
-        $this->assertSame($stage, call_user_func_array([$stage, $method], $args));
+        $this->assertSame($stage, $stage->$method(...$args));
     }
 
     public static function provideProxiedExprMethods()

diff --git a/tests/Doctrine/MongoDB/Tests/CollectionEventsChangingContextTest.php b/tests/Doctrine/MongoDB/Tests/CollectionEventsChangingContextTest.php
@@ -276,9 +276,10 @@ private function getMockCollection(EventManager $eventManager, array $methods)
             ->getMock();
 
         foreach ($methods as $method => $withValues) {
-            $expectation = $collection->expects($this->once());
-            $expectation->method($method);
-            call_user_func_array([$expectation, 'with'], $withValues);
+            $collection
+                ->expects($this->once())
+                ->method($method)
+                ->with(...$withValues);
         }
 
         return $collection;

diff --git a/tests/Doctrine/MongoDB/Tests/Query/BuilderTest.php b/tests/Doctrine/MongoDB/Tests/Query/BuilderTest.php
@@ -324,13 +324,15 @@ public function testDeepClone()
     public function testProxiedExprMethods($method, array $args = [])
     {
         $expr = $this->getMockExpr();
-        $invocationMocker = $expr->expects($this->once())->method($method);
-        call_user_func_array([$invocationMocker, 'with'], $args);
+        $expr
+            ->expects($this->once())
+            ->method($method)
+            ->with(...$args);
 
         $qb = $this->getStubQueryBuilder();
         $qb->setExpr($expr);
 
-        $this->assertSame($qb, call_user_func_array([$qb, $method], $args));
+        $this->assertSame($qb, $qb->$method(...$args));
     }
 
     public function provideProxiedExprMethods()
@@ -540,7 +542,7 @@ public function testSphericalRequiresGeoNearCommand()
     public function testSelect(array $args, array $expected)
     {
         $qb = $this->getTestQueryBuilder();
-        call_user_func_array([$qb, 'select'], $args);
+        $qb->select(...$args);
 
         $this->assertEquals($expected, $qb->debug('select'));
     }
@@ -556,7 +558,7 @@ public function provideSelectProjections()
     public function testExclude(array $args, array $expected)
     {
         $qb = $this->getTestQueryBuilder();
-        call_user_func_array([$qb, 'exclude'], $args);
+        $qb->exclude(...$args);
 
         $this->assertEquals($expected, $qb->debug('select'));
     }