Merge branch '2.4'

composer.lock

@@ -832,16 +832,16 @@
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "9f3452c93ff423469c0d56450431562ca423dcee"
+                "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
-                "reference": "9f3452c93ff423469c0d56450431562ca423dcee",
+                "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c",
                 "shasum": ""
             },
             "require": {
@@ -874,9 +874,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/phar-utils/issues",
-                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0"
+                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1"
             },
-            "time": "2021-12-10T11:20:11+00:00"
+            "time": "2022-08-31T10:31:18+00:00"
         },
         {
             "name": "seld/signal-handler",
@@ -941,16 +941,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10"
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1",
-                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10",
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1",
                 "shasum": ""
             },
             "require": {
@@ -1020,7 +1020,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.11"
+                "source": "https://github.com/symfony/console/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -1036,7 +1036,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-22T10:42:43+00:00"
+            "time": "2022-08-17T13:18:05+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1107,16 +1107,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd"
+                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447",
-                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd",
+                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447",
                 "shasum": ""
             },
             "require": {
@@ -1151,7 +1151,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.11"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -1167,7 +1167,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-20T13:00:38+00:00"
+            "time": "2022-08-02T13:48:16+00:00"
         },
         {
             "name": "symfony/finder",
@@ -1871,16 +1871,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322"
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
+                "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058",
-                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058",
                 "shasum": ""
             },
             "require": {
@@ -1937,7 +1937,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.11"
+                "source": "https://github.com/symfony/string/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -1953,7 +1953,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-24T16:15:25+00:00"
+            "time": "2022-08-12T17:03:11+00:00"
         }
     ],
     "packages-dev": [

src/Composer/Cache.php

@@ -174,7 +174,6 @@ class Cache
     /**
      * Copy a file into the cache
      *
-     *
      * @return bool
      */
     public function copyFrom(string $file, string $source)
@@ -198,7 +197,6 @@ class Cache
     /**
      * Copy a file out of the cache
      *
-     *
      * @return bool
      */
     public function copyTo(string $file, string $target)

src/Composer/Command/BaseCommand.php

@@ -282,7 +282,6 @@ abstract class BaseCommand extends Command
     /**
      * Returns preferSource and preferDist values based on the configuration.
      *
-     *
      * @return bool[] An array composed of the preferSource and preferDist values
      */
     protected function getPreferredInstallOptions(Config $config, InputInterface $input, bool $keepVcsRequiresPreferSource = false)

src/Composer/Compiler.php

@@ -40,7 +40,6 @@ class Compiler
      *
      * @param string $pharFile The full path to the file to create
      *
-     *
      * @throws \RuntimeException
      */
     public function compile(string $pharFile = 'composer.phar'): void

src/Composer/Downloader/ArchiveDownloader.php

@@ -49,8 +49,6 @@ abstract class ArchiveDownloader extends FileDownloader
     /**
      * @inheritDoc
      *
-     *
-     *
      * @throws \RuntimeException
      * @throws \UnexpectedValueException
      */

src/Composer/Downloader/VcsDownloader.php

@@ -258,7 +258,6 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
      * @param  bool              $update  if true (update) the changes can be stashed and reapplied after an update,
      *                                    if false (remove) the changes should be assumed to be lost if the operation is not aborted
      *
-     *
      * @throws \RuntimeException in case the operation must be aborted
      */
     protected function cleanChanges(PackageInterface $package, string $path, bool $update): PromiseInterface
@@ -274,8 +273,6 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
     /**
      * Reapply previously stashes changes if applicable, only called after an update (regardless if successful or not)
      *
-     *
-     *
      * @throws \RuntimeException in case the operation must be aborted or the patch does not apply cleanly
      */
     protected function reapplyChanges(string $path): void

src/Composer/IO/IOInterface.php

@@ -234,7 +234,6 @@ interface IOInterface extends LoggerInterface
     /**
      * Loads authentications from a config instance
      *
-     *
      * @return void
      */
     public function loadConfiguration(Config $config);

src/Composer/Installer.php

@@ -625,7 +625,6 @@ class Installer
      *
      * @param array<int, array<string, string>> $aliases
      *
-     *
      * @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $aliases
      * @phpstan-return self::ERROR_*
      */
@@ -811,7 +810,6 @@ class Installer
     /**
      * @param  array<int, array<string, string>> $rootAliases
      *
-     *
      * @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $rootAliases
      */
     private function createRepositorySet(bool $forUpdate, PlatformRepository $platformRepo, array $rootAliases = [], ?RepositoryInterface $lockedRepository = null): RepositorySet

src/Composer/Json/JsonFormatter.php

@@ -32,7 +32,6 @@ class JsonFormatter
      *
      * Originally licensed under MIT by Dave Perrett <mail@recursive-design.com>
      *
-     *
      * @param  bool   $unescapeUnicode Un escape unicode
      * @param  bool   $unescapeSlashes Un escape slashes
      */

src/Composer/Package/Loader/RootPackageLoader.php

@@ -61,7 +61,6 @@ class RootPackageLoader extends ArrayLoader
     /**
      * @inheritDoc
      *
-     *
      * @return RootPackage|RootAliasPackage
      *
      * @phpstan-param class-string<RootPackage> $class

src/Composer/Package/Locker.php

@@ -339,7 +339,6 @@ class Locker
      * @param array<string, string|false> $platformOverrides
      * @param bool                        $write             Whether to actually write data to disk, useful in tests and for --dry-run
      *
-     *
      * @phpstan-param list<array{package: string, version: string, alias: string, alias_normalized: string}> $aliases
      */
     public function setLockData(array $packages, ?array $devPackages, array $platformReqs, array $platformDevReqs, array $aliases, string $minimumStability, array $stabilityFlags, bool $preferStable, bool $preferLowest, array $platformOverrides, bool $write = true): bool

src/Composer/Package/Package.php

@@ -537,7 +537,6 @@ class Package extends BasePackage
      *
      * @param array $autoload Mapping of autoloading rules
      *
-     *
      * @phpstan-param AutoloadRules $autoload
      */
     public function setAutoload(array $autoload): void
@@ -558,7 +557,6 @@ class Package extends BasePackage
      *
      * @param array $devAutoload Mapping of dev autoloading rules
      *
-     *
      * @phpstan-param DevAutoloadRules $devAutoload
      */
     public function setDevAutoload(array $devAutoload): void

src/Composer/Package/PackageInterface.php

@@ -234,7 +234,6 @@ interface PackageInterface
     /**
      * Returns the stability of this package: one of (dev, alpha, beta, RC, stable)
      *
-     *
      * @phpstan-return 'stable'|'RC'|'beta'|'alpha'|'dev'
      */
     public function getStability(): string;

src/Composer/Plugin/PluginInterface.php

@@ -37,7 +37,6 @@ interface PluginInterface
     /**
      * Apply plugin modifications to Composer
      *
-     *
      * @return void
      */
     public function activate(Composer $composer, IOInterface $io);
@@ -49,7 +48,6 @@ interface PluginInterface
      * uninstalled, but also before it gets upgraded to a new version
      * so the old one can be deactivated and the new one activated.
      *
-     *
      * @return void
      */
     public function deactivate(Composer $composer, IOInterface $io);
@@ -59,7 +57,6 @@ interface PluginInterface
      *
      * This will be called after deactivate.
      *
-     *
      * @return void
      */
     public function uninstall(Composer $composer, IOInterface $io);

src/Composer/Plugin/PluginManager.php

@@ -148,7 +148,6 @@ class PluginManager
      * @param bool             $failOnMissingClasses By default this silently skips plugins that can not be found, but if set to true it fails with an exception
      * @param bool             $isGlobalPlugin       Set to true to denote plugins which are installed in the global Composer directory
      *
-     *
      * @throws \UnexpectedValueException
      */
     public function registerPackage(PackageInterface $package, bool $failOnMissingClasses = false, bool $isGlobalPlugin = false): void
@@ -304,8 +303,6 @@ class PluginManager
      * If it's of type composer-installer it is unregistered from the installers
      * instead for BC
      *
-     *
-     *
      * @throws \UnexpectedValueException
      */
     public function deactivatePackage(PackageInterface $package): void
@@ -329,8 +326,6 @@ class PluginManager
      * If it's of type composer-installer it is unregistered from the installers
      * instead for BC
      *
-     *
-     *
      * @throws \UnexpectedValueException
      */
     public function uninstallPackage(PackageInterface $package): void
@@ -446,7 +441,6 @@ class PluginManager
      *
      * @param RepositoryInterface $repo Repository to scan for plugins to install
      *
-     *
      * @throws \RuntimeException
      */
     private function loadRepository(RepositoryInterface $repo, bool $isGlobalRepo): void

src/Composer/Util/Filesystem.php

@@ -324,7 +324,6 @@ class Filesystem
      * Some systems can't rename and also don't have proc_open,
      * which requires this solution.
      *
-     *
      * @return void
      */
     public function copyThenRemove(string $source, string $target)
@@ -716,7 +715,6 @@ class Filesystem
     /**
      * return true if that directory is a symlink.
      *
-     *
      * @return bool
      */
     public function isSymlinkedDirectory(string $directory)
@@ -762,7 +760,6 @@ class Filesystem
     /**
      * Creates an NTFS junction.
      *
-     *
      * @return void
      */
     public function junction(string $target, string $junction)
@@ -857,7 +854,6 @@ class Filesystem
     /**
      * Copy file using stream_copy_to_stream to work around https://bugs.php.net/bug.php?id=6463
      *
-     *
      * @return void
      */
     public function safeCopy(string $source, string $target)

src/Composer/Util/Http/ProxyHelper.php

@@ -60,7 +60,6 @@ class ProxyHelper
     /**
      * Returns http context options for the proxy url
      *
-     *
      * @return array{http: array{proxy: string, header?: string}}
      */
     public static function getContextOptions(string $proxyUrl): array

src/Composer/Util/NoProxyPattern.php

@@ -69,7 +69,6 @@ class NoProxyPattern
     /**
      * Returns false is the url cannot be parsed, otherwise a data object
      *
-     *
      * @return bool|stdClass
      */
     protected function getUrlData(string $url)
@@ -165,7 +164,6 @@ class NoProxyPattern
     /**
      * Finds or creates rule data for a hostname
      *
-     *
      * @return null|stdClass Null if the hostname is invalid
      */
     private function getRule(int $index, string $hostName): ?stdClass
@@ -239,7 +237,6 @@ class NoProxyPattern
      * IPv4 addresses are always mapped to IPv6, which simplifies handling
      * and comparison.
      *
-     *
      * @return mixed[] in_addr, size
      */
     private function ipGetAddr(string $host): array
@@ -355,7 +352,6 @@ class NoProxyPattern
     /**
      * Splits the hostname into host and port components
      *
-     *
      * @return mixed[] host, port, if there was error
      */
     private function splitHostPort(string $hostName): array

tests/Composer/Test/TestCase.php

@@ -308,7 +308,6 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
      *
      * @param string $executableName The name of the binary to test.
      *
-     *
      * @throws \PHPUnit\Framework\SkippedTestError
      */
     protected function skipIfNotExecutable(string $executableName): void
@@ -326,7 +325,6 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
     /**
      * Transforms an escaped non-Windows command to match Windows escaping.
      *
-     *
      * @return string The transformed command
      */
     protected function getCmd(string $cmd): string

tests/Composer/Test/Util/AuthHelperTest.php

@@ -541,7 +541,6 @@ class AuthHelperTest extends TestCase
     /**
      * @param array<string, string|null> $auth
      *
-     *
      * @phpstan-param array{username: string|null, password: string|null} $auth
      */
     private function expectsAuthentication(string $origin, array $auth): void