[Core] Replace deprecated ShellCode:: with Symfony Command:: for stat…

…us (#737) Co-authored-by: GitHub Action <action@github.com>
rectorphp · Aug 22, 2021 · b422a9d · b422a9d
1 parent 974d5ee
commit b422a9d
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 35 deletions.
diff --git a/bin/rector.php b/bin/rector.php
@@ -10,7 +10,8 @@
 use Rector\Core\Console\Style\SymfonyStyleFactory;
 use Rector\Core\DependencyInjection\RectorContainerFactory;
 use Rector\Core\HttpKernel\RectorKernel;
-use Symplify\PackageBuilder\Console\ShellCode;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\ArgvInput;
 use Symplify\PackageBuilder\Reflection\PrivatesCaller;
 
 // @ intentionally: continue anyway
@@ -57,7 +58,7 @@
     $container = $rectorContainerFactory->createFromBootstrapConfigs($bootstrapConfigs);
 } catch (Throwable $throwable) {
     // for json output
-    $argvInput = new \Symfony\Component\Console\Input\ArgvInput();
+    $argvInput = new ArgvInput();
     $outputFormat = $argvInput->getParameterOption('--' . Option::OUTPUT_FORMAT);
 
     // report fatal error in json format
@@ -72,7 +73,7 @@
         $symfonyStyle->error($throwable->getMessage());
     }
 
-    exit(ShellCode::ERROR);
+    exit(Command::FAILURE);
 }
 
 /** @var ConsoleApplication $application */

