summaryrefslogtreecommitdiffstats
path: root/composer-rpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'composer-rpm.patch')
-rw-r--r--composer-rpm.patch119
1 files changed, 39 insertions, 80 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index cbb4b3c..162dcdd 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm 2021-09-14 15:45:17.000000000 +0200
-+++ ./bin/composer 2021-09-14 15:45:33.025118009 +0200
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
+--- ./bin/composer.rpm 2023-09-01 11:05:16.000000000 +0200
++++ ./bin/composer 2023-09-01 11:05:28.156309389 +0200
+@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
}
setlocale(LC_ALL, 'C');
@@ -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 2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php 2021-09-14 15:45:33.025118009 +0200
-@@ -395,7 +395,7 @@ EOF;
- $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php 2023-09-01 11:05:28.156309389 +0200
+@@ -448,7 +448,7 @@ EOF;
+ $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
$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(
+ $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [
diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm 2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/Compiler.php 2021-09-14 15:45:33.025118009 +0200
-@@ -118,7 +118,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm 2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Compiler.php 2023-09-01 11:05:28.156309389 +0200
+@@ -105,7 +105,7 @@ class Compiler
// Add Composer resources
$finder = new Finder();
$finder->files()
@@ -35,9 +35,9 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
;
foreach ($finder as $file) {
diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm 2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php 2021-09-14 15:45:33.026118007 +0200
-@@ -251,7 +251,7 @@ class InstalledVersions
+--- ./src/Composer/InstalledVersions.php.rpm 2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/InstalledVersions.php 2023-09-01 11:05:28.156309389 +0200
+@@ -266,7 +266,7 @@ class InstalledVersions
if (null === self::$installed) {
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
@@ -46,86 +46,45 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
self::$installed = include __DIR__ . '/installed.php';
} else {
self::$installed = array();
-@@ -324,7 +324,7 @@ class InstalledVersions
+@@ -341,7 +341,7 @@ class InstalledVersions
if (null === self::$installed) {
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
- if (substr(__DIR__, -8, 1) !== 'C') {
+ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
- self::$installed = require __DIR__ . '/installed.php';
- } else {
- self::$installed = array();
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+ $required = require __DIR__ . '/installed.php';
+ self::$installed = $required;
diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm 2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php 2021-09-14 15:46:22.434026477 +0200
-@@ -34,7 +34,7 @@ class JsonFile
- const JSON_PRETTY_PRINT = 128;
- const JSON_UNESCAPED_UNICODE = 256;
+--- ./src/Composer/Json/JsonFile.php.rpm 2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php 2023-09-01 11:06:16.767233012 +0200
+@@ -40,7 +40,7 @@ class JsonFile
+ /** @deprecated Use \JSON_UNESCAPED_UNICODE */
+ public const JSON_UNESCAPED_UNICODE = 256;
+
+- public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json';
++ public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
-- const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json';
-+ const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
+ public const INDENT_DEFAULT = ' ';
- /** @var string */
- private $path;
-@@ -191,7 +191,7 @@ class JsonFile
+@@ -229,7 +229,7 @@ class JsonFile
$isComposerSchemaFile = false;
if (null === $schemaFile) {
$isComposerSchemaFile = true;
-- $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH;
+- $schemaFile = 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)
-diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2021-09-14 15:45:17.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2021-09-14 15:45:33.025118009 +0200
-@@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas
- private function check($json)
+diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2023-08-30 11:31:38.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2023-09-01 11:05:28.156309389 +0200
+@@ -125,7 +125,7 @@ class CaBundle
+ */
+ public static function getBundledCaBundlePath()
{
- $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));
+- $caBundleFile = __DIR__.'/../res/cacert.pem';
++ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always
- if (!$validator->isValid()) {
- $errors = $validator->getErrors();
-diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php
---- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2021-09-14 15:45:17.000000000 +0200
-+++ ./tests/Composer/Test/PolyfillTestCase.php 2021-09-14 15:45:33.026118007 +0200
-@@ -15,10 +15,35 @@ namespace Composer\Test {
- use PHPUnit\Framework\Constraint\LogicalNot;
- use PHPUnit\Framework\Constraint\StringContains;
-
-- if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
-+ if (method_exists('PHPUnit\Framework\TestCase', 'assertFileDoesNotExist')) {
- abstract class PolyfillTestCase extends TestCase
- {
- }
-+ } else if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
-+ abstract class PolyfillTestCase extends TestCase {
-+ /**
-+ * @param string $filename
-+ * @param string $message
-+ *
-+ * @return void
-+ */
-+ public static function assertFileDoesNotExist($filename, $message = '')
-+ {
-+ static::assertFileNotExists($filename, $message);
-+ }
-+
-+ /**
-+ * @param string $pattern
-+ * @param string $string
-+ * @param string $message
-+ *
-+ * @return void
-+ */
-+ public static function assertMatchesRegularExpression($pattern, $string, $message = '')
-+ {
-+ static::assertRegExp($pattern, $string, $message);
-+ }
-+ }
- } else {
- abstract class PolyfillTestCase extends TestCase
- {
+ // cURL does not understand 'phar://' paths
+ // see https://github.com/composer/ca-bundle/issues/10