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

Merge branch '2.3' into main

pull/10815/head
Jordi Boggiano 2022-06-01 22:00:44 +02:00
parent ef06702e45 f58b72a43b
commit e2645a13b6
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
5 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@ -1,3 +1,16 @@
### [2.3.6] 2022-06-01
* Added `Composer\PHPStan\ConfigReturnTypeExtension` to improve return types of `Config::get()` which you can also use in plugins CI (#10635)
* Fixed name validation regex in schema causing issues with JS IDEs like VS Code (#10811)
* Fixed unnecessary HTTP request in BitbucketDriver (#10729)
* Fixed invalid credentials loop when setting up GitLab token (#10748)
* Fixed PHP 8.2 deprecations (#10766)
* Fixed lock file changes being output even when the lock file creation is disabled
* Fixed race condition when multiple requests asking for auth on the same hostname fired concurrently (#10763)
* Fixed quoting of commas on Windows (#10775)
* Fixed issue installing path repos with a disabled symlink function (#10786)
* Fixed various type errors (#10753, #10739, #10751)
### [2.3.5] 2022-04-13 ### [2.3.5] 2022-04-13
* Security: Fixed command injection vulnerability in HgDriver/GitDriver (GHSA-x7cr-6qr6-2hh6 / CVE-2022-24828) * Security: Fixed command injection vulnerability in HgDriver/GitDriver (GHSA-x7cr-6qr6-2hh6 / CVE-2022-24828)
@ -1509,6 +1522,7 @@
* Initial release * Initial release
[2.3.6]: https://github.com/composer/composer/compare/2.3.5...2.3.6
[2.3.5]: https://github.com/composer/composer/compare/2.3.4...2.3.5 [2.3.5]: https://github.com/composer/composer/compare/2.3.4...2.3.5
[2.3.4]: https://github.com/composer/composer/compare/2.3.3...2.3.4 [2.3.4]: https://github.com/composer/composer/compare/2.3.3...2.3.4
[2.3.3]: https://github.com/composer/composer/compare/2.3.2...2.3.3 [2.3.3]: https://github.com/composer/composer/compare/2.3.2...2.3.3

77
composer.lock generated
View File

@ -807,16 +807,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.4.8", "version": "v5.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b" "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b", "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb",
"reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b", "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -886,7 +886,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.4.8" "source": "https://github.com/symfony/console/tree/v5.4.9"
}, },
"funding": [ "funding": [
{ {
@ -902,7 +902,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-04-12T16:02:29+00:00" "time": "2022-05-18T06:17:34+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@ -973,16 +973,16 @@
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v5.4.7", "version": "v5.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "3a4442138d80c9f7b600fb297534ac718b61d37f" "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/3a4442138d80c9f7b600fb297534ac718b61d37f", "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba",
"reference": "3a4442138d80c9f7b600fb297534ac718b61d37f", "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1017,7 +1017,7 @@
"description": "Provides basic utilities for the filesystem", "description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/filesystem/tree/v5.4.7" "source": "https://github.com/symfony/filesystem/tree/v5.4.9"
}, },
"funding": [ "funding": [
{ {
@ -1033,7 +1033,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-04-01T12:33:59+00:00" "time": "2022-05-20T13:55:35+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
@ -1737,16 +1737,16 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v5.4.8", "version": "v5.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8" "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99",
"reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1803,7 +1803,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v5.4.8" "source": "https://github.com/symfony/string/tree/v5.4.9"
}, },
"funding": [ "funding": [
{ {
@ -1825,16 +1825,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.7.1", "version": "1.7.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719" "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a",
"reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719", "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1860,7 +1860,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.7.1" "source": "https://github.com/phpstan/phpstan/tree/1.7.8"
}, },
"funding": [ "funding": [
{ {
@ -1880,7 +1880,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-24T09:05:09+00:00" "time": "2022-06-01T13:43:17+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
@ -2034,22 +2034,22 @@
}, },
{ {
"name": "phpstan/phpstan-symfony", "name": "phpstan/phpstan-symfony",
"version": "1.1.8", "version": "1.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-symfony.git", "url": "https://github.com/phpstan/phpstan-symfony.git",
"reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f" "reference": "30f12aeab960c7f324eee3b39645655cf8a84146"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/4bdffcf1033b6c60662a28419d0192e0dda5684f", "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/30f12aeab960c7f324eee3b39645655cf8a84146",
"reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f", "reference": "30f12aeab960c7f324eee3b39645655cf8a84146",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-simplexml": "*", "ext-simplexml": "*",
"php": "^7.1 || ^8.0", "php": "^7.2 || ^8.0",
"phpstan/phpstan": "^1.4" "phpstan/phpstan": "^1.6"
}, },
"conflict": { "conflict": {
"symfony/framework-bundle": "<3.0" "symfony/framework-bundle": "<3.0"
@ -2073,9 +2073,6 @@
}, },
"type": "phpstan-extension", "type": "phpstan-extension",
"extra": { "extra": {
"branch-alias": {
"dev-master": "1.0-dev"
},
"phpstan": { "phpstan": {
"includes": [ "includes": [
"extension.neon", "extension.neon",
@ -2102,22 +2099,22 @@
"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.1.8" "source": "https://github.com/phpstan/phpstan-symfony/tree/1.2.2"
}, },
"time": "2022-03-24T07:56:03+00:00" "time": "2022-05-28T15:18:51+00:00"
}, },
{ {
"name": "symfony/phpunit-bridge", "name": "symfony/phpunit-bridge",
"version": "v6.0.8", "version": "v6.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git", "url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "4959a1eedd473bdb3f19db5b1525d5415dfab471" "reference": "092ccc3b364925cd8ed6046bc31dcf3a022bd5a4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/4959a1eedd473bdb3f19db5b1525d5415dfab471", "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/092ccc3b364925cd8ed6046bc31dcf3a022bd5a4",
"reference": "4959a1eedd473bdb3f19db5b1525d5415dfab471", "reference": "092ccc3b364925cd8ed6046bc31dcf3a022bd5a4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2171,7 +2168,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.0.8" "source": "https://github.com/symfony/phpunit-bridge/tree/v6.1.0"
}, },
"funding": [ "funding": [
{ {
@ -2187,7 +2184,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-04-12T16:11:42+00:00" "time": "2022-04-12T16:22:53+00:00"
} }
], ],
"aliases": [], "aliases": [],

2
doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md
View File

@ -12,7 +12,7 @@ The only good alternative is to define an upper bound on your constraints,
which you can increase in a new release after testing that your package is which you can increase in a new release after testing that your package is
compatible with the new major version of your dependency. compatible with the new major version of your dependency.
For example instead of using `>=3.4` you should use `~3.4` which allows all For example instead of using `>=3.4` you should use `^3.4` which allows all
versions up to `3.999` but does not include `4.0` and above. The `^` operator versions up to `3.999` but does not include `4.0` and above. The `^` operator
works very well with libraries following [semantic versioning](https://semver.org). works very well with libraries following [semantic versioning](https://semver.org).

2
res/composer-schema.json
View File

@ -6,7 +6,7 @@
"name": { "name": {
"type": "string", "type": "string",
"description": "Package name, including 'vendor-name/' prefix.", "description": "Package name, including 'vendor-name/' prefix.",
"pattern": "^[a-z0-9]([_.-]?[a-z0-9]++)*+/[a-z0-9](([_.]|-{1,2})?[a-z0-9]++)*+$" "pattern": "^[a-z0-9]([_.-]?[a-z0-9]+)*\/[a-z0-9](([_.]|-{1,2})?[a-z0-9]+)*$"
}, },
"description": { "description": {
"type": "string", "type": "string",

4
tests/Composer/Test/Json/ComposerSchemaTest.php
View File

@ -25,9 +25,9 @@ class ComposerSchemaTest extends TestCase
$expectedError = array( $expectedError = array(
array( array(
'property' => 'name', 'property' => 'name',
'message' => 'Does not match the regex pattern ^[a-z0-9]([_.-]?[a-z0-9]++)*+/[a-z0-9](([_.]|-{1,2})?[a-z0-9]++)*+$', 'message' => 'Does not match the regex pattern ^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]|-{1,2})?[a-z0-9]+)*$',
'constraint' => 'pattern', 'constraint' => 'pattern',
'pattern' => '^[a-z0-9]([_.-]?[a-z0-9]++)*+/[a-z0-9](([_.]|-{1,2})?[a-z0-9]++)*+$', 'pattern' => '^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]|-{1,2})?[a-z0-9]+)*$',
), ),
); );