AdapterAbstract now uses Hydrator for setOptions; Removed obsolete me…

…thods

Signed-off-by: Tom Van Herreweghe <[email protected]>

lib/PHPExif/Adapter/AdapterAbstract.php

@@ -11,6 +11,9 @@
 
 namespace PHPExif\Adapter;
 
+use PHPExif\Mapper\MapperInterface;
+use PHPExif\Hydrator\HydratorInterface;
+
 /**
  * PHP Exif Reader Adapter Abstract
  *
@@ -21,6 +24,21 @@
  */
 abstract class AdapterAbstract implements AdapterInterface
 {
+    /**
+     * @var string
+     */
+    protected $hydratorClass = '\\PHPExif\\Hydrator\\Mutator';
+
+    /**
+     * @var \PHPExif\Mapper\MapperInterface
+     */
+    protected $mapper;
+
+    /**
+     * @var \PHPExif\Hydrator\HydratorInterface
+     */
+    protected $hydrator;
+
     /**
      * Class constructor
      *
@@ -34,88 +52,76 @@ public function __construct(array $options = array())
     }
 
     /**
-     * Set array of options in the current object
+     * Mutator for the data mapper
      *
-     * @param array $options
-     * @return \PHPExif\Reader\AdapterAbstract
+     * @param \PHPExif\Mapper\MapperInterface $mapper
+     * @return \PHPExif\Adapter\AdapterInterface;
      */
-    public function setOptions(array $options)
+    public function setMapper(MapperInterface $mapper)
     {
-        foreach ($options as $property => $value) {
-            $setter = $this->determinePropertySetter($property);
-            if (method_exists($this, $setter)) {
-                $this->$setter($value);
-            }
-        }
+        $this->mapper = $mapper;
 
         return $this;
     }
 
     /**
-     * Detemines the name of the getter method for given property name
+     * Accessor for the data mapper
      *
-     * @param string $property  The property to determine the getter for
-     * @return string   The name of the getter method
+     * @return \PHPExif\Mapper\MapperInterface
      */
-    protected function determinePropertyGetter($property)
+    public function getMapper()
     {
-        $method = 'get' . ucfirst($property);
-        return $method;
+        if (null === $this->mapper) {
+            // lazy load one
+            $mapper = new $this->mapperClass;
+
+            $this->setMapper($mapper);
+        }
+
+        return $this->mapper;
     }
 
     /**
-     * Detemines the name of the setter method for given property name
+     * Mutator for the hydrator
      *
-     * @param string $property  The property to determine the setter for
-     * @return string   The name of the setter method
+     * @param \PHPExif\Hydrator\HydratorInterface $hydrator
+     * @return \PHPExif\Adapter\AdapterInterface;
      */
-    protected function determinePropertySetter($property)
+    public function setHydrator(HydratorInterface $hydrator)
     {
-        $method = 'set' . ucfirst($property);
-        return $method;
+        $this->hydrator = $hydrator;
+
+        return $this;
     }
 
     /**
-     * Get a list of the class constants prefixed with given $type
+     * Accessor for the data hydrator
      *
-     * @param string $type
-     * @return array
+     * @return \PHPExif\Hydrator\HydratorInterface
      */
-    public function getClassConstantsOfType($type)
+    public function getHydrator()
     {
-        $class = new \ReflectionClass(get_called_class());
-        $constants = $class->getConstants();
-
-        $list = array();
-        $type = strtoupper($type) . '_';
-        foreach ($constants as $key => $value) {
-            if (strpos($key, $type) === 0) {
-                $list[$key] = $value;
-            }
+        if (null === $this->hydrator) {
+            // lazy load one
+            $hydrator = new $this->hydratorClass;
+
+            $this->setHydrator($hydrator);
         }
-        return $list;
+
+        return $this->hydrator;
     }
 
     /**
-     * Returns an array notation of current instance
+     * Set array of options in the current object
      *
-     * @return array
+     * @param array $options
+     * @return \PHPExif\Reader\AdapterAbstract
      */
-    public function toArray()
+    public function setOptions(array $options)
     {
-        $rc = new \ReflectionClass(get_class($this));
-        $properties = $rc->getProperties();
-        $arrResult = array();
-
-        foreach ($properties as $rp) {
-            /* @var $rp \ReflectionProperty */
-            $getter = $this->determinePropertyGetter($rp->getName());
-            if (!method_exists($this, $getter)) {
-                continue;
-            }
-            $arrResult[$rp->getName()] = $this->$getter();
-        }
+        $hydrator = $this->getHydrator();
+        $hydrator->hydrate($this, $options);
 
-        return $arrResult;
+        return $this;
     }
 }

tests/PHPExif/Adapter/AdapterAbstractTest.php

@@ -12,97 +12,6 @@ public function setUp()
         $this->adapter = new \PHPExif\Adapter\Native();
     }
 
