summaryrefslogtreecommitdiffstats
path: root/composer-rpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'composer-rpm.patch')
-rw-r--r--composer-rpm.patch71
1 files changed, 23 insertions, 48 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 5cfb149..162dcdd 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm 2022-06-02 06:47:42.000000000 +0200
-+++ ./bin/composer 2022-06-02 06:49:45.037192985 +0200
+--- ./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) {
}
@@ -11,9 +11,9 @@ 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 2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-06-02 06:49:45.037192985 +0200
-@@ -425,7 +425,7 @@ EOF;
+--- ./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');
@@ -21,11 +21,11 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
+ $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 2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/Compiler.php 2022-06-02 06:49:45.037192985 +0200
-@@ -107,7 +107,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,8 +35,8 @@ 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 2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php 2022-06-02 06:49:45.037192985 +0200
+--- ./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,
@@ -46,28 +46,28 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
self::$installed = include __DIR__ . '/installed.php';
} else {
self::$installed = array();
-@@ -339,7 +339,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 2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php 2022-06-02 06:49:45.037192985 +0200
-@@ -39,7 +39,7 @@ class JsonFile
+--- ./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';
- /** @var string */
- private $path;
-@@ -219,7 +219,7 @@ class JsonFile
+ public const INDENT_DEFAULT = ' ';
+
+@@ -229,7 +229,7 @@ class JsonFile
$isComposerSchemaFile = false;
if (null === $schemaFile) {
$isComposerSchemaFile = true;
@@ -76,21 +76,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 ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer/PHPStan/ConfigReturnTypeExtension.php
---- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm 2022-06-02 06:50:28.987916014 +0200
-+++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php 2022-06-02 06:51:05.429709332 +0200
-@@ -30,7 +30,7 @@ final class ConfigReturnTypeExtension im
-
- public function __construct()
- {
-- $schema = JsonFile::parseJson((string) file_get_contents(__DIR__.'/../../../res/composer-schema.json'));
-+ $schema = JsonFile::parseJson((string) file_get_contents('/usr/share/composer/res/composer-schema.json'));
- /**
- * @var string $prop
- */
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 2022-05-24 13:56:16.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-06-02 06:49:45.037192985 +0200
+--- ./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()
@@ -100,16 +88,3 @@ diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Com
// cURL does not understand 'phar://' paths
// see https://github.com/composer/ca-bundle/issues/10
-diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2022-06-02 06:47:42.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-06-02 06:49:45.037192985 +0200
-@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
- private function check(string $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();