Accept an empty value for --version-override option to say "don't che…

…ck C headers"
FriendsOfPHP · Jan 23, 2021 · 727be6b · 727be6b
1 parent fec521d
commit 727be6b
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 11 deletions.
diff --git a/features/pecl/install-extensions.feature b/features/pecl/install-extensions.feature
@@ -20,7 +20,34 @@ Feature: download and install PECL extensions
       | apc       | APC       |
       | apcu      | apcu      |
       | mongo     | mongo     |
-      | memcache  | memcache  |
+
+  Scenario Outline: Does NOT install extensions from PECL repository having wrong version in source code
+    Given I run "pickle install <extension>-<version> --dry-run"
+    Then it should fail
+    And the output should contain:
+      """
+      Version mismatch - '4.0.5.2' != '8.0' in source vs. XML
+      """
+
+    Examples:
+      | extension | version |
+      | memcache  | 8.0     |
+
+  Scenario Outline: Install extensions from PECL repository having wrong version in source code
+    Given I run "pickle install <extension>-<version> --dry-run --version-override"
+    Then it should pass
+    And the output should contain:
+      """
+      - Installing <extension> (<version>)
+      """
+    And the output should contain:
+      """
+      Package name                      | <pretty>
+      """
+
+    Examples:
+      | extension | version | pretty    |
+      | memcache  | 8.0     | memcache  |
 
   Scenario Outline: Install extensions from PECL repository with version constraint
     Given I run "pickle install <extension>@<version> --dry-run"

diff --git a/src/Base/Abstracts/Package.php b/src/Base/Abstracts/Package.php
@@ -75,6 +75,9 @@ public function getUniqueNameForFs()
         is forced to implement it on its own. But so far ... */
     public function updateVersion($version = null)
     {
+        if ($version === '') {
+            return;
+        }
         /* Be sure package root is set before! */
         if ($version === null) {
             $version = new Header\Version($this);

diff --git a/src/Console/Command/InfoCommand.php b/src/Console/Command/InfoCommand.php
@@ -69,7 +69,7 @@ protected function configure()
                 'version-override',
                 null,
                 InputOption::VALUE_OPTIONAL,
-                'Override detected version'
+                'Override detected version (no value - or empty value - to use the version from package.xml)'
             );
     }
 

diff --git a/src/Console/Command/InstallerCommand.php b/src/Console/Command/InstallerCommand.php
@@ -102,7 +102,7 @@ protected function configure()
                 'version-override',
                 null,
                 InputOption::VALUE_OPTIONAL,
-                'Override detected version'
+                'Override detected version (no value - or empty value - to use the version from package.xml)'
             );
 
         if (defined('PHP_WINDOWS_VERSION_MAJOR')) {

diff --git a/src/Console/Helper/PackageHelper.php b/src/Console/Helper/PackageHelper.php
@@ -109,7 +109,14 @@ public function convey(InputInterface $input, OutputInterface $output, $path, $t
         $io = new ConsoleIO($input, $output, ($helperSet ? $helperSet : new HelperSet()));
 
         $no_convert = $input->hasOption('no-convert') ? $input->getOption('no-convert') : false;
-        $versionOverride = $input->hasOption('version-override') ? $input->getOption('version-override') : null;
+        if ($input->hasOption('version-override')) {
+            $versionOverride = $input->getOption('version-override');
+            if ($versionOverride === null && $input->hasParameterOption('--version-override', true)) {
+                $versionOverride = '';
+            }
+        } else {
+            $versionOverride = null;
+        }
 
         return (new Convey($path, $io))->deliver($target, $no_convert, $versionOverride);
     }

diff --git a/src/Package/PHP/Util/PackageXml.php b/src/Package/PHP/Util/PackageXml.php
@@ -100,9 +100,11 @@ public function dump($fname = null)
             $this->jsonPath = $fname;
         }
 
-        $version = $this->versionOverride ?? new Header\Version($this->package);
-        if ($version != $this->package->getPrettyVersion()) {
-            throw new \Exception("Version mismatch - '".$version."' != '".$this->package->getVersion().'. in source vs JSON');
+        if ($this->versionOverride !== '') {
+            $version = $this->versionOverride ?? (string) new Header\Version($this->package);
+            if ($version !== $this->package->getPrettyVersion()) {
+                throw new \Exception("Version mismatch - '".$version."' != '".$this->package->getVersion().'. in source vs JSON');
+            }
         }
 
         $dumper = new Dumper();

diff --git a/src/Package/PHP/Util/XML/Loader.php b/src/Package/PHP/Util/XML/Loader.php
@@ -77,7 +77,7 @@ public function load($path, $versionOverride = null)
 
         $package = [
             'name' => (string) $xml->name,
-            'version' => $versionOverride ?? (string) $xml->version->release,
+            'version' => (string) $versionOverride === '' ? (string) $xml->version->release : $versionOverride,
             'stability' => (string) $xml->stability->release,
             'description' => (string) $xml->summary,
         ];
@@ -136,9 +136,11 @@ public function load($path, $versionOverride = null)
         }
         $ret_pkg->setRootDir(dirname($path));
 
-        $src_ver = $versionOverride ?? new Header\Version($ret_pkg);
-        if ($src_ver != $ret_pkg->getPrettyVersion()) {
-            throw new \Exception("Version mismatch - '".$src_ver."' != '".$ret_pkg->getPrettyVersion()."' in source vs. XML");
+        if ($versionOverride !== '') {
+            $src_ver = $versionOverride ?? (string) new Header\Version($ret_pkg);
+            if ($src_ver !== $ret_pkg->getPrettyVersion()) {
+                throw new \Exception("Version mismatch - '".$src_ver."' != '".$ret_pkg->getPrettyVersion()."' in source vs. XML");
+            }
         }
         $ret_pkg->setType('extension');