-    /**
-     * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::determinePropertyGetter
-     */
-    public function testDeterminePropertyGetter()
-    {
-        $reflMethod = new \ReflectionMethod('\PHPExif\Adapter\Native', 'determinePropertyGetter');
-        $reflMethod->setAccessible(true);
-
-        $result = $reflMethod->invoke(
-            $this->adapter,
-            'foo'
-        );
-
-        $this->assertEquals('getFoo', $result);
-    }
-
-    /**
-     * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::determinePropertySetter
-     */
-    public function testDeterminePropertySetter()
-    {
-        $reflMethod = new \ReflectionMethod('\PHPExif\Adapter\Native', 'determinePropertySetter');
-        $reflMethod->setAccessible(true);
-
-        $result = $reflMethod->invoke(
-            $this->adapter,
-            'foo'
-        );
-
-        $this->assertEquals('setFoo', $result);
-    }
-
-    /**
-     * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getClassConstantsOfType
-     */
-    public function testGetClassConstantsOfTypeAlwaysReturnsArray()
-    {
-        $result = $this->adapter->getClassConstantsOfType('sections');
-        $this->assertInternalType('array', $result);
-        $result = $this->adapter->getClassConstantsOfType('foo');
-        $this->assertInternalType('array', $result);
-    }
-
-    /**
-     * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getClassConstantsOfType
-     */
-    public function testGetClassConstantsOfTypeReturnsCorrectData()
-    {
-        $expected = array(
-            'SECTIONS_AS_ARRAYS' => \PHPExif\Adapter\Native::SECTIONS_AS_ARRAYS,
-            'SECTIONS_FLAT' => \PHPExif\Adapter\Native::SECTIONS_FLAT,
-        );
-        $actual = $this->adapter->getClassConstantsOfType('sections');
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::toArray
-     */
-    public function testToArrayReturnsPropertiesWithGetters()
-    {
-        $expected = array(
-            'requiredSections',
-            'includeThumbnail',
-            'sectionsAsArrays',
-        );
-        $result = $this->adapter->toArray();
-        $actual = array_keys($result);
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::toArray
-     */
-    public function testToArrayOmmitsPropertiesWithoutGetters()
-    {
-        $expected = array(
-            'iptcMapping',
-        );
-        $result = $this->adapter->toArray();
-        $actual = array_keys($result);
-        $diff = array_diff($expected, $actual);
-        $this->assertEquals($expected, $diff);
-    }
-
     /**
      * @group adapter
      * @covers \PHPExif\Adapter\AdapterAbstract::setOptions
@@ -127,7 +36,7 @@ public function testSetOptionsCorrectlySetsProperties()
         $this->adapter->setOptions($expected);
 
         foreach ($expected as $key => $value) {
-            $reflProp = new \ReflectionProperty('\PHPExif\Adapter\Native', $key);
+            $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\Native', $key);
             $reflProp->setAccessible(true);
             $this->assertEquals($value, $reflProp->getValue($this->adapter));
         }
@@ -145,7 +54,7 @@ public function testSetOptionsIgnoresPropertiesWithoutSetters()
         $this->adapter->setOptions($expected);
 
         foreach ($expected as $key => $value) {
-            $reflProp = new \ReflectionProperty('\PHPExif\Adapter\Native', $key);
+            $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\Native', $key);
             $reflProp->setAccessible(true);
             $this->assertNotEquals($value, $reflProp->getValue($this->adapter));
         }
@@ -166,7 +75,7 @@ public function testConstructorSetsOptions()
         $adapter = new \PHPExif\Adapter\Native($expected);
 
         foreach ($expected as $key => $value) {
-            $reflProp = new \ReflectionProperty('\PHPExif\Adapter\Native', $key);
+            $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\Native', $key);
             $reflProp->setAccessible(true);
             $this->assertEquals($value, $reflProp->getValue($adapter));
         }