Merge pull request #392 from localheinz/feature/php-cs-fixer

Enhancement: Update `friendsofphp/php-cs-fixer`
phar-io · Jan 31, 2023 · 35fb5c7 · 35fb5c7
2 parents f03aafc + acb12f4
commit 35fb5c7
Show file tree

Hide file tree

Showing 90 changed files with 4 additions and 107 deletions.
diff --git a/phive.xml b/phive.xml
@@ -3,6 +3,6 @@
   <phar name="phpab" version="^1.27" installed="1.27.1" location="./tools/phpab" copy="false"/>
   <phar name="phpunit" version="^9.5" installed="9.5.19" location="./tools/phpunit" copy="false"/>
   <phar name="phpstan" version="^1.0" installed="1.4.10" location="./tools/phpstan" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.4" installed="3.8.0" location="./tools/php-cs-fixer" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.13.2" installed="3.13.2" location="./tools/php-cs-fixer" copy="false"/>
   <phar name="psalm" version="^4.0" installed="4.22.0" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/src/Factory.php b/src/Factory.php
@@ -16,7 +16,6 @@
 use PharIo\Version\VersionConstraintParser;
 
 class Factory {
-
     /** @var null|CurlConfig */
     private $curlConfig;
 

diff --git a/src/commands/CommandLocator.php b/src/commands/CommandLocator.php
@@ -13,7 +13,6 @@
 use function sprintf;
 
 class CommandLocator implements Cli\CommandLocator {
-
     /** @var Factory */
     private $factory;
 

diff --git a/src/commands/composer/ComposerCommand.php b/src/commands/composer/ComposerCommand.php
@@ -13,7 +13,6 @@
 use function sprintf;
 
 class ComposerCommand extends InstallCommand {
-
     /** @var ComposerService */
     private $composerService;
 
@@ -47,6 +46,7 @@ public function execute(): void {
     /**
      * @psalm-suppress MoreSpecificReturnType
      * @psalm-suppress LessSpecificReturnStatement
+     *
      * @psalm-return ComposerCommandConfig
      */
     protected function getConfig(): InstallCommandConfig {

diff --git a/src/commands/composer/ComposerCommandConfig.php b/src/commands/composer/ComposerCommandConfig.php
@@ -14,7 +14,6 @@
 use PharIo\FileSystem\Filename;
 
 class ComposerCommandConfig extends InstallCommandConfig {
-
     /** @var Directory */
     private $workingDirectory;
 

diff --git a/src/commands/composer/ComposerService.php b/src/commands/composer/ComposerService.php
@@ -17,7 +17,6 @@
 use PharIo\Version\VersionConstraintParser;
 
 class ComposerService {
-
     /** @var SourcesList */
     private $sourcesList;
 

diff --git a/src/commands/default/DefaultCommand.php b/src/commands/default/DefaultCommand.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive;
 
 class DefaultCommand implements Cli\Command {
-
     /** @var VersionCommand */
     private $versionCommand;
 

diff --git a/src/commands/default/DefaultCommandConfig.php b/src/commands/default/DefaultCommandConfig.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive;
 
 class DefaultCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/commands/help/HelpCommand.php b/src/commands/help/HelpCommand.php
@@ -14,7 +14,6 @@
 use function str_replace;
 
 class HelpCommand implements Cli\Command {
-
     /** @var Environment */
     private $environment;
 

diff --git a/src/commands/install/InstallCommand.php b/src/commands/install/InstallCommand.php
@@ -14,7 +14,6 @@
 use PharIo\FileSystem\Filename;
 
 class InstallCommand implements Cli\Command {
-
     /** @var InstallCommandConfig */
     private $config;
 

diff --git a/src/commands/install/InstallCommandConfig.php b/src/commands/install/InstallCommandConfig.php
@@ -22,7 +22,6 @@
 use PharIo\Version\VersionConstraintParser;
 
 class InstallCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/commands/list/ListCommand.php b/src/commands/list/ListCommand.php
@@ -13,7 +13,6 @@
 use function count;
 
 class ListCommand implements Cli\Command {
-
     /** @var SourcesList */
     private $sourcesList;
 

diff --git a/src/commands/migrate/MigrateCommand.php b/src/commands/migrate/MigrateCommand.php
@@ -14,7 +14,6 @@
 use PharIo\Phive\Cli\ConsoleTable;
 
 class MigrateCommand implements Cli\Command {
-
     /** @var MigrateCommandConfig */
     private $config;
 

diff --git a/src/commands/migrate/MigrateCommandConfig.php b/src/commands/migrate/MigrateCommandConfig.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive;
 
 class MigrateCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/commands/outdated/OutdatedCommand.php b/src/commands/outdated/OutdatedCommand.php
@@ -19,7 +19,6 @@
 use PharIo\Phive\Cli\ConsoleTable;
 
 class OutdatedCommand implements Cli\Command {
-
     /** @var PhiveXmlConfig */
     private $phiveXmlConfig;
 

diff --git a/src/commands/outdated/OutdatedConfig.php b/src/commands/outdated/OutdatedConfig.php
@@ -13,7 +13,6 @@
 use PharIo\FileSystem\Filename;
 
 class OutdatedConfig {
-
     /** @var Cli\Options */
     private $options;
 

diff --git a/src/commands/purge/PurgeCommand.php b/src/commands/purge/PurgeCommand.php
@@ -13,7 +13,6 @@
 use function sprintf;
 
 class PurgeCommand implements Cli\Command {
-
     /** @var PharRegistry */
     private $repository;
 

diff --git a/src/commands/remove/RemoveCommand.php b/src/commands/remove/RemoveCommand.php
@@ -13,7 +13,6 @@
 use function sprintf;
 
 class RemoveCommand implements Cli\Command {
-
     /** @var RemoveCommandConfig */
     private $config;
 

diff --git a/src/commands/remove/RemoveCommandConfig.php b/src/commands/remove/RemoveCommandConfig.php
@@ -13,7 +13,6 @@
 use PharIo\FileSystem\Directory;
 
 class RemoveCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/commands/reset/ResetCommand.php b/src/commands/reset/ResetCommand.php
@@ -13,7 +13,6 @@
 use function in_array;
 
 class ResetCommand implements Cli\Command {
-
     /** @var ResetCommandConfig */
     private $config;
 

diff --git a/src/commands/reset/ResetCommandConfig.php b/src/commands/reset/ResetCommandConfig.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive;
 
 class ResetCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/commands/selfupdate/SelfupdateCommand.php b/src/commands/selfupdate/SelfupdateCommand.php
@@ -22,7 +22,6 @@
 use PharIo\Version\Version;
 
 class SelfupdateCommand implements Cli\Command {
-
     /** @var PharDownloader */
     private $pharDownloader;
 

diff --git a/src/commands/skel/SkelCommand.php b/src/commands/skel/SkelCommand.php
@@ -19,7 +19,6 @@
 use PharIo\Phive\Cli\Output;
 
 class SkelCommand implements Cli\Command {
-
     /** @var SkelCommandConfig */
     private $config;
 

diff --git a/src/commands/skel/SkelCommandConfig.php b/src/commands/skel/SkelCommandConfig.php
@@ -13,7 +13,6 @@
 use function rtrim;
 
 class SkelCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/commands/status/StatusCommand.php b/src/commands/status/StatusCommand.php
@@ -18,7 +18,6 @@
 use PharIo\Phive\Cli\ConsoleTable;
 
 class StatusCommand implements Cli\Command {
-
     /** @var Cli\Output */
     private $output;
 

diff --git a/src/commands/status/StatusCommandConfig.php b/src/commands/status/StatusCommandConfig.php
@@ -20,7 +20,6 @@
 use PharIo\Version\AnyVersionConstraint;
 
 class StatusCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/commands/update-repository-list/UpdateRepositoryListCommand.php b/src/commands/update-repository-list/UpdateRepositoryListCommand.php
@@ -13,7 +13,6 @@
 use PharIo\Phive\Cli\Command;
 
 class UpdateRepositoryListCommand implements Command {
-
     /** @var RemoteSourcesListFileLoader */
     private $loader;
 

diff --git a/src/commands/update/UpdateCommand.php b/src/commands/update/UpdateCommand.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive;
 
 class UpdateCommand implements Cli\Command {
-
     /** @var UpdateCommandConfig */
     private $config;
 

diff --git a/src/commands/update/UpdateCommandConfig.php b/src/commands/update/UpdateCommandConfig.php
@@ -14,7 +14,6 @@
 use PharIo\FileSystem\Directory;
 
 class UpdateCommandConfig {
-
     /** @var Cli\Options */
     private $cliOptions;
 

diff --git a/src/services/key/KeyImportResult.php b/src/services/key/KeyImportResult.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive;
 
 class KeyImportResult {
-
     /** @var int */
     private $count;
 

diff --git a/src/services/key/KeyService.php b/src/services/key/KeyService.php
@@ -14,7 +14,6 @@
 use function sprintf;
 
 class KeyService {
-
     /** @var KeyDownloader */
     private $keyDownloader;
 

diff --git a/src/services/key/PublicKey.php b/src/services/key/PublicKey.php
@@ -16,7 +16,6 @@
 use DateTimeImmutable;
 
 class PublicKey {
-
     /** @var string */
     private $id;
 

diff --git a/src/services/key/TrustedCollection.php b/src/services/key/TrustedCollection.php
@@ -13,7 +13,6 @@
 use function in_array;
 
 class TrustedCollection {
-
     /** @var string[] */
     private $keyIds = [];
 

diff --git a/src/services/key/gpg/PublicKeyReader.php b/src/services/key/gpg/PublicKeyReader.php
@@ -15,7 +15,6 @@
 use PharIo\FileSystem\Filename;
 
 class PublicKeyReader {
-
     /** @var GnuPG */
     private $gnupg;
 

diff --git a/src/services/migration/HomePharsXmlMigration.php b/src/services/migration/HomePharsXmlMigration.php
@@ -13,7 +13,6 @@
 use PharIo\FileSystem\Filename;
 
 class HomePharsXmlMigration implements Migration {
-
     /** @var Filename */
     private $legacy;
 

diff --git a/src/services/migration/MigrationFactory.php b/src/services/migration/MigrationFactory.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive;
 
 class MigrationFactory {
-
     /** @var Factory */
     private $factory;
     /** @var Cli\Input */

diff --git a/src/services/migration/MigrationService.php b/src/services/migration/MigrationService.php
@@ -14,7 +14,6 @@
 use function count;
 
 class MigrationService {
-
     /** @var MigrationFactory */
     private $factory;
 

diff --git a/src/services/phar/CompatibilityService.php b/src/services/phar/CompatibilityService.php
@@ -50,7 +50,6 @@ public function canRun(Phar $phar): bool {
 
         foreach ($manifest->getRequirements() as $requirement) {
             switch (true) {
-
                 case $requirement instanceof PhpVersionRequirement: {
                     $php = $requirement->getVersionConstraint();
 

diff --git a/src/services/phar/RemovalService.php b/src/services/phar/RemovalService.php
@@ -14,7 +14,6 @@
 use PharIo\Phive\Cli\Output;
 
 class RemovalService {
-
     /** @var Environment */
     private $environment;
 

diff --git a/src/services/resolver/GithubAliasResolver.php b/src/services/resolver/GithubAliasResolver.php
@@ -80,6 +80,7 @@ private function localResolve(string $name): GithubRepository {
 
     /**
      * @throws GithubAliasResolverException
+     *
      * @psalm-assert !null $this->rateLimit
      */
     private function ensureWithinRateLimit(): void {

diff --git a/src/services/signature/gpg/GnupgVerificationResult.php b/src/services/signature/gpg/GnupgVerificationResult.php
@@ -15,7 +15,6 @@
 use PharIo\GnuPG\ErrorStrings;
 
 class GnupgVerificationResult implements VerificationResult {
-
     /** @var array */
     private $verificationData;
 

diff --git a/src/shared/GnuPG.php b/src/shared/GnuPG.php
@@ -14,7 +14,6 @@
 use PharIo\FileSystem\Directory;
 
 class GnuPG {
-
     /** @var \GnuPG */
     private $gnupg;
 

diff --git a/src/shared/PharRegistry.php b/src/shared/PharRegistry.php
@@ -24,7 +24,6 @@
 use PharIo\Version\Version;
 
 class PharRegistry {
-
     /** @var Directory */
     private $pharDirectory;
 

diff --git a/src/shared/cli/CommandLocator.php b/src/shared/cli/CommandLocator.php
@@ -11,7 +11,6 @@
 namespace PharIo\Phive\Cli;
 
 interface CommandLocator {
-
     /**
      * @throws CommandLocatorException
      */

diff --git a/src/shared/cli/GeneralContext.php b/src/shared/cli/GeneralContext.php
@@ -17,7 +17,6 @@
 use function strlen;
 
 abstract class GeneralContext implements Context {
-
     /** @var Options */
     private $options;
 

diff --git a/src/shared/cli/Options.php b/src/shared/cli/Options.php
@@ -15,7 +15,6 @@
 use function sprintf;
 
 class Options {
-
     /** @var array<string, mixed> */
     private $options = [];
 

diff --git a/src/shared/cli/Request.php b/src/shared/cli/Request.php
@@ -17,7 +17,6 @@
 use OutOfBoundsException;
 
 class Request {
-
     /** @var array */
     private $argv;
 

diff --git a/src/shared/cli/input/ConsoleInput.php b/src/shared/cli/input/ConsoleInput.php
@@ -18,7 +18,6 @@
 use function strtolower;
 
 class ConsoleInput implements Input {
-
     /** @var Output */
     private $output;
 

diff --git a/src/shared/cli/output/ColoredConsoleOutput.php b/src/shared/cli/output/ColoredConsoleOutput.php
@@ -25,7 +25,6 @@ public function writeWarning(string $warningMessage): void {
     }
 
     public function writeMarkdown(string $markdown): void {
-
         // bold => yellow
         $markdown = preg_replace_callback('/(\*\*|__)(.*?)\1/', static function (array $matches): string {
             return "\033[33m" . $matches[2] . "\033[0m"; // 0m