diff options
Diffstat (limited to 'composer-rpm.patch')
| -rw-r--r-- | composer-rpm.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index ec7ff9b..5572b1a 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2020-02-14 15:37:41.000000000 +0100 -+++ ./bin/composer 2020-02-14 15:37:43.336528140 +0100 +--- ./bin/composer.rpm 2020-06-03 15:05:42.000000000 +0200 ++++ ./bin/composer 2020-06-03 15:13:38.063176316 +0200 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -11,21 +11,21 @@ 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 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)); +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2020-06-03 15:13:38.063176316 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2020-06-03 15:14:54.793961118 +0200 +@@ -357,7 +357,7 @@ EOF; + $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform)); - $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); -- $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); -+ $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); + $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); +- $filesystem->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); ++ $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); 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 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 +--- ./src/Composer/Compiler.php.rpm 2020-06-03 15:05:42.000000000 +0200 ++++ ./src/Composer/Compiler.php 2020-06-03 15:13:38.063176316 +0200 +@@ -98,7 +98,7 @@ class Compiler $finder = new Finder(); $finder->files() ->name('*.json') @@ -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 2020-02-14 15:37:41.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2020-02-14 15:37:43.336528140 +0100 +--- ./src/Composer/Json/JsonFile.php.rpm 2020-06-03 15:05:42.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2020-06-03 15:15:27.901868264 +0200 @@ -34,7 +34,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; const JSON_UNESCAPED_UNICODE = 256; @@ -45,8 +45,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php + const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; private $path; - private $rfs; -@@ -173,7 +173,7 @@ class JsonFile + private $httpDownloader; +@@ -179,7 +179,7 @@ class JsonFile } if (null === $schemaFile) { @@ -56,9 +56,9 @@ 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 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 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2020-06-03 15:05:42.000000000 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2020-06-03 15:13:38.063176316 +0200 +@@ -114,7 +114,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { $validator = new Validator(); |