Fixed unit test for php 5.3.x

Author: Tom Van Herreweghe

lib/PHPExif/Reader.php

@@ -27,17 +27,17 @@ class Reader
 {
     const TYPE_NATIVE   = 'native';
     const TYPE_EXIFTOOL = 'exiftool';
-    
+
     /**
      * The current adapter
      *
      * @var \PHPExif\Reader\AdapterInterface
      */
     protected $adapter;
-    
+
     /**
      * Reader constructor
-     * 
+     *
      * @param \PHPExif\Reader\AdapterInterface $adapter
      */
     public function __construct(AdapterInterface $adapter = null)
@@ -46,23 +46,23 @@ public function __construct(AdapterInterface $adapter = null)
             $this->setAdapter($adapter);
         }
     }
-    
+
     /**
      * Setter for the reader adapter
-     * 
+     *
      * @param \PHPExif\Reader\AdapterInterface $adapter
      * @return \PHPExif\Reader Current instance for chaining
      */
     public function setAdapter(AdapterInterface $adapter)
     {
         $this->adapter = $adapter;
-        
+
         return $this;
     }
-    
+
     /**
      * Getter for the reader adapter
-     * 
+     *
      * @return \PHPExif\Reader\AdapterInterface
      * @throws NoAdapterException When no adapter is set
      */
@@ -71,36 +71,38 @@ public function getAdapter()
         if (empty($this->adapter)) {
             throw new NoAdapterException('No adapter set in the reader');
         }
-        
+
         return $this->adapter;
     }
-    
+
     /**
      * Factory for the reader
-     * 
+     *
      * @param string $type
      * @return \PHPExif\Reader
      * @throws \InvalidArgumentException When given type is invalid
      */
     public static function factory($type)
     {
         $classname = get_called_class();
-        
+
+        $adapter = null;
         switch ($type) {
             case self::TYPE_NATIVE:
                 $adapter = new Reader\Adapter\Native();
-                return new $classname($adapter);
+                break;
             case self::TYPE_EXIFTOOL:
                 $adapter = new Reader\Adapter\Exiftool();
-                return new $classname($adapter);
+                break;
             default:
                 throw new \InvalidArgumentException(
                     sprintf('Unknown type "%1$s"', $type)
                 );
                 break;
         }
+        return new $classname($adapter);
     }
-    
+
     /**
      * Reads & parses the EXIF data from given file
      *

tests/PHPExif/Reader/Adapter/ExiftoolTest.php

@@ -34,7 +34,7 @@ public function testSetToolPathInProperty()
         $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Adapter\Exiftool', 'toolPath');
         $reflProperty->setAccessible(true);
 
-        $expected = PHP_BINARY;
+        $expected = '/tmp';
         $this->adapter->setToolPath($expected);
 
         $this->assertEquals($expected, $reflProperty->getValue($this->adapter));
@@ -138,8 +138,8 @@ public function testGetCliOutput()
         $result = $reflMethod->invoke(
             $this->adapter,
             sprintf(
-                '%1$s -v',
-                PHP_BINARY
+                '%1$s',
+                'pwd'
             )
         );