v1.9.0

3 files changed, 38 insertions, 21 deletions

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 3ed61f4..b6bccfb 100644
--- a/composer-rpm.patch
+++ b/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	2019-08-03 10:30:10.000000000 +0200
++++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
  setlocale(LC_ALL, 'C');
@@ -11,9 +11,9 @@ 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
-@@ -305,7 +305,7 @@ EOF;
+--- ./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));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -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	2019-08-03 10:30:10.000000000 +0200
++++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
 @@ -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	2019-08-03 10:30:42.908772550 +0200
++++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+@@ -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;
+@@ -160,7 +160,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	2019-08-03 10:30:10.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2019-08-03 10:30:42.908772550 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
diff --git a/composer.json b/composer.json
index 3a1efaa..0878f5b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "composer/composer",
     "type": "library",
-    "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
+    "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
     "keywords": [
         "package",
         "dependency",
@@ -55,7 +55,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.8-dev"
+            "dev-master": "1.9-dev"
         }
     },
     "autoload": {
@@ -72,8 +72,13 @@
         "bin/composer"
     ],
     "scripts": {
+        "compile": "@php -dphar.readonly=0 bin/compile",
         "test": "phpunit"
     },
+    "scripts-descriptions": {
+        "compile": "Compile composer.phar",
+        "test": "Run all tests"
+    },
     "support": {
         "issues": "https://github.com/composer/composer/issues",
         "irc": "irc://irc.freenode.org/composer"
diff --git a/composer.spec b/composer.spec
index 03f0545..752ff1b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    19b5f66a0e233eb944f134df34091fe1c5dfcc11
+%global gh_commit    314aa57fdcfc942065996f59fb73a8b3f74f3fa5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.6
+%global upstream_version 1.9.0
 #global upstream_prever  RC
 
 %if 0
@@ -283,6 +283,9 @@ exit $ret
 
 
 %changelog
+* 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