Remove filters from final hydrators

zf-fr · May 20, 2014 · b546754 · b546754
1 parent 3053ac8
commit b546754
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 20 deletions.
diff --git a/src/Hydrator/AbstractHydrator.php b/src/Hydrator/AbstractHydrator.php
@@ -25,11 +25,6 @@ abstract class AbstractHydrator implements HydratorInterface
     use ProvidesNamingStrategyTrait;
     use ProvidesStrategyTrait;
 
-    /**
-     * @var FilterChain
-     */
-    protected $filterChain;
-
     /**
      * @var ExtractionContext
      */
@@ -45,7 +40,6 @@ abstract class AbstractHydrator implements HydratorInterface
      */
     public function __construct()
     {
-        $this->filterChain       = new FilterChain();
         $this->namingStrategy    = new UnderscoreNamingStrategy();
         $this->extractionContext = new ExtractionContext();
         $this->hydrationContext  = new HydrationContext();

diff --git a/src/Hydrator/ArraySerializableHydrator.php b/src/Hydrator/ArraySerializableHydrator.php
@@ -33,11 +33,6 @@ public function extract($object)
         $context->object = $object;
 
         foreach ($data as $property => $value) {
-            if (!$this->filterChain->accept($property, $context)) {
-                unset($data[$property]);
-                continue;
-            }
-
             $property          = $this->namingStrategy->getNameForExtraction($property, $context);
             $result[$property] = $this->extractValue($property, $value, $context);
         }

diff --git a/src/Hydrator/ClassMethodsHydrator.php b/src/Hydrator/ClassMethodsHydrator.php
@@ -10,6 +10,7 @@
 namespace Hydrator;
 
 use Hydrator\Filter\CompositeFilter;
+use Hydrator\Filter\FilterChain;
 use Hydrator\Filter\GetFilter;
 use Hydrator\Filter\HasFilter;
 use Hydrator\Filter\IsFilter;
@@ -27,6 +28,11 @@
  */
 final class ClassMethodsHydrator extends AbstractHydrator
 {
+    /**
+     * @var FilterChain
+     */
+    protected $filterChain;
+
     /**
      * Holds the methods for a given object
      *
@@ -57,6 +63,8 @@ public function __construct()
     {
         parent::__construct();
 
+        $this->filterChain = new FilterChain();
+
         $this->filterChain->andFilter(new CompositeFilter(
             [new GetFilter(), new IsFilter(), new HasFilter()],
             CompositeFilter::TYPE_OR

diff --git a/src/Hydrator/ObjectPropertyHydrator.php b/src/Hydrator/ObjectPropertyHydrator.php
@@ -26,11 +26,6 @@ public function extract($object)
         $context->object = $object;
 
         foreach ($data as $property => $value) {
-            if (!$this->filterChain->accept($property, $context)) {
-                unset($data[$property]);
-                continue;
-            }
-
             $property          = $this->namingStrategy->getNameForExtraction($property, $context);
             $result[$property] = $this->extractValue($property, $value, $context);
         }

diff --git a/src/Hydrator/ReflectionHydrator.php b/src/Hydrator/ReflectionHydrator.php
@@ -37,10 +37,6 @@ public function extract($object)
         foreach (self::getReflProperties($object) as $property) {
             $propertyName = $this->namingStrategy->getNameForExtraction($property->getName(), $context);
 
-            if (!$this->filterChain->accept($property, $context)) {
-                continue;
-            }
-
             $value                 = $property->getValue($object);
             $result[$propertyName] = $this->extractValue($propertyName, $value, $context);
         }