Merge pull request #3298 from alchemy-fr/PHRAS-2750-update-phpexiftool-and-exiftool

PHRAS-2750 : #comment merge for 4.1 update phpexiftool to 0.7.3 in 4.1
2025-10-23 18:03:17 +00:00 · 2020-01-20 15:22:46 +01:00
parent 85b4cba0d1 572e8b0def
commit 8db785d5db
4 changed files with 80 additions and 47 deletions
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,18 @@
            }
       }
    },
+    {
+      "type": "package",
+      "package": {
+        "name": "exiftool/exiftool",
+        "version": "11",
+        "source": {
+          "url": "https://github.com/exiftool/exiftool.git",
+          "type": "git",
+          "reference": "11.84"
+        }
+      }
+    },
    {
      "type": "vcs",
      "url": "https://github.com/alchemy-fr/tcpdf-clone"
@@ -95,7 +107,7 @@
    "pagerfanta/pagerfanta": "^1.0",
    "php-ffmpeg/php-ffmpeg": "~0.5.0",
    "php-xpdf/php-xpdf": "~0.2.1",
-    "phpexiftool/exiftool": "10.10",
+    "exiftool/exiftool": "^11",
    "ramsey/uuid": "^3.0",
    "roave/security-advisories": "dev-master",
    "silex/silex": "^1.3.0",
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
    "_readme": [
        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "d0c8742d02e8d51c702c26ecb5502b30",
+    "content-hash": "5a4a0be62b13071a6b06893b7ce08372",
    "packages": [
        {
            "name": "alchemy-fr/tcpdf-clone",
@@ -137,6 +137,12 @@
                "url": "https://github.com/alchemy-fr/embed-bundle.git",
                "reference": "cbaa5e34b7b6ccbe128f8c804649c8a3ecd1e621"
            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/cbaa5e34b7b6ccbe128f8c804649c8a3ecd1e621",
+                "reference": "cbaa5e34b7b6ccbe128f8c804649c8a3ecd1e621",
+                "shasum": ""
+            },
            "require-dev": {
                "phpunit/phpunit": "^4.7",
                "silex/silex": "^1.0.0",
@@ -373,30 +379,27 @@
        },
        {
            "name": "alchemy/phpexiftool",
-            "version": "0.7.2",
+            "version": "0.7.3",
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/PHPExiftool.git",
-                "reference": "ba1cb51eceb6562d7996023478977a8739de188b"
+                "reference": "0b22e7d7cc40f2a6b9c85c0cfbd968a39a31dab2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/PHPExiftool/zipball/ba1cb51eceb6562d7996023478977a8739de188b",
-                "reference": "ba1cb51eceb6562d7996023478977a8739de188b",
+                "url": "https://api.github.com/repos/alchemy-fr/PHPExiftool/zipball/0b22e7d7cc40f2a6b9c85c0cfbd968a39a31dab2",
+                "reference": "0b22e7d7cc40f2a6b9c85c0cfbd968a39a31dab2",
                "shasum": ""
            },
            "require": {
                "doctrine/cache": "^1.0",
                "doctrine/collections": "^1.0",
+                "exiftool/exiftool": "^11",
                "monolog/monolog": "^1.3",
                "php": ">=5.5.9",
-                "phpexiftool/exiftool": "10.10",
                "symfony/console": "^2.1|^3.0",
                "symfony/process": "^2.1|^3.0"
            },
-            "replace": {
-                "phpexiftool/phpexiftool": "<0.5.0"
-            },
            "require-dev": {
                "jms/serializer": "~0.10|^1.0",
                "phpunit/phpunit": "^4.0|^5.0",
@@ -442,7 +445,7 @@
                "exiftool",
                "metadata"
            ],
-            "time": "2019-02-13T13:06:43+00:00"
+            "time": "2020-01-17T14:28:33+00:00"
        },
        {
            "name": "alchemy/queue-bundle",
@@ -2095,6 +2098,16 @@
            ],
            "time": "2012-05-30T15:01:08+00:00"
        },
+        {
+            "name": "exiftool/exiftool",
+            "version": "11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/exiftool/exiftool.git",
+                "reference": "11.84"
+            },
+            "type": "library"
+        },
        {
            "name": "facebook/graph-sdk",
            "version": "5.6.1",
@@ -5395,39 +5408,6 @@
            ],
            "time": "2015-05-17T12:39:23+00:00"
        },
