1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
diff -up ./bin/composer.rpm ./bin/composer
--- ./bin/composer.rpm 2017-03-08 17:51:24.000000000 +0100
+++ ./bin/composer 2017-03-08 19:16:24.206124958 +0100
@@ -5,7 +5,7 @@ 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 '/usr/share/php/Composer/autoload.php';
use Composer\Factory;
use Composer\XdebugHandler;
diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2017-03-08 17:51:24.000000000 +0100
+++ ./src/Composer/Autoload/AutoloadGenerator.php 2017-03-08 19:16:24.207124963 +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->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
- $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
+ $this->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 2017-03-08 17:51:24.000000000 +0100
+++ ./src/Composer/Compiler.php 2017-03-08 19:16:24.207124963 +0100
@@ -97,7 +97,7 @@ class Compiler
$finder = new Finder();
$finder->files()
->name('*.json')
- ->in(__DIR__.'/../../res')
+ ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res')
->in(SpdxLicenses::getResourcesDir())
->sort($finderSort)
;
diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
--- ./src/Composer/Json/JsonFile.php.rpm 2017-03-08 19:16:24.207124963 +0100
+++ ./src/Composer/Json/JsonFile.php 2017-03-08 19:17:35.148449586 +0100
@@ -156,7 +156,7 @@ class JsonFile
self::validateSyntax($content, $this->path);
}
- $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
+ $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
// 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 2017-03-08 19:16:24.207124963 +0100
+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2017-03-08 19:19:02.243848127 +0100
@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni
private function check($json)
{
$validator = new Validator();
- $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
+ $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
+ $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
if (!$validator->isValid()) {
$errors = $validator->getErrors();
|
