Implementação da flexibilização dos filtros para hydrators e extractors.

Author: 0x3175633435

src/Mapping/Extraction/Extractor.php

@@ -5,6 +5,7 @@
 use Zend\EntityMapper\Config\Container\Container;
 use Zend\EntityMapper\Config\Entity;
 use Zend\EntityMapper\Config\Field;
+use Zend\Filter\FilterInterface;
 
 /**
  * Extractor
@@ -42,11 +43,12 @@ private function getFields($object): array
 
     /**
      * @param $object
+     * @param bool $ignoreFilter
      * @return array
      * @throws \Zend\Cache\Exception\ExceptionInterface
      * @throws \Zend\EntityMapper\Config\Container\Exceptions\ItemNotFoundException
      */
-    public function extract($object): array
+    public function extract($object, $ignoreFilter = false): array
     {
         $fields = $this->getFields($object);
         $reflection = new \ReflectionObject($object);
@@ -56,7 +58,20 @@ public function extract($object): array
             if(!$field->isForeignKey() && !$field->isCollection()){
                 $property = $reflection->getProperty($field->getProperty());
                 $property->setAccessible(true);
-                $array[$field->getAlias()] = $property->getValue($object);
+
+                $value = $property->getValue($object);
+
+                if($field->hasOutputFilter() && $ignoreFilter === false) {
+                    /** @var FilterInterface $outputFilter */
+                    $outputFilter = $field->getOutputFilter();
+                    if(is_string($outputFilter) && class_exists($outputFilter)) {
+                        $outputFilter = new $outputFilter;
+                    }
+
+                    $value = $outputFilter->filter($value);
+                }
+
+                $array[$field->getAlias()] = $value;
             }
         }
 

src/Mapping/Hydration/Hydrator.php

@@ -80,10 +80,13 @@ public function hydrate(array $data, $object)
 
             // Filter the data
             if($propertyConfig->hasInputFilter()) {
-                $inputFilterClass = $propertyConfig->getInputFilter();
 
-                /** @var FilterInterface $inputFilter */
-                $inputFilter = new $inputFilterClass;
+                /** @var FilterInterface $outputFilter */
+                $inputFilter = $propertyConfig->getInputFilter();
+                if(is_string($inputFilter) && class_exists($inputFilter)) {
+                    $inputFilter = new $inputFilter;
+                }
+
                 $filtered = $inputFilter->filter($data[$propertyAlias]);
                 $property->setValue($object, $filtered);
                 continue;