-        {
-            "name": "phpexiftool/exiftool",
-            "version": "10.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/alchemy-fr/exiftool.git",
-                "reference": "0833cab894c890353192a83011428525a318bedf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/exiftool/zipball/0833cab894c890353192a83011428525a318bedf",
-                "reference": "0833cab894c890353192a83011428525a318bedf",
-                "shasum": ""
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Perl Licensing"
-            ],
-            "authors": [
-                {
-                    "name": "Phil Harvey",
-                    "email": "phil@owl.phy.queensu.ca",
-                    "homepage": "http://www.sno.phy.queensu.ca/~phil/exiftool/"
-                }
-            ],
-            "description": "Exiftool is a library for reading, writing and editing meta information. This package is not PHP, but required for the main PHP driver : PHP Exiftool",
-            "keywords": [
-                "exiftool",
-                "metadatas"
-            ],
-            "time": "2016-01-25T11:10:14+00:00"
-        },
        {
            "name": "phpoption/phpoption",
            "version": "1.5.0",
@@ -5892,6 +5872,12 @@
                "url": "https://github.com/Roave/SecurityAdvisories.git",
                "reference": "0698207bf8a9bed212fdde2d8c7cdc77085660c4"
            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0698207bf8a9bed212fdde2d8c7cdc77085660c4",
+                "reference": "0698207bf8a9bed212fdde2d8c7cdc77085660c4",
+                "shasum": ""
+            },
            "conflict": {
                "adodb/adodb-php": "<5.20.6",
                "amphp/artax": ">=2,<2.0.4|>0.7.1,<1.0.4",
@@ -7716,6 +7702,7 @@
                "code",
                "zf2"
            ],
+            "abandoned": "laminas/laminas-code",
            "time": "2016-04-20T17:26:42+00:00"
        },
        {
@@ -7770,6 +7757,7 @@
                "events",
                "zf2"
            ],
+            "abandoned": "laminas/laminas-eventmanager",
            "time": "2016-02-18T20:53:00+00:00"
        }
    ],
@@ -7966,6 +7954,39 @@
            ],
            "time": "2016-11-25T06:54:22+00:00"
        },
+        {
+            "name": "phpexiftool/exiftool",
+            "version": "10.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/alchemy-fr/exiftool.git",
+                "reference": "0833cab894c890353192a83011428525a318bedf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/alchemy-fr/exiftool/zipball/0833cab894c890353192a83011428525a318bedf",
+                "reference": "0833cab894c890353192a83011428525a318bedf",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Perl Licensing"
+            ],
+            "authors": [
+                {
+                    "name": "Phil Harvey",
+                    "email": "phil@owl.phy.queensu.ca",
+                    "homepage": "http://www.sno.phy.queensu.ca/~phil/exiftool/"
+                }
+            ],
+            "description": "Exiftool is a library for reading, writing and editing meta information. This package is not PHP, but required for the main PHP driver : PHP Exiftool",
+            "keywords": [
+                "exiftool",
+                "metadatas"
+            ],
+            "time": "2016-01-25T11:10:14+00:00"
+        },
        {
            "name": "phpspec/prophecy",
            "version": "v1.6.2",
--- a/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
@@ -60,7 +60,7 @@ class BinariesRequirements extends RequirementCollection implements RequirementI
            );
        }

-        $exiftool = __DIR__ . '/../../../../../vendor/phpexiftool/exiftool/exiftool' . (defined('PHP_WINDOWS_VERSION_BUILD') ? '.exe' : '');
+        $exiftool = __DIR__ . '/../../../../../vendor/exiftool/exiftool/exiftool' . (defined('PHP_WINDOWS_VERSION_BUILD') ? '.exe' : '');

        $this->addRequirement(
            is_file($exiftool) && is_executable($exiftool),
--- a/resources/ansible/roles/app/tasks/main.yml
+++ b/resources/ansible/roles/app/tasks/main.yml
@@ -66,5 +66,5 @@

 - name: Make exiftool executable
  file:
-    path: /vagrant/vendor/phpexiftool/exiftool/exiftool
+    path: /vagrant/vendor/exiftool/exiftool/exiftool
    mode: 0755