v1.10.17

(cherry picked from commit ba1a04d525)

composer-rpm.patch

@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+--- ./bin/composer.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./bin/composer	2020-02-14 15:37:43.336528140 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2019-08-03 10:30:42.908772550 +0200
-@@ -306,7 +306,7 @@ EOF;
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-02-14 15:37:43.336528140 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-02-14 15:38:56.710201606 +0100
+@@ -305,7 +305,7 @@ EOF;
+         $this->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
+--- ./src/Composer/Compiler.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Compiler.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2019-08-03 10:30:42.908772550 +0200
-+++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2020-02-14 15:37:43.336528140 +0100
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -46,7 +46,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      private $path;
      private $rfs;
-@@ -160,7 +160,7 @@ class JsonFile
+@@ -173,7 +173,7 @@ class JsonFile
          }
  
          if (null === $schemaFile) {
@@ -56,8 +56,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2019-08-03 10:30:42.908772550 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {

composer.spec

@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,15 +10,17 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    314aa57fdcfc942065996f59fb73a8b3f74f3fa5
+%bcond_without       tests
+
+%global gh_commit    09d42e18394d8594be24e37923031c4b7442a1cb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
-%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
+%global run_version  1.0.0
 
-%global upstream_version 1.9.0
+%global upstream_version 1.10.17
 #global upstream_prever  RC
 
 %if 0
@@ -49,31 +51,25 @@ Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
-%if %{with_tests}
-BuildRequires:  php-justinrainbow-json-schema5
+%if %{with tests}
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
-BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
-BuildRequires:  (php-composer(composer/xdebug-handler)  >= 1.1 with  php-composer(composer/xdebug-handler)   <  2)
-BuildRequires:  (php-composer(seld/jsonlint)            >= 1.4 with  php-composer(seld/jsonlint)             <  2)
-BuildRequires:  (php-composer(seld/phar-utils)          >= 1.0 with  php-composer(seld/phar-utils)           <  2)
-BuildRequires:  (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+BuildRequires:  (php-composer(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
+BuildRequires:  (php-composer(composer/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
+BuildRequires:  (php-composer(composer/spdx-licenses)    >= 1.2    with  php-composer(composer/spdx-licenses)    <  2)
+BuildRequires:  (php-composer(composer/xdebug-handler)   >= 1.1    with  php-composer(composer/xdebug-handler)   <  2)
+BuildRequires:  (php-composer(seld/jsonlint)             >= 1.4    with  php-composer(seld/jsonlint)             <  2)
+BuildRequires:  (php-composer(seld/phar-utils)           >= 1.0    with  php-composer(seld/phar-utils)           <  2)
+BuildRequires:  (php-composer(psr/log)                   >= 1.0    with  php-composer(psr/log)                   <  2)
+BuildRequires:  (php-composer(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
 %else
-BuildRequires:  php-composer(composer/ca-bundle)        <  2
-BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
-BuildRequires:  php-composer(composer/semver)           <  2
-BuildRequires:  php-composer(composer/semver)           >= 1.0
-BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
-BuildRequires:  php-composer(composer/xdebug-handler)   >= 1.1
-BuildRequires:  php-composer(composer/xdebug-handler)   <  2
-BuildRequires:  php-composer(seld/jsonlint)             <  2
-BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
-BuildRequires:  php-composer(seld/phar-utils)           <  2
-BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
-BuildRequires:  php-composer(psr/log)                   <  2
-BuildRequires:  php-composer(psr/log)                   >= 1.0
+BuildRequires:  php-composer-ca-bundle
+BuildRequires:  php-composer-semver
+BuildRequires:  php-composer-spdx-licenses               >= 1.2
+BuildRequires:  php-composer-xdebug-handler              >= 1.1
+BuildRequires:  php-jsonlint                             >= 1.4
+BuildRequires:  php-seld-phar-utils
+BuildRequires:  php-PsrLog
+BuildRequires:  php-justinrainbow-json-schema5           >= 5.2.10
 %endif
 BuildRequires:  %{symfony_prefix}-console
 BuildRequires:  %{symfony_prefix}-finder
@@ -81,9 +77,9 @@ BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^4.8.35 || ^5.7",
-#        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
+#        "symfony/phpunit-bridge": "^4.2",
+#        "phpspec/prophecy": "^1.10"
+BuildRequires:  phpunit
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
@@ -96,40 +92,34 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.2",
 #        "composer/xdebug-handler": "^1.1",
-#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+#        "justinrainbow/json-schema": "^5.2.10",
 #        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
 #        "seld/phar-utils": "^1.0",
-#        "symfony/console": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/process": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0",
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-justinrainbow-json-schema5
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
-Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
-Requires:       (php-composer(composer/xdebug-handler)  >= 1.1 with  php-composer(composer/xdebug-handler)   <  2)
-Requires:       (php-composer(seld/jsonlint)            >= 1.4 with  php-composer(seld/jsonlint)             <  2)
-Requires:       (php-composer(seld/phar-utils)          >= 1.0 with  php-composer(seld/phar-utils)           <  2)
-Requires:       (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+Requires:       (php-composer(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
+Requires:       (php-composer(composer/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
+Requires:       (php-composer(composer/spdx-licenses)    >= 1.2    with  php-composer(composer/spdx-licenses)    <  2)
+Requires:       (php-composer(composer/xdebug-handler)   >= 1.1    with  php-composer(composer/xdebug-handler)   <  2)
+Requires:       (php-composer(seld/jsonlint)             >= 1.4    with  php-composer(seld/jsonlint)             <  2)
+Requires:       (php-composer(seld/phar-utils)           >= 1.0    with  php-composer(seld/phar-utils)           <  2)
+Requires:       (php-composer(psr/log)                   >= 1.0    with  php-composer(psr/log)                   <  2)
+Requires:       (php-composer(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
 %else
-Requires:       php-composer(composer/ca-bundle)        >= 1.0
-Requires:       php-composer(composer/ca-bundle)        <  2
-Requires:       php-composer(composer/semver)           >= 1.0
-Requires:       php-composer(composer/semver)           <  2
-Requires:       php-composer(composer/spdx-licenses)    >= 1.2
-Requires:       php-composer(composer/spdx-licenses)    <  2
-Requires:       php-composer(composer/xdebug-handler)   >= 1.1
-Requires:       php-composer(composer/xdebug-handler)   <  2
-Requires:       php-composer(seld/jsonlint)             >= 1.4
-Requires:       php-composer(seld/jsonlint)             <  2
-Requires:       php-composer(seld/phar-utils)           >= 1.0
-Requires:       php-composer(seld/phar-utils)           <  2
-Requires:       php-composer(psr/log)                   >= 1.0
-Requires:       php-composer(psr/log)                   <  2
+Requires:       php-composer-ca-bundle
+Requires:       php-composer-semver
+Requires:       php-composer-spdx-licenses               >= 1.2
+Requires:       php-composer-xdebug-handler              >= 1.1
+Requires:       php-jsonlint                             >= 1.4
+Requires:       php-seld-phar-utils
+Requires:       php-PsrLog
+Requires:       php-justinrainbow-json-schema5           >= 5.2.10
 %endif
 Requires:       %{symfony_prefix}-console
 Requires:       %{symfony_prefix}-finder
@@ -170,6 +160,7 @@ Requires:       php-zlib
 Provides:       php-composer(composer/composer) = %{version}
 # Special internal for Plugin API
 Provides:       php-composer(composer-plugin-api) = %{api_version}
+Provides:       php-composer(composer-runtime-api) = %{run_version}
 
 
 %description
@@ -209,10 +200,14 @@ sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
 
 : check Plugin API version
 php -r '
-namespace Composer\Plugin;
-include "src/Composer/Plugin/PluginInterface.php";
-if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
-  printf("Plugin API version is %s, expected %s\n", PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
+namespace Composer;
+include "src/Composer/autoload.php";
+if (version_compare(Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
+  printf("Plugin API version is %s, expected %s\n", Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
+  exit(1);
+}
+if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) {
+  printf("Plugin API version is %s, expected %s\n", Composer::RUNTIME_API_VERSION, "%{run_version}");
   exit(1);
 }'
 
@@ -242,7 +237,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
@@ -254,7 +249,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -279,6 +274,59 @@ exit $ret
 
 
 %changelog
+* Mon Nov  2 2020 Remi Collet <remi@remirepo.net> - 1.10.17-1
+- update to 1.10.17
+
+* Sun Oct 25 2020 Remi Collet <remi@remirepo.net> - 1.10.16-1
+- update to 1.10.16
+
+* Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 1.10.15-1
+- update to 1.10.15
+
+* Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.13-1
+- update to 1.10.13
+
+* Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1
+- update to 1.10.12
+
+* Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 1.10.10-1
+- update to 1.10.10
+
+* Thu Jul 16 2020 Remi Collet <remi@remirepo.net> - 1.10.9-1
+- update to 1.10.9
+
+* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 1.10.8-1
+- update to 1.10.8
+
+* Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 1.10.7-1
+- update to 1.10.7
+- raise dependency on justinrainbow/json-schema 5.2.10
+
+* Wed May  6 2020 Remi Collet <remi@remirepo.net> - 1.10.6-1
+- update to 1.10.6
+- provide php-composer(composer-runtime-api)
+
+* Fri Apr 10 2020 Remi Collet <remi@remirepo.net> - 1.10.5-1
+- update to 1.10.5
+
+* Thu Apr  9 2020 Remi Collet <remi@remirepo.net> - 1.10.4-1
+- update to 1.10.4
+
+* Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 1.10.1-1
+- update to 1.10.1
+
+* Wed Mar 11 2020 Remi Collet <remi@remirepo.net> - 1.10.0-1
+- update to 1.10.0
+
+* Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 1.9.3-1
+- update to 1.9.3
+
+* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.9.2-1
+- update to 1.9.2
+
+* Sat Nov  2 2019 Remi Collet <remi@remirepo.net> - 1.9.1-1
+- update to 1.9.1
+
 * Sat Aug  3 2019 Remi Collet <remi@remirepo.net> - 1.9.0-1
 - update to 1.9.0
 

sources

@@ -1 +1 @@
-SHA512 (composer-1.9.0-314aa57.tgz) = 5bd2f3e9685a103f830ce0fb3818b0ca2c6c8456e15ebd6683c3c04e7b5a8ba41466c6a639233e549dc9198bb45bb4f2079773409505140bf15d99635141b099
+SHA512 (composer-1.10.17-09d42e1.tgz) = db18e5c4623ed6be0f35b2d4dddddec5df6c1414c6a98b45a5b65f4bbfc7b74feb05cc2f4ecfd14ca2c17cc4988f5696672ed434f7fb2e2607c9c047c27c49c0