Merge branch '2.2' into 2.3
Jordi Boggiano
commit
202ef9031c
10
CHANGELOG.md
10
CHANGELOG.md
|
|
@ -71,6 +71,15 @@
|
|||
* Fixed symlink creation in linux VM guest filesystems to be recognized by Windows (#10592)
|
||||
* Performance improvement in pool optimization step (#10585)
|
||||
|
||||
### [2.2.13] 2022-05-25
|
||||
|
||||
* 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)
|
||||
|
||||
### [2.2.12] 2022-04-13
|
||||
|
||||
* Security: Fixed command injection vulnerability in HgDriver/GitDriver (GHSA-x7cr-6qr6-2hh6 / CVE-2022-24828)
|
||||
|
|
@ -1508,6 +1517,7 @@
|
|||
[2.3.0]: https://github.com/composer/composer/compare/2.3.0-RC2...2.3.0
|
||||
[2.3.0-RC2]: https://github.com/composer/composer/compare/2.3.0-RC1...2.3.0-RC2
|
||||
[2.3.0-RC1]: https://github.com/composer/composer/compare/2.2.9...2.3.0-RC1
|
||||
[2.2.13]: https://github.com/composer/composer/compare/2.2.12...2.2.13
|
||||
[2.2.12]: https://github.com/composer/composer/compare/2.2.11...2.2.12
|
||||
[2.2.11]: https://github.com/composer/composer/compare/2.2.10...2.2.11
|
||||
[2.2.10]: https://github.com/composer/composer/compare/2.2.9...2.2.10
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
"packages": [
|
||||
{
|
||||
"name": "composer/ca-bundle",
|
||||
"version": "1.3.1",
|
||||
"version": "1.3.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/ca-bundle.git",
|
||||
"reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
|
||||
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
|
||||
"reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
|
||||
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
|
||||
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
"support": {
|
||||
"irc": "irc://irc.freenode.org/composer",
|
||||
"issues": "https://github.com/composer/ca-bundle/issues",
|
||||
"source": "https://github.com/composer/ca-bundle/tree/1.3.1"
|
||||
"source": "https://github.com/composer/ca-bundle/tree/1.3.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-10-28T20:44:15+00:00"
|
||||
"time": "2022-05-24T11:56:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/metadata-minifier",
|
||||
|
|
@ -305,16 +305,16 @@
|
|||
},
|
||||
{
|
||||
"name": "composer/spdx-licenses",
|
||||
"version": "1.5.6",
|
||||
"version": "1.5.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/spdx-licenses.git",
|
||||
"reference": "a30d487169d799745ca7280bc90fdfa693536901"
|
||||
"reference": "c848241796da2abf65837d51dce1fae55a960149"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a30d487169d799745ca7280bc90fdfa693536901",
|
||||
"reference": "a30d487169d799745ca7280bc90fdfa693536901",
|
||||
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149",
|
||||
"reference": "c848241796da2abf65837d51dce1fae55a960149",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -365,7 +365,7 @@
|
|||
"support": {
|
||||
"irc": "irc://irc.freenode.org/composer",
|
||||
"issues": "https://github.com/composer/spdx-licenses/issues",
|
||||
"source": "https://github.com/composer/spdx-licenses/tree/1.5.6"
|
||||
"source": "https://github.com/composer/spdx-licenses/tree/1.5.7"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -381,7 +381,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-11-18T10:14:14+00:00"
|
||||
"time": "2022-05-23T07:37:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/xdebug-handler",
|
||||
|
|
|
|||
|
|
@ -2167,7 +2167,7 @@ parameters:
|
|||
|
||||
-
|
||||
message: "#^Call to function in_array\\(\\) with arguments 20, array\\{0\\: 10\\|20, 1\\?\\: 20\\} and true will always evaluate to true\\.$#"
|
||||
count: 1
|
||||
count: 2
|
||||
path: ../src/Composer/Downloader/PathDownloader.php
|
||||
|
||||
-
|
||||
|
|
|
|||
|
|
@ -280,6 +280,15 @@ class PathDownloader extends FileDownloader implements VcsCapableDownloaderInter
|
|||
$allowedStrategies = array(self::STRATEGY_MIRROR);
|
||||
}
|
||||
|
||||
// Check we can use symlink() otherwise
|
||||
if (!Platform::isWindows() && self::STRATEGY_SYMLINK === $currentStrategy && !function_exists('symlink')) {
|
||||
if (!in_array(self::STRATEGY_MIRROR, $allowedStrategies, true)) {
|
||||
throw new \RuntimeException('Your PHP has the symlink() function disabled which does not allow Composer to use symlinks and this path repository has symlink:true in its options so copying is not allowed');
|
||||
}
|
||||
$currentStrategy = self::STRATEGY_MIRROR;
|
||||
$allowedStrategies = array(self::STRATEGY_MIRROR);
|
||||
}
|
||||
|
||||
return array($currentStrategy, $allowedStrategies);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ class ArchivableFilesFinderTest extends TestCase
|
|||
);
|
||||
|
||||
$fileTree = array(
|
||||
'.foo',
|
||||
'A/prefixA.foo',
|
||||
'A/prefixB.foo',
|
||||
'A/prefixC.foo',
|
||||
|
|
@ -110,6 +111,7 @@ class ArchivableFilesFinderTest extends TestCase
|
|||
'/prefixA.foo',
|
||||
'prefixC.*',
|
||||
'!*/*/*/prefixC.foo',
|
||||
'.*',
|
||||
);
|
||||
|
||||
$this->finder = new ArchivableFilesFinder($this->sources, $excludes);
|
||||
|
|
@ -214,6 +216,7 @@ class ArchivableFilesFinderTest extends TestCase
|
|||
'/!important!.txt',
|
||||
'/!important_too!.txt',
|
||||
'/#weirdfile',
|
||||
'/.foo',
|
||||
'/A/prefixA.foo',
|
||||
'/A/prefixB.foo',
|
||||
'/A/prefixC.foo',
|
||||
|
|
|
|||
Loading…
Reference in New Issue