diff --git a/rules/CodeQuality/NodeManipulator/ClassMethodParameterTypeManipulator.php b/rules/CodeQuality/NodeManipulator/ClassMethodParameterTypeManipulator.php
@@ -101,8 +101,7 @@ private function refactorMethodCalls(
         Param $param,
         ClassMethod $classMethod,
         array $methodsReturningClassInstance
-    ): void
-    {
+    ): void {
         if ($classMethod->stmts === null) {
             return;
         }
@@ -126,8 +125,7 @@ private function refactorMethodCall(
         Param $param,
         MethodCall $methodCall,
         array $methodsReturningClassInstance
-    ): void
-    {
+    ): void {
         $paramName = $this->nodeNameResolver->getName($param->var);
         if ($paramName === null) {
             return;
@@ -159,8 +157,7 @@ private function shouldSkipMethodCallRefactor(
         string $paramName,
         MethodCall $methodCall,
         array $methodsReturningClassInstance
-    ): bool
-    {
+    ): bool {
         if (! $this->nodeNameResolver->isName($methodCall->var, $paramName)) {
             return true;
         }

diff --git a/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php b/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php
@@ -115,21 +115,22 @@ private function shouldSkip(Foreach_ $foreach): bool
             return true;
         }
 
-        /** @var Scope $scope */
         $scope = $foreach->expr->getAttribute(AttributeKey::SCOPE);
 
         if (! $scope instanceof Scope) {
-            return false;
+            return true;
         }
 
         $type = $scope->getType($foreach->expr);
 
         if ($type instanceof ObjectType) {
-            return $type->isIterable()->yes();
+            return $type->isIterable()
+                ->yes();
         }
 
         if ($type instanceof ThisType) {
-            return $type->isIterable()->yes();
+            return $type->isIterable()
+                ->yes();
         }
 
         return false;

diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php
@@ -195,8 +195,7 @@ private function getDifferentParamTypeFromAncestorClass(Param $param, FunctionLi
     private function resolveParentReflectionMethod(
         ClassReflection $classReflection,
         string $methodName
-    ): ?ReflectionMethod
-    {
+    ): ?ReflectionMethod {
         if (! $classReflection->hasMethod($methodName)) {
             return null;
         }

diff --git a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector.php b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector.php
@@ -73,10 +73,7 @@ public function getStatic()
      */
     public function refactor(Node $node): ?Node
     {
-        if ($node->returnType instanceof Name && $this->nodeNameResolver->isName(
-            $node->returnType,
-            'self'
-        )) {
+        if ($node->returnType instanceof Name && $this->nodeNameResolver->isName($node->returnType, 'self')) {
             return null;
         }
 

diff --git a/rules/Php80/NodeAnalyzer/PromotedPropertyCandidateResolver.php b/rules/Php80/NodeAnalyzer/PromotedPropertyCandidateResolver.php
@@ -195,7 +195,10 @@ private function hasConflictingParamType(Param $param, Type $propertyType): bool
         }
 
         // different types, not a good to fit
-        return ! $isAllFullyQualifiedObjectType && ! $this->typeComparator->areTypesEqual($propertyType, $matchedParamType);
+        return ! $isAllFullyQualifiedObjectType && ! $this->typeComparator->areTypesEqual(
+            $propertyType,
+            $matchedParamType
+        );
     }
 
     /**

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -6,8 +6,8 @@
 
 use DateTime;
 use Rector\Core\Exception\VersionException;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Process\Process;
-use Symplify\PackageBuilder\Console\ShellCode;
 
 /**
  * Inspired by https://github.com/composer/composer/blob/master/src/Composer/Composer.php
@@ -28,7 +28,7 @@ final class VersionResolver
     public static function resolvePackageVersion(): string
     {
         $process = new Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);
-        if ($process->run() !== ShellCode::SUCCESS) {
+        if ($process->run() !== Command::SUCCESS) {
             throw new VersionException(
                 'You must ensure to run compile from composer git repository clone and that git binary is available.'
             );
@@ -41,7 +41,7 @@ public static function resolvePackageVersion(): string
     public static function resolverReleaseDateTime(): DateTime
     {
         $process = new Process(['git', 'log', '-n1', '--pretty=%ci', 'HEAD'], __DIR__);
-        if ($process->run() !== ShellCode::SUCCESS) {
+        if ($process->run() !== Command::SUCCESS) {
             throw new VersionException(
                 'You must ensure to run compile from composer git repository clone and that git binary is available.'
             );

diff --git a/src/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symplify\PackageBuilder\Console\ShellCode;
 use Symplify\SmartFileSystem\FileSystemGuard;
 use Symplify\SmartFileSystem\SmartFileSystem;
 
@@ -63,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->symfonyStyle->success('"rector.php" config file was added');
         }
 
-        return ShellCode::SUCCESS;
+        return Command::SUCCESS;
     }
 
     private function resolveTemplateFilePathByType(string $templateType): string

diff --git a/src/Console/Command/ProcessCommand.php b/src/Console/Command/ProcessCommand.php
@@ -29,7 +29,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symplify\PackageBuilder\Console\ShellCode;
 
 final class ProcessCommand extends Command
 {
@@ -185,15 +184,15 @@ private function resolveReturnCode(ProcessResult $processResult, Configuration $
     {
         // some errors were found → fail
         if ($processResult->getErrors() !== []) {
-            return ShellCode::ERROR;
+            return Command::FAILURE;
         }
 
         // inverse error code for CI dry-run
         if (! $configuration->isDryRun()) {
-            return ShellCode::SUCCESS;
+            return Command::SUCCESS;
         }
 
-        return $processResult->getFileDiffs() === [] ? ShellCode::SUCCESS : ShellCode::ERROR;
+        return $processResult->getFileDiffs() === [] ? Command::SUCCESS : Command::FAILURE;
     }
 
     /**

diff --git a/src/Console/Command/ShowCommand.php b/src/Console/Command/ShowCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symplify\PackageBuilder\Console\ShellCode;
 
 final class ShowCommand extends Command
 {
@@ -52,7 +51,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->reportLoadedRectors($outputFormat);
 
-        return ShellCode::SUCCESS;
+        return Command::SUCCESS;
     }
 
     private function reportLoadedRectors(string $outputFormat): void

diff --git a/src/Reporting/MissingRectorRulesReporter.php b/src/Reporting/MissingRectorRulesReporter.php
@@ -7,8 +7,8 @@
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\PostRector\Contract\Rector\ComplementaryRectorInterface;
 use Rector\PostRector\Contract\Rector\PostRectorInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symplify\PackageBuilder\Console\ShellCode;
 
 final class MissingRectorRulesReporter
 {
@@ -40,7 +40,7 @@ function (RectorInterface $rector): bool {
 
         $this->report();
 
-        return ShellCode::ERROR;
+        return Command::FAILURE;
     }
 
     public function report(): void

diff --git a/utils/compiler/src/Command/DowngradePathsCommand.php b/utils/compiler/src/Command/DowngradePathsCommand.php
@@ -8,7 +8,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Finder\Finder;
-use Symplify\PackageBuilder\Console\ShellCode;
 
 final class DowngradePathsCommand extends Command
 {
@@ -76,7 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $downgradePathsLine = implode(';', $downgradePaths);
         echo $downgradePathsLine . PHP_EOL;
 
-        return ShellCode::SUCCESS;
+        return Command::SUCCESS;
     }
 
     /**