diff options
Diffstat (limited to 'composer-rpm.patch')
-rw-r--r-- | composer-rpm.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch new file mode 100644 index 0000000..b065e68 --- /dev/null +++ b/composer-rpm.patch @@ -0,0 +1,52 @@ +diff -up ./bin/composer.rpm ./bin/composer +--- ./bin/composer.rpm 2015-02-25 20:44:34.000000000 +0100 ++++ ./bin/composer 2015-02-26 10:25:16.012610034 +0100 +@@ -1,11 +1,11 @@ +-#!/usr/bin/env php ++#!/usr/bin/php + <?php + + if (PHP_SAPI !== 'cli') { + echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; + } + +-require __DIR__.'/../src/bootstrap.php'; ++require 'Composer/autoload.php'; + + use Composer\Console\Application; + +diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php +--- ./src/Composer/Json/JsonFile.php.rpm 2015-02-25 20:44:34.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2015-02-26 10:25:16.012610034 +0100 +@@ -149,7 +149,7 @@ class JsonFile + self::validateSyntax($content, $this->path); + } + +- $schemaFile = __DIR__ . '/../../../res/composer-schema.json'; ++ $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; + $schemaData = json_decode(file_get_contents($schemaFile)); + + if ($schema === self::LAX_SCHEMA) { +diff -up ./src/Composer/Util/SpdxLicenseIdentifier.php.rpm ./src/Composer/Util/SpdxLicenseIdentifier.php +--- ./src/Composer/Util/SpdxLicenseIdentifier.php.rpm 2015-02-25 20:44:34.000000000 +0100 ++++ ./src/Composer/Util/SpdxLicenseIdentifier.php 2015-02-26 10:25:16.012610034 +0100 +@@ -61,7 +61,7 @@ class SpdxLicenseIdentifier + */ + private function initIdentifiers() + { +- $jsonFile = new JsonFile(__DIR__ . '/../../../res/spdx-identifier.json'); ++ $jsonFile = new JsonFile((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-identifier.json'); + $this->identifiers = $jsonFile->read(); + } + +diff -up ./tests/Composer/Test/Json/JsonFileTest.php.rpm ./tests/Composer/Test/Json/JsonFileTest.php +--- ./tests/Composer/Test/Json/JsonFileTest.php.rpm 2015-02-26 10:26:10.607821640 +0100 ++++ ./tests/Composer/Test/Json/JsonFileTest.php 2015-02-26 10:27:05.430034125 +0100 +@@ -54,6 +54,7 @@ class JsonFileTest extends \PHPUnit_Fram + + public function testParseErrorDetectSingleQuotes() + { ++ $this->markTestSkipped('jsonc issue'); + $json = '{ + \'foo\': "bar" + }'; |