Update DBAL and PHPUnit; Query method passthrough

spotorm · May 21, 2016 · 94fd8c2 · tuupola · May 21, 2016 · vlucas
1 parent 0b2d384
commit 94fd8c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -15,11 +15,11 @@
     "require": {
         "php": ">=5.4.0",
         "vlucas/valitron": "~1.1",
-        "doctrine/dbal": "~2.4",
+        "doctrine/dbal": "2.5.4",
         "sabre/event": "~2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.7"
+        "phpunit/phpunit": "^4.8"
     },
     "autoload": {
         "psr-4": {

diff --git a/lib/Query.php b/lib/Query.php
@@ -799,12 +799,8 @@ public function __call($method, $args)
 
             // Methods on Collection
         } elseif (method_exists('\\Spot\\Entity\\Collection', $method)) {
-            if(isset($args[0])){
-            return $this->execute()->$method($args[0]);
-            } else {
-            return $this->execute()->$method();
-            }
-
+            return call_user_func_array($method, $args);
+
             // Error
         } else {
             throw new \BadMethodCallException("Method '" . __CLASS__ . "::" . $method . "' not found");