Merge branch 'hotfix/zendframework/zendframework#6083-hydrator-number…

…-of-parameters-filter-honored' Close zendframework/zendframework#6083
zendframework · Apr 6, 2014 · 97a0260 · 97a0260
2 parents 802bf45 + 1e8208b
commit 97a0260
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 6 deletions.
diff --git a/src/Hydrator/Filter/NumberOfParameterFilter.php b/src/Hydrator/Filter/NumberOfParameterFilter.php
@@ -26,7 +26,7 @@ class NumberOfParameterFilter implements FilterInterface
      */
     public function __construct($numberOfParameters = 0)
     {
-        $this->numberOfParameters = 0;
+        $this->numberOfParameters = (int) $numberOfParameters;
     }
 
     /**
@@ -44,10 +44,6 @@ public function filter($property)
             );
         }
 
-        if ($reflectionMethod->getNumberOfParameters() !== $this->numberOfParameters) {
-            return false;
-        }
-
-        return true;
+        return $reflectionMethod->getNumberOfParameters() === $this->numberOfParameters;
     }
 }
diff --git a/test/Hydrator/Filter/NumberOfParameterFilterTest.php b/test/Hydrator/Filter/NumberOfParameterFilterTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Stdlib\Hydrator\Filter;
+
+use Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter;
+
+/**
+ * Unit tests for {@see \Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter}
+ *
+ * @covers \Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter
+ */
+class NumberOfParameterFilterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @group 6083
+     */
+    public function testArityZero()
+    {
+        $filter = new NumberOfParameterFilter();
+        $this->assertTrue($filter->filter(__CLASS__ . '::methodWithNoParameters'));
+        $this->assertFalse($filter->filter(__CLASS__ . '::methodWithOptionalParameters'));
+    }
+
+    /**
+     * @group 6083
+     */
+    public function testArityOne()
+    {
+        $filter = new NumberOfParameterFilter(1);
+        $this->assertFalse($filter->filter(__CLASS__ . '::methodWithNoParameters'));
+        $this->assertTrue($filter->filter(__CLASS__ . '::methodWithOptionalParameters'));
+    }
+
+    /**
+     * Test asset method
+     */
+    public function methodWithOptionalParameters($parameter = 'foo')
+    {
+    }
+
+    /**
+     * Test asset method
+     */
+    public function methodWithNoParameters()
+    {
+    }
+}