update to 1.10.6

provide php-composer(composer-runtime-api)

(cherry picked from commit 962f6927f5)

composer-rpm.patch

@@ -1,7 +1,7 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2018-07-26 09:44:36.765795459 +0200
-+++ ./bin/composer	2018-07-26 09:45:14.199012215 +0200
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
+--- ./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 !== '
  }
  
  setlocale(LC_ALL, 'C');
@@ -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	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-07-26 09:44:36.765795459 +0200
+--- ./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;
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
+         $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	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Compiler.php	2018-07-26 09:44:36.765795459 +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,20 +35,29 @@ 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	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2018-07-26 09:44:36.765795459 +0200
-@@ -156,7 +156,7 @@ class JsonFile
-             self::validateSyntax($content, $this->path);
+--- ./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;
+ 
+-    const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json';
++    const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
+ 
+     private $path;
+     private $rfs;
+@@ -173,7 +173,7 @@ class JsonFile
          }
  
--        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
-+        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
+         if (null === $schemaFile) {
+-            $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH;
++            $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
+         }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
-         if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-07-26 09:44:36.765795459 +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,16 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    19b5f66a0e233eb944f134df34091fe1c5dfcc11
+%global gh_commit    be81b9c4735362c26876bdbfd3b5bc7e7f711c88
 %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.8.6
+%global upstream_version 1.10.6
 #global upstream_prever  RC
 
 %if 0
@@ -81,9 +82,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": "^3.4",
+#        "phpspec/prophecy": "^1.10"
+BuildRequires:  phpunit
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
@@ -100,10 +101,10 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "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
@@ -170,6 +171,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 +211,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);
 }'
 
@@ -254,7 +260,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 +285,34 @@ exit $ret
 
 
 %changelog
+* 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
+
 * Tue Jun 11 2019 Remi Collet <remi@remirepo.net> - 1.8.6-1
 - update to 1.8.6
 

sources

@@ -1 +1 @@
-SHA512 (composer-1.8.6-19b5f66.tgz) = 12158c392f8987567d2ed902d52671b37a910498918cf76db30e6eb1110cf6fa3eac27279d5054dbfc92d83fe4a36f69211331ad580e7c3156ded71d68429f7b
+SHA512 (composer-1.10.6-be81b9c.tgz) = 447fe60a061eea920f32d5a94318bcea8351b1d5a2ce5e4683eaaa2d91215d7a5f920c765cb78ca2cc2afd74f748d4f2acaa2579b302e1c50e10033ea1e01600