public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '2.6'

pull/11761/head
Jordi Boggiano 2023-12-18 10:12:45 +01:00
parent 50f7c1d5b0 e14d28baec
commit bf6c7f8ea2
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -45,7 +45,7 @@
"seld/signal-handler": "^2.0" "seld/signal-handler": "^2.0"
}, },
"require-dev": { "require-dev": {
"symfony/phpunit-bridge": "^6.0 || ^7", "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1",
"phpstan/phpstan": "^1.9.3", "phpstan/phpstan": "^1.9.3",
"phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-deprecation-rules": "^1",

108
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5ecfd05f35343c3780b3a896c59e6cb0", "content-hash": "bbb9ffc97dcec54f38fdc5b4bf9a287d",
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
@ -378,16 +378,16 @@
}, },
{ {
"name": "composer/spdx-licenses", "name": "composer/spdx-licenses",
"version": "1.5.7", "version": "1.5.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/spdx-licenses.git", "url": "https://github.com/composer/spdx-licenses.git",
"reference": "c848241796da2abf65837d51dce1fae55a960149" "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149", "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a",
"reference": "c848241796da2abf65837d51dce1fae55a960149", "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -436,9 +436,9 @@
"validator" "validator"
], ],
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/spdx-licenses/issues", "issues": "https://github.com/composer/spdx-licenses/issues",
"source": "https://github.com/composer/spdx-licenses/tree/1.5.7" "source": "https://github.com/composer/spdx-licenses/tree/1.5.8"
}, },
"funding": [ "funding": [
{ {
@ -454,7 +454,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-23T07:37:50+00:00" "time": "2023-11-20T07:44:33+00:00"
}, },
{ {
"name": "composer/xdebug-handler", "name": "composer/xdebug-handler",
@ -692,24 +692,24 @@
}, },
{ {
"name": "react/promise", "name": "react/promise",
"version": "v3.0.0", "version": "v3.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/reactphp/promise.git", "url": "https://github.com/reactphp/promise.git",
"reference": "c86753c76fd3be465d93b308f18d189f01a22be4" "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/c86753c76fd3be465d93b308f18d189f01a22be4", "url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
"reference": "c86753c76fd3be465d93b308f18d189f01a22be4", "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1.0" "php": ">=7.1.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "1.10.20 || 1.4.10", "phpstan/phpstan": "1.10.39 || 1.4.10",
"phpunit/phpunit": "^9.5 || ^7.5" "phpunit/phpunit": "^9.6 || ^7.5"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -753,7 +753,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/reactphp/promise/issues", "issues": "https://github.com/reactphp/promise/issues",
"source": "https://github.com/reactphp/promise/tree/v3.0.0" "source": "https://github.com/reactphp/promise/tree/v3.1.0"
}, },
"funding": [ "funding": [
{ {
@ -761,7 +761,7 @@
"type": "open_collective" "type": "open_collective"
} }
], ],
"time": "2023-07-11T16:12:49+00:00" "time": "2023-11-16T16:21:57+00:00"
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",
@ -938,16 +938,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.4.28", "version": "v5.4.32",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "f4f71842f24c2023b91237c72a365306f3c58827" "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
"reference": "f4f71842f24c2023b91237c72a365306f3c58827", "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1017,7 +1017,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.4.28" "source": "https://github.com/symfony/console/tree/v5.4.32"
}, },
"funding": [ "funding": [
{ {
@ -1033,7 +1033,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-08-07T06:12:30+00:00" "time": "2023-11-18T18:23:04+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@ -1947,16 +1947,16 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v5.4.29", "version": "v5.4.32",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d" "reference": "91bf4453d65d8231688a04376c3a40efe0770f04"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04",
"reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", "reference": "91bf4453d65d8231688a04376c3a40efe0770f04",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2013,7 +2013,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v5.4.29" "source": "https://github.com/symfony/string/tree/v5.4.32"
}, },
"funding": [ "funding": [
{ {
@ -2029,22 +2029,22 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-09-13T11:47:41+00:00" "time": "2023-11-26T13:43:46+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.39", "version": "1.10.50",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4" "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d9dedb0413f678b4d03cbc2279a48f91592c97c4", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4",
"reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4", "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2093,7 +2093,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-10-17T15:46:26+00:00" "time": "2023-12-13T10:59:42+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
@ -2197,21 +2197,21 @@
}, },
{ {
"name": "phpstan/phpstan-strict-rules", "name": "phpstan/phpstan-strict-rules",
"version": "1.5.1", "version": "1.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git", "url": "https://github.com/phpstan/phpstan-strict-rules.git",
"reference": "b21c03d4f6f3a446e4311155f4be9d65048218e6" "reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/b21c03d4f6f3a446e4311155f4be9d65048218e6", "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/7a50e9662ee9f3942e4aaaf3d603653f60282542",
"reference": "b21c03d4f6f3a446e4311155f4be9d65048218e6", "reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2 || ^8.0", "php": "^7.2 || ^8.0",
"phpstan/phpstan": "^1.10" "phpstan/phpstan": "^1.10.34"
}, },
"require-dev": { "require-dev": {
"nikic/php-parser": "^4.13.0", "nikic/php-parser": "^4.13.0",
@ -2240,22 +2240,22 @@
"description": "Extra strict and opinionated rules for PHPStan", "description": "Extra strict and opinionated rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues", "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.5.1" "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.5.2"
}, },
"time": "2023-03-29T14:47:40+00:00" "time": "2023-10-30T14:35:06+00:00"
}, },
{ {
"name": "phpstan/phpstan-symfony", "name": "phpstan/phpstan-symfony",
"version": "1.3.4", "version": "1.3.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-symfony.git", "url": "https://github.com/phpstan/phpstan-symfony.git",
"reference": "383855999db6a7d65d0bf580ce2762e17188c2a5" "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/383855999db6a7d65d0bf580ce2762e17188c2a5", "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/27ff6339f83796a7e0dd963cf445cd3c456fc620",
"reference": "383855999db6a7d65d0bf580ce2762e17188c2a5", "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2312,33 +2312,33 @@
"description": "Symfony Framework extensions and rules for PHPStan", "description": "Symfony Framework extensions and rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-symfony/issues", "issues": "https://github.com/phpstan/phpstan-symfony/issues",
"source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.4" "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.5"
}, },
"time": "2023-09-29T14:10:11+00:00" "time": "2023-10-30T14:52:15+00:00"
}, },
{ {
"name": "symfony/phpunit-bridge", "name": "symfony/phpunit-bridge",
"version": "v6.3.6", "version": "v7.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git", "url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d" "reference": "c2d059b25e31274157dd7727131cd1cf33650207"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d", "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c2d059b25e31274157dd7727131cd1cf33650207",
"reference": "c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d", "reference": "c2d059b25e31274157dd7727131cd1cf33650207",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1.3" "php": ">=7.2.5"
}, },
"conflict": { "conflict": {
"phpunit/phpunit": "<7.5|9.1.2" "phpunit/phpunit": "<7.5|9.1.2"
}, },
"require-dev": { "require-dev": {
"symfony/deprecation-contracts": "^2.5|^3.0", "symfony/deprecation-contracts": "^2.5|^3.0",
"symfony/error-handler": "^5.4|^6.0", "symfony/error-handler": "^5.4|^6.4|^7.0",
"symfony/polyfill-php81": "^1.27" "symfony/polyfill-php81": "^1.27"
}, },
"bin": [ "bin": [
@ -2379,7 +2379,7 @@
"description": "Provides utilities for PHPUnit, especially user deprecation notices management", "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.6" "source": "https://github.com/symfony/phpunit-bridge/tree/v7.0.1"
}, },
"funding": [ "funding": [
{ {
@ -2395,7 +2395,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-10-12T15:02:41+00:00" "time": "2023-12-01T09:26:31+00:00"
} }
], ],
"aliases": [], "aliases": [],

4
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -1133,6 +1133,10 @@ HEADER;
$loader->setPsr4($namespace, $path); $loader->setPsr4($namespace, $path);
} }
/**
* @var string $vendorDir
* @var string $baseDir
*/
$classMap = require $targetDir . '/autoload_classmap.php'; $classMap = require $targetDir . '/autoload_classmap.php';
if ($classMap) { if ($classMap) {
$loader->addClassMap($classMap); $loader->addClassMap($classMap);