diff options
| author | Remi Collet <remi@remirepo.net> | 2018-07-26 09:50:29 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-07-26 09:50:29 +0200 |
| commit | a0933b56d53addc811b00483930e23eb7308fab3 (patch) | |
| tree | 8c5fff3df274b3e18f52e9ff466cecebd4082b3c /composer-rpm.patch | |
| parent | b1813b1029d65c1cb4d0f6f4cc97f50afa07df7d (diff) | |
update to 1.7.0
drop dependency on seld/cli-prompt
add dependncy on composer/xdebug-handler
Diffstat (limited to 'composer-rpm.patch')
| -rw-r--r-- | composer-rpm.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index 44eb5b1..3ed61f4 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2018-05-04 12:59:13.065292434 +0200 -+++ ./bin/composer 2018-05-04 13:00:23.293493373 +0200 +--- ./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') { } @@ -8,11 +8,11 @@ diff -up ./bin/composer.rpm ./bin/composer -require __DIR__.'/../src/bootstrap.php'; +require '/usr/share/php/Composer/autoload.php'; - use Composer\Factory; - use Composer\XdebugHandler; + 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-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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; file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion)); @@ -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-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Compiler.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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 @@ -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 2018-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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); } @@ -47,8 +47,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) 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-05-04 12:57:41.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { |