Merge pull request zendframework/zendframework#1 from zendframework/d…

…evelop

Develop

src/Hydrator/DelegatingHydrator.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class DelegatingHydrator implements HydratorInterface
+{
+    /**
+     * @var ServiceLocatorInterface
+     */
+    protected $hydrators;
+
+    /**
+     * Constructor
+     *
+     * @param ServiceLocatorInterface $hydrators
+     */
+    public function __construct(ServiceLocatorInterface $hydrators)
+    {
+        $this->hydrators = $hydrators;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hydrate(array $data, $object)
+    {
+        return $this->getHydrator($object)->hydrate($data, $object);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function extract($object)
+    {
+        return $this->getHydrator($object)->extract($object);
+    }
+
+    /**
+     * Gets hydrator of an object
+     *
+     * @param  object $object
+     * @return HydratorInterface
+     */
+    protected function getHydrator($object)
+    {
+        return $this->hydrators->get(get_class($object));
+    }
+}

src/Hydrator/DelegatingHydratorFactory.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class DelegatingHydratorFactory implements FactoryInterface
+{
+    /**
+     * Creates DelegatingHydrator
+     *
+     * @param  ServiceLocatorInterface $serviceLocator
+     * @return DelegatingHydrator
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        // Assume that this factory is registered with the HydratorManager,
+        // and just pass it directly on.
+        return new DelegatingHydrator($serviceLocator);
+    }
+}

src/Hydrator/Filter/MethodMatchFilter.php

@@ -41,8 +41,8 @@ public function filter($property)
             $pos = 0;
         }
         if (substr($property, $pos) === $this->method) {
-            return $this->exclude ? false : true;
+            return !$this->exclude;
         }
-        return $this->exclude ? true : false;
+        return $this->exclude;
     }
 }

src/Hydrator/HydratorPluginManager.php

@@ -26,6 +26,15 @@ class HydratorPluginManager extends AbstractPluginManager
      */
     protected $shareByDefault = false;
 
+    /**
+     * Default aliases
+     *
+     * @var array
+     */
+    protected $aliases = array(
+        'delegatinghydrator' => 'Zend\Stdlib\Hydrator\DelegatingHydrator',
+    );
+
     /**
      * Default set of adapters
      *
@@ -38,6 +47,15 @@ class HydratorPluginManager extends AbstractPluginManager
         'reflection'        => 'Zend\Stdlib\Hydrator\Reflection'
     );
 
+    /**
+     * Default factory-based adapters
+     *
+     * @var array
+     */
+    protected $factories = array(
+        'Zend\Stdlib\Hydrator\DelegatingHydrator' => 'Zend\Stdlib\Hydrator\DelegatingHydratorFactory',
+    );
+
     /**
      * {@inheritDoc}
      */

src/Hydrator/Strategy/StrategyChain.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator\Strategy;
+
+use Traversable;
+use Zend\Stdlib\ArrayUtils;
+
+final class StrategyChain implements StrategyInterface
+{
+    /**
+     * Strategy chain for extraction
+     *
+     * @var StrategyInterface[]
+     */
+    private $extractionStrategies;
+
+    /**
+     * Strategy chain for hydration
+     *
+     * @var StrategyInterface[]
+     */
+    private $hydrationStrategies;
+
+    /**
+     * Constructor
+     *
+     * @param array|Traversable $extractionStrategies
+     */
+    public function __construct($extractionStrategies)
+    {
+        $extractionStrategies = ArrayUtils::iteratorToArray($extractionStrategies);
+        $this->extractionStrategies = array_map(
+            function (StrategyInterface $strategy) {
+                // this callback is here only to ensure type-safety
+                return $strategy;
+            },
+            $extractionStrategies
+        );
+
+        $this->hydrationStrategies = array_reverse($extractionStrategies);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function extract($value)
+    {
+        foreach ($this->extractionStrategies as $strategy) {
+            $value = $strategy->extract($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hydrate($value)
+    {
+        foreach ($this->hydrationStrategies as $strategy) {
+            $value = $strategy->hydrate($value);
+        }
+
+        return $value;
+    }
+}

test/GlobTest.php

@@ -40,4 +40,33 @@ public function testThrowExceptionOnError()
         $path = '/' . str_repeat('a', 10000);
         Glob::glob($path);
     }
+
+    /**
+     * @param string $pattern
+     *
+     * @dataProvider patternsProvider
+     */
+    public function testPatterns($pattern, $expectedSequence)
+    {
+        $result = Glob::glob(__DIR__ . '/_files/' . $pattern, Glob::GLOB_BRACE);
+
+        $this->assertCount(count($expectedSequence), $result);
+
+        foreach ($expectedSequence as $i => $expectedFileName) {
+            $this->assertStringEndsWith($expectedFileName, $result[$i]);
+        }
+    }
+
+    public function patternsProvider()
+    {
+        return array(
+            array(
+                "{{,*.}alph,{,*.}bet}a",
+                array(
+                    'alpha', 'eta.alpha', 'zeta.alpha', 'beta', 'eta.beta',
+                    'zeta.beta'
+                )
+            )
+        );
+    }
 }

test/Hydrator/DelegatingHydratorFactoryTest.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Stdlib\Hydrator;
+
+use Zend\Stdlib\Hydrator\DelegatingHydratorFactory;
+
+class DelegatingHydratorFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testFactory()
+    {
+        $hydratorManager = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
+        $factory = new DelegatingHydratorFactory();
+        $this->assertInstanceOf(
+            'Zend\Stdlib\Hydrator\DelegatingHydrator',
+            $factory->createService($hydratorManager)
+        );
+    }
+}

test/Hydrator/DelegatingHydratorTest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Stdlib\Hydrator;
+
+use Zend\Stdlib\Hydrator\DelegatingHydrator;
+use ArrayObject;
+
+/**
+ * Unit tests for {@see \Zend\Stdlib\Hydrator\DelegatingHydrator}
+ *
+ * @covers \Zend\Stdlib\Hydrator\DelegatingHydrator
+ */
+class DelegatingHydratorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var DelegatingHydrator
+     */
+    protected $hydrator;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $hydrators;
+
+    /**
+     * @var ArrayObject
+     */
+    protected $object;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp()
+    {
+        $this->hydrators = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
+        $this->hydrator = new DelegatingHydrator($this->hydrators);
+        $this->object = new ArrayObject;
+    }
+
+    public function testExtract()
+    {
+        $this->hydrators->expects($this->any())
+            ->method('has')
+            ->with('ArrayObject')
+            ->will($this->returnValue(true));
+
+        $hydrator = $this->getMock('Zend\Stdlib\Hydrator\HydratorInterface');
+
+        $this->hydrators->expects($this->any())
+            ->method('get')
+            ->with('ArrayObject')
+            ->will($this->returnValue($hydrator));
+
+        $hydrator->expects($this->any())
+            ->method('extract')
+            ->with($this->object)
+            ->will($this->returnValue(array('foo' => 'bar')));
+
+        $this->assertEquals(array('foo' => 'bar'), $hydrator->extract($this->object));
+    }
+
+    public function testHydrate()
+    {
+        $this->hydrators->expects($this->any())
+            ->method('has')
+            ->with('ArrayObject')
+            ->will($this->returnValue(true));
+
+        $hydrator = $this->getMock('Zend\Stdlib\Hydrator\HydratorInterface');
+
+        $this->hydrators->expects($this->any())
+            ->method('get')
+            ->with('ArrayObject')
+            ->will($this->returnValue($hydrator));
+
+        $hydrator->expects($this->any())
+            ->method('hydrate')
+            ->with(array('foo' => 'bar'), $this->object)
+            ->will($this->returnValue($this->object));
+        $this->assertEquals($this->object, $hydrator->hydrate(array('foo' => 'bar'), $this->object));
+    }
+}