Support tool paths in factory (#73)

--------- Co-authored-by: Martin Stone <[email protected]>
LycheeOrg · Jul 1, 2024 · b9535df · b9535df
1 parent 8a44f53
commit b9535df
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 25 deletions.
diff --git a/lib/PHPExif/Adapter/AbstractAdapter.php b/lib/PHPExif/Adapter/AbstractAdapter.php
@@ -30,7 +30,7 @@ abstract class AbstractAdapter implements AdapterInterface
      *
      * @param array $options Optional array of data to initialize the object with
      */
-    public function __construct(array $options = array())
+    public function __construct(array $options = [])
     {
         if (count($options) > 0) {
             $this->setOptions($options);
@@ -43,7 +43,7 @@ public function __construct(array $options = array())
      * @param \PHPExif\Contracts\MapperInterface $mapper
      * @return \PHPExif\Contracts\AdapterInterface
      */
-    public function setMapper(MapperInterface $mapper): AdapterInterface
+    final public function setMapper(MapperInterface $mapper): AdapterInterface
     {
         $this->mapper = $mapper;
 

diff --git a/lib/PHPExif/Adapter/Exiftool.php b/lib/PHPExif/Adapter/Exiftool.php
@@ -32,9 +32,22 @@ class Exiftool extends AbstractAdapter
      */
     protected string $toolPath = '';
     protected bool $numeric = true;
-    protected array $encoding = array();
+    protected array $encoding = [];
     protected string $mapperClass = MapperExiftool::class;
 
+    /**
+     * Set up Exiftool adapter
+     *
+     * @param array $options option to be passed to the parent
+     * @param string $path optional path to the tool
+     * @return self
+     */
+    public function __construct(array $options = [], string $path = '')
+    {
+        parent::__construct($options);
+        $this->toolPath = $path;
+    }
+
     /**
      * Setter for the exiftool binary path
      *

diff --git a/lib/PHPExif/Adapter/FFprobe.php b/lib/PHPExif/Adapter/FFprobe.php
@@ -42,6 +42,19 @@ class FFprobe extends AbstractAdapter
     protected string $mapperClass = MapperFFprobe::class;
 
 
+    /**
+     * Set up FFprobe adapter
+     *
+     * @param array $options option to be passed to the parent
+     * @param string $path optional path to the tool
+     * @return self
+     */
+    public function __construct(array $options = [], string $path = '')
+    {
+        parent::__construct($options);
+        $this->toolPath = $path;
+    }
+
     /**
      * Setter for the exiftool binary path
      *

diff --git a/lib/PHPExif/Adapter/ImageMagick.php b/lib/PHPExif/Adapter/ImageMagick.php
@@ -52,6 +52,7 @@ class ImageMagick extends AbstractAdapter
     public function getExifFromFile(string $file): Exif
     {
         /* Create the object */
+        /** @disregard P1009 */
         $im = new Imagick($file);
 
         /* Get the EXIF information */

diff --git a/lib/PHPExif/Adapter/Native.php b/lib/PHPExif/Adapter/Native.php
@@ -41,7 +41,7 @@ class Native extends AbstractAdapter
      *
      * @var array
      */
-    protected array $requiredSections = array();
+    protected array $requiredSections = [];
 
     /**
      * Include the thumbnail in the EXIF data?
@@ -200,7 +200,7 @@ public function getExifFromFile(string $file): Exif
 
         // exif_read_data failed to read exif data (i.e. not a jpg/tiff)
         if (false === $data) {
-            $data = array();
+            $data = [];
             $data['FileSize'] = filesize($file);
             $data['FileName'] = basename($file);
             $data['MimeType'] = $mimeType;
@@ -248,7 +248,7 @@ public function getExifFromFile(string $file): Exif
     public function getIptcData(string $file): array
     {
         getimagesize($file, $info);
-        $arrData = array();
+        $arrData = [];
         if (isset($info['APP13'])) {
             try {
                 $iptc = iptcparse($info['APP13']);

diff --git a/lib/PHPExif/Exif.php b/lib/PHPExif/Exif.php
@@ -62,19 +62,19 @@ class Exif
     /**
      * The mapped EXIF data
      */
-    protected array $data = array();
+    protected array $data = [];
 
     /**
      * The raw EXIF data
      */
-    protected array $rawData = array();
+    protected array $rawData = [];
 
     /**
      * Class constructor
      *
      * @param array $data
      */
-    public function __construct(array $data = array())
+    public function __construct(array $data = [])
     {
         $this->setData($data);
     }

diff --git a/lib/PHPExif/Mapper/Exiftool.php b/lib/PHPExif/Mapper/Exiftool.php
@@ -202,7 +202,7 @@ public function setNumeric(bool $numeric): Exiftool
      */
     public function mapRawData(array $data): array
     {
-        $mappedData = array();
+        $mappedData = [];
 
         foreach ($data as $field => $value) {
             if (!array_key_exists($field, $this->map)) {

diff --git a/lib/PHPExif/Mapper/FFprobe.php b/lib/PHPExif/Mapper/FFprobe.php
@@ -90,7 +90,7 @@ class FFprobe extends AbstractMapper
      */
     public function mapRawData(array $data): array
     {
-        $mappedData = array();
+        $mappedData = [];
 
         foreach ($data as $field => $value) {
             if ($this->isSection($field) && is_array($value)) {

diff --git a/lib/PHPExif/Mapper/ImageMagick.php b/lib/PHPExif/Mapper/ImageMagick.php
@@ -123,7 +123,7 @@ class ImageMagick extends AbstractMapper
      */
     public function mapRawData(array $data): array
     {
-        $mappedData = array();
+        $mappedData = [];
 
         foreach ($data as $field => $value) {
             if (!array_key_exists($field, $this->map)) {

diff --git a/lib/PHPExif/Mapper/Native.php b/lib/PHPExif/Mapper/Native.php
@@ -147,7 +147,7 @@ class Native extends AbstractMapper
      */
     public function mapRawData(array $data): array
     {
-        $mappedData = array();
+        $mappedData = [];
 
         foreach ($data as $field => $value) {
             if ($this->isSection($field) && is_array($value)) {

diff --git a/lib/PHPExif/Reader/Reader.php b/lib/PHPExif/Reader/Reader.php
@@ -34,18 +34,19 @@ public function __construct(protected readonly AdapterInterface $adapter)
      * Factory for the reader
      *
      * @param ReaderType $type
+     * @param string $path
      * @return Reader
      */
-    public static function factory(ReaderType $type): Reader
+    public static function factory(ReaderType $type, string $path = ''): Reader
     {
-        $classname = get_called_class();
         $adapter = match ($type) {
             ReaderType::NATIVE => new NativeAdapter(),
-            ReaderType::EXIFTOOL => new ExiftoolAdapter(),
-            ReaderType::FFPROBE => new FFProbeAdapter(),
+            ReaderType::EXIFTOOL => new ExiftoolAdapter(path: $path),
+            ReaderType::FFPROBE => new FFProbeAdapter(path: $path),
             ReaderType::IMAGICK => new ImageMagickAdapter(),
         };
-        return new $classname($adapter);
+
+        return new Reader($adapter);
     }
 
     /**

diff --git a/tests/PHPExif/Adapter/AdapterAbstractTest.php b/tests/PHPExif/Adapter/AdapterAbstractTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
      */
     public function testSetOptionsReturnsCurrentInstance()
     {
-        $result = $this->adapter->setOptions(array());
+        $result = $this->adapter->setOptions([]);
         $this->assertSame($this->adapter, $result);
     }
 

diff --git a/tests/PHPExif/Adapter/ExiftoolProcOpenTest.php b/tests/PHPExif/Adapter/ExiftoolProcOpenTest.php
@@ -15,7 +15,7 @@
     // stub the function
     use PHPExif\Reader\PhpExifReaderException;
 
-    function proc_open($cmd, array $descriptorspec, &$pipes = array())
+    function proc_open($cmd, array $descriptorspec, &$pipes = [])
     {
         global $mockProcOpen;
         if (isset($mockProcOpen) && !$mockProcOpen) {

diff --git a/tests/PHPExif/ExifTest.php b/tests/PHPExif/ExifTest.php
@@ -22,7 +22,7 @@ public function setUp(): void
      */
     public function testConstructorCallsSetData()
     {
-        $input = array();
+        $input = [];
 
         // Get mock, without the constructor being called
         $mock = $this->getMockBuilder(Exif::class)

diff --git a/tests/PHPExif/Mapper/ExiftoolMapperTest.php b/tests/PHPExif/Mapper/ExiftoolMapperTest.php
@@ -94,7 +94,7 @@ public function testMapRawDataMapsFieldsCorrectly()
 
         // create raw data
         $keys = array_keys($map);
-        $values = array();
+        $values = [];
         $values = array_pad($values, count($keys), 'foo');
         $rawData = array_combine($keys, $values);
 

diff --git a/tests/PHPExif/Mapper/FFprobeMapperTest.php b/tests/PHPExif/Mapper/FFprobeMapperTest.php
@@ -63,7 +63,7 @@ public function testMapRawDataMapsFieldsCorrectly()
 
         // create raw data
         $keys = array_keys($map);
-        $values = array();
+        $values = [];
         $values = array_pad($values, count($keys), 'foo');
         $rawData = array_combine($keys, $values);
 

diff --git a/tests/PHPExif/Mapper/ImageMagickMapperTest.php b/tests/PHPExif/Mapper/ImageMagickMapperTest.php
@@ -57,7 +57,7 @@ public function testMapRawDataMapsFieldsCorrectly()
 
         // create raw data
         $keys = array_unique(array_keys($map));
-        $values = array();
+        $values = [];
         $values = array_pad($values, count($keys), 'foo');
         $rawData = array_combine($keys, $values);
 

diff --git a/tests/PHPExif/Mapper/NativeMapperTest.php b/tests/PHPExif/Mapper/NativeMapperTest.php
@@ -59,7 +59,7 @@ public function testMapRawDataMapsFieldsCorrectly()
 
         // create raw data
         $keys = array_keys($map);
-        $values = array();
+        $values = [];
         $values = array_pad($values, count($keys), 'foo');
         $rawData = array_combine($keys, $values);