Merge pull request #73 from codisart/add-test-filter

Clean some code and add some unit tests.
zendframework · Apr 30, 2018 · 399809d · 399809d
2 parents a6a7b84 + 3f264d1
commit 399809d
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 14 deletions.
diff --git a/src/Filter/HasFilter.php b/src/Filter/HasFilter.php
@@ -20,9 +20,6 @@ public function filter($property)
             $pos = 0;
         }
 
-        if (substr($property, $pos, 3) === 'has') {
-            return true;
-        }
-        return false;
+        return substr($property, $pos, 3) === 'has';
     }
 }
diff --git a/src/Filter/IsFilter.php b/src/Filter/IsFilter.php
@@ -20,9 +20,6 @@ public function filter($property)
             $pos = 0;
         }
 
-        if (substr($property, $pos, 2) === 'is') {
-            return true;
-        }
-        return false;
+        return substr($property, $pos, 2) === 'is';
     }
 }
diff --git a/src/Filter/MethodMatchFilter.php b/src/Filter/MethodMatchFilter.php
@@ -41,6 +41,7 @@ public function filter($property)
         } else {
             $pos = 0;
         }
+
         if (substr($property, $pos) === $this->method) {
             return ! $this->exclude;
         }

diff --git a/test/Filter/FilterCompositeTest.php b/test/Filter/FilterCompositeTest.php
@@ -75,18 +75,18 @@ public function getDataProvider()
                 'exception' => true
             ],
             [
-                ['foo' => (new HasFilter())],
-                ['bar' => (new GetFilter())],
+                ['foo' => new HasFilter],
+                ['bar' => new GetFilter],
                 'exception' => false
             ],
             [
                 [
-                    'foo1' => (new HasFilter()),
-                    'foo2' => (new IsFilter()),
+                    'foo1' => new HasFilter,
+                    'foo2' => new IsFilter,
                 ],
                 [
-                    'bar1' => (new GetFilter()),
-                    'bar2' => (new NumberOfParameterFilter())
+                    'bar1' => new GetFilter,
+                    'bar2' => new NumberOfParameterFilter,
                 ],
                 'exception' => false
             ]

diff --git a/test/Filter/MethodMatchFilterTest.php b/test/Filter/MethodMatchFilterTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-hydrator for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-hydrator/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Hydrator\Filter;
+
+use PHPUnit\Framework\TestCase;
+use Zend\Hydrator\Filter\MethodMatchFilter;
+
+class MethodMatchFilterTest extends TestCase
+{
+    public function providerFilter()
+    {
+        return [
+            ['foo', true,],
+            ['bar', false,],
+            ['class::foo', true,],
+            ['class::bar', false,],
+        ];
+    }
+
+    /**
+     * @dataProvider providerFilter
+     */
+    public function testFilter($methodName, $expected)
+    {
+        $testedInstance = new MethodMatchFilter('foo', false);
+        self::assertEquals($expected, $testedInstance->filter($methodName));
+
+        $testedInstance = new MethodMatchFilter('foo', true);
+        self::assertEquals(! $expected, $testedInstance->filter($methodName));
+    }
+}