package upgrade and rector config update.

iLexN · May 16, 2022 · 002a2ae · 002a2ae
1 parent a771be7
commit 002a2ae
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -23,15 +23,15 @@
     },
     "require":{
         "php": ">=8.1",
-        "symfony/console": "^6.0.7"
+        "symfony/console": "^6.0.8"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
         "infection/infection": "^0.26",
-        "phpstan/phpstan": "^1.5",
+        "phpstan/phpstan": "^1.6",
         "phpunit/phpunit": "^9.5",
         "rector/rector": "^0.12",
-        "vimeo/psalm": "^4.22"
+        "vimeo/psalm": "^4.23"
     },
     "bin": ["bin/ilexn-kcg"],
     "config": {

diff --git a/rector-ci.php b/rector-ci.php
@@ -2,27 +2,27 @@
 
 declare(strict_types=1);
 
-use Rector\Core\Configuration\Option;
-use Rector\Core\ValueObject\PhpVersion;
+use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\SetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $parameters = $containerConfigurator->parameters();
+return static function (RectorConfig $rectorConfig): void {
+
+    $rectorConfig->sets([
+        SetList::CODE_QUALITY,
+        SetList::DEAD_CODE,
+        SetList::PHP_80,
+        SetList::PHP_81,
+        SetList::PSR_4,
+        SetList::EARLY_RETURN,
+        SetList::NAMING,
+        SetList::TYPE_DECLARATION_STRICT,
+    ]);
 
-    $containerConfigurator->import(SetList::CODE_QUALITY);
-    $containerConfigurator->import(SetList::DEAD_CODE);
-    $containerConfigurator->import(SetList::CODING_STYLE);
-    $containerConfigurator->import(SetList::PHP_80);
-    $containerConfigurator->import(SetList::PHP_81);
-    $containerConfigurator->import(SetList::PSR_4);
-    $containerConfigurator->import(SetList::EARLY_RETURN);
-    $containerConfigurator->import(SetList::NAMING);
 
-    $parameters->set(Option::SKIP, [
+    $rectorConfig->skip([
         Rector\Php80\Rector\FunctionLike\UnionTypesRector::class,
         Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector::class,
         Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector::class,
     ]);
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
+
 };
diff --git a/src/Formatter/DefaultFormatter.php b/src/Formatter/DefaultFormatter.php
@@ -91,7 +91,6 @@ public function render(
         $this->links = '';
         $out = $this->renderTitle($title, $description);
         $out .= $this->renderReleases($releases);
-        $out .= $this->getLinks();
-        return $out;
+        return $out . $this->getLinks();
     }
 }