Downgrade safe (#46)

* downgrade Safe to allow merge with Lychee

composer.json

@@ -32,7 +32,7 @@
         "ext-fileinfo": "*",
         "neitanod/forceutf8": "^2.0.4",
         "php-ffmpeg/php-ffmpeg": "^1.0",
-        "thecodingmachine/safe": "^2.2"
+        "thecodingmachine/safe": "^1.3"
     },
     "require-dev": {
         "lychee-org/phpstan-lychee": "dev-master",

lib/PHPExif/Adapter/Exiftool.php

@@ -15,10 +15,10 @@
 use InvalidArgumentException;
 use RuntimeException;
 
-use function Safe\exec;
 use function Safe\json_decode;
 use function Safe\stream_get_contents;
 use function Safe\fclose;
+use function Safe\sprintf;
 
 /**
  * PHP Exif Exiftool Reader Adapter
@@ -102,8 +102,10 @@ public function getToolPath() : string
         if ($this->toolPath === '') {
             // Do not use "which": not available on sh
             $path = exec('command -v ' . self::TOOL_NAME);
-            // $path = exec('which ' . self::TOOL_NAME);
-            $this->setToolPath($path);
+            if ($path !== false) {
+                // $path = exec('which ' . self::TOOL_NAME);
+                $this->setToolPath($path);
+            }
         }
 
         return $this->toolPath;

lib/PHPExif/Adapter/FFprobe.php

@@ -15,7 +15,7 @@
 use InvalidArgumentException;
 use FFMpeg;
 
-use function Safe\exec;
+use function Safe\sprintf;
 use function Safe\mime_content_type;
 use function Safe\filesize;
 use function Safe\array_replace_recursive;
@@ -76,7 +76,9 @@ public function getToolPath(): string
             // Do not use "which": not available on sh
             $path = exec('command -v ' . self::TOOL_NAME);
             // $path = exec('which ' . self::TOOL_NAME);
-            $this->setToolPath($path);
+            if ($path !== false) {
+                $this->setToolPath($path);
+            }
         }
 
         return $this->toolPath;

lib/PHPExif/Mapper/Exiftool.php

@@ -16,6 +16,7 @@
 
 use function Safe\preg_match;
 use function Safe\preg_replace;
+use function Safe\sprintf;
 
 /**
  * PHP Exif Exiftool Mapper
@@ -201,7 +202,7 @@ public function setNumeric(bool $numeric) : Exiftool
     public function mapRawData(array $data) : array
     {
         $mappedData = array();
-        
+
         foreach ($data as $field => $value) {
             if (!array_key_exists($field, $this->map)) {
                 // silently ignore unknown fields

lib/PHPExif/Mapper/FFprobe.php

@@ -13,6 +13,7 @@
 
 use PHPExif\Exif;
 use Safe\DateTime;
+use function Safe\sprintf;
 
 use function Safe\preg_match;
 

lib/PHPExif/Mapper/ImageMagick.php

@@ -17,6 +17,7 @@
 use function Safe\preg_match;
 use function Safe\preg_replace;
 use function Safe\preg_split;
+use function Safe\sprintf;
 
 /**
  * PHP Exif Imagick Mapper

lib/PHPExif/Mapper/Native.php

@@ -16,6 +16,7 @@
 
 use function Safe\preg_match;
 use function Safe\preg_replace;
+use function Safe\sprintf;
 
 /**
  * PHP Exif Native Mapper