Update rector and rector rules (#5517)

.php-cs-fixer.dist.php

@@ -23,6 +23,7 @@
     ])
     ->append([
         __FILE__,
+        __DIR__.'/rector.php',
         $tools.'/bin/clone-addon',
         $tools.'/bin/release',
         $tools.'/bin/setup',

.tools/phpstan/baseline.neon

@@ -701,12 +701,12 @@ parameters:
 			path: ../../redaxo/src/addons/mediapool/lib/media_category.php
 
 		-
-			message: "#^Parameter \\#2 \\$getInstanceCallback of static method rex_media_category\\:\\:getInstanceList\\(\\) expects callable\\(\\.\\.\\.mixed\\)\\: rex_media_category\\|null, array\\{'rex_media_category', 'get'\\} given\\.$#"
+			message: "#^Parameter \\#2 \\$getInstanceCallback of static method rex_media_category\\:\\:getInstanceList\\(\\) expects callable\\(\\.\\.\\.mixed\\)\\: rex_media\\|null, Closure\\(string\\)\\: rex_media\\|null given\\.$#"
 			count: 1
 			path: ../../redaxo/src/addons/mediapool/lib/media_category.php
 
 		-
-			message: "#^Parameter \\#2 \\$getInstanceCallback of static method rex_media_category\\:\\:getInstanceList\\(\\) expects callable\\(\\.\\.\\.mixed\\)\\: rex_media\\|null, array\\{'rex_media', 'get'\\} given\\.$#"
+			message: "#^Parameter \\#2 \\$getInstanceCallback of static method rex_media_category\\:\\:getInstanceList\\(\\) expects callable\\(\\.\\.\\.mixed\\)\\: static\\(rex_media_category\\)\\|null, Closure\\(int\\)\\: static\\(rex_media_category\\)\\|null given\\.$#"
 			count: 1
 			path: ../../redaxo/src/addons/mediapool/lib/media_category.php
 
@@ -2366,7 +2366,7 @@ parameters:
 			path: ../../redaxo/src/core/lib/autoload.php
 
 		-
-			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{'rex_autoload', 'autoload'\\} given\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, Closure\\(string\\)\\: bool given\\.$#"
 			count: 1
 			path: ../../redaxo/src/core/lib/autoload.php
 
@@ -4131,7 +4131,7 @@ parameters:
 			path: ../../redaxo/src/core/tests/base/instance_list_pool_trait_test.php
 
 		-
-			message: "#^Parameter \\#2 \\$getInstanceCallback of static method rex_test_instance_list_pool\\:\\:getInstanceList\\(\\) expects callable\\(\\.\\.\\.mixed\\)\\: rex_test_instance_list_pool\\|null, array\\{'rex_test_instance_list_pool', 'get'\\} given\\.$#"
+			message: "#^Parameter \\#2 \\$getInstanceCallback of static method rex_test_instance_list_pool\\:\\:getInstanceList\\(\\) expects callable\\(\\.\\.\\.mixed\\)\\: rex_test_instance_list_pool\\|null, Closure\\(mixed\\)\\: rex_test_instance_list_pool given\\.$#"
 			count: 4
 			path: ../../redaxo/src/core/tests/base/instance_list_pool_trait_test.php
 

.tools/psalm/baseline.xml

@@ -381,11 +381,6 @@
       <code>$rows</code>
     </PossiblyNullOperand>
   </file>
-  <file src="redaxo/src/addons/cronjob/plugins/optimize_tables/lib/cronjob.php">
-    <MixedArgument occurrences="1">
-      <code>$tables</code>
-    </MixedArgument>
-  </file>
   <file src="redaxo/src/addons/debug/boot.php">
     <MixedArgument occurrences="2">
       <code>$query['query']</code>
@@ -1470,10 +1465,10 @@
       <code>$params['id']</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="4">
-      <code>[$catHandler, 'extendForm']</code>
-      <code>[$catHandler, 'extendForm']</code>
-      <code>[$catHandler, 'extendForm']</code>
-      <code>[$catHandler, 'extendForm']</code>
+      <code>$catHandler-&gt;extendForm(...)</code>
+      <code>$catHandler-&gt;extendForm(...)</code>
+      <code>$catHandler-&gt;extendForm(...)</code>
+      <code>$catHandler-&gt;extendForm(...)</code>
     </MixedArgumentTypeCoercion>
     <MixedAssignment occurrences="1">
       <code>$params['activeItem']</code>
@@ -1503,10 +1498,10 @@
       <code>void</code>
     </ImplementedReturnTypeMismatch>
     <MixedArgumentTypeCoercion occurrences="4">
-      <code>[$clangHandler, 'extendForm']</code>
-      <code>[$clangHandler, 'extendForm']</code>
-      <code>[$clangHandler, 'extendForm']</code>
-      <code>[$clangHandler, 'extendForm']</code>
+      <code>$clangHandler-&gt;extendForm(...)</code>
+      <code>$clangHandler-&gt;extendForm(...)</code>
+      <code>$clangHandler-&gt;extendForm(...)</code>
+      <code>$clangHandler-&gt;extendForm(...)</code>
     </MixedArgumentTypeCoercion>
     <MixedAssignment occurrences="1">
       <code>$params['activeItem']</code>
@@ -1603,10 +1598,10 @@
       <code>$params['filename']</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="4">
-      <code>[$mediaHandler, 'extendForm']</code>
-      <code>[$mediaHandler, 'extendForm']</code>
-      <code>[$mediaHandler, 'extendForm']</code>
-      <code>[$mediaHandler, 'extendForm']</code>
+      <code>$mediaHandler-&gt;extendForm(...)</code>
+      <code>$mediaHandler-&gt;extendForm(...)</code>
+      <code>$mediaHandler-&gt;extendForm(...)</code>
+      <code>$mediaHandler-&gt;extendForm(...)</code>
     </MixedArgumentTypeCoercion>
     <MixedArrayAssignment occurrences="4">
       <code>$warning[]</code>
@@ -4155,8 +4150,7 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="redaxo/src/core/lib/console/setup/check.php">
-    <MixedArgument occurrences="3">
-      <code>$errors</code>
+    <MixedArgument occurrences="2">
       <code>$message</code>
       <code>$messages</code>
     </MixedArgument>
@@ -4169,7 +4163,7 @@
     </MixedAssignment>
   </file>
   <file src="redaxo/src/core/lib/console/setup/run.php">
-    <MixedArgument occurrences="19">
+    <MixedArgument occurrences="18">
       <code>$config['db'][1]['host']</code>
       <code>$config['db'][1]['login']</code>
       <code>$config['db'][1]['name']</code>
@@ -4179,7 +4173,6 @@
       <code>$config['timezone']</code>
       <code>$config['timezone']</code>
       <code>$dbCreate</code>
-      <code>$errors</code>
       <code>$login</code>
       <code>$login</code>
       <code>$login</code>
@@ -4816,6 +4809,13 @@
     </PossiblyNullReference>
   </file>
   <file src="redaxo/src/core/lib/packages/addons/addon.php">
+    <InvalidScalarArgument occurrences="1">
+      <code>$args</code>
+    </InvalidScalarArgument>
+    <MixedArgument occurrences="2">
+      <code>$args</code>
+      <code>$args</code>
+    </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="1">
       <code>$pluginName</code>
     </MixedArgumentTypeCoercion>
@@ -4829,15 +4829,9 @@
       <code>$plugin</code>
       <code>$plugins</code>
     </MixedAssignment>
-    <MixedInferredReturnType occurrences="1">
-      <code>i18n</code>
-    </MixedInferredReturnType>
     <MixedPropertyTypeCoercion occurrences="1">
       <code>$addon-&gt;plugins</code>
     </MixedPropertyTypeCoercion>
-    <MixedReturnStatement occurrences="1">
-      <code>call_user_func_array([rex_i18n::class, 'msg'], $args)</code>
-    </MixedReturnStatement>
     <ParamNameMismatch occurrences="3">
       <code>$addon</code>
       <code>$addon</code>
@@ -4853,7 +4847,8 @@
     <LessSpecificReturnStatement occurrences="1">
       <code>$packages</code>
     </LessSpecificReturnStatement>
-    <MixedArgument occurrences="9">
+    <MixedArgument occurrences="10">
+      <code>$args</code>
       <code>$instmsg</code>
       <code>$instmsg</code>
       <code>$normal</code>
@@ -4925,18 +4920,12 @@
       <code>$add($id)</code>
       <code>$add($rp)</code>
     </MixedFunctionCall>
-    <MixedInferredReturnType occurrences="1">
-      <code>string</code>
-    </MixedInferredReturnType>
     <MixedOperand occurrences="4">
       <code>$args[0]</code>
       <code>$args[0]</code>
       <code>$requirements['packages'][$packageId]</code>
       <code>$successMessage</code>
     </MixedOperand>
-    <MixedReturnStatement occurrences="1">
-      <code>call_user_func_array([rex_i18n::class, 'msg'], $args)</code>
-    </MixedReturnStatement>
     <MoreSpecificReturnType occurrences="1">
       <code>non-empty-string[]</code>
     </MoreSpecificReturnType>
@@ -4945,12 +4934,12 @@
     </UnusedForeachValue>
   </file>
   <file src="redaxo/src/core/lib/packages/null.php">
-    <MixedInferredReturnType occurrences="1">
-      <code>i18n</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="2">
+    <MixedArgument occurrences="2">
+      <code>$args</code>
+      <code>$args</code>
+    </MixedArgument>
+    <MixedReturnStatement occurrences="1">
       <code>$default</code>
-      <code>call_user_func_array([rex_i18n::class, 'msg'], $args)</code>
     </MixedReturnStatement>
   </file>
   <file src="redaxo/src/core/lib/packages/package.php">
@@ -5013,12 +5002,14 @@
     <LessSpecificImplementedReturnType occurrences="1">
       <code>string</code>
     </LessSpecificImplementedReturnType>
+    <MixedArgument occurrences="1">
+      <code>$args</code>
+    </MixedArgument>
     <MixedInferredReturnType occurrences="1">
       <code>i18n</code>
     </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="2">
+    <MixedReturnStatement occurrences="1">
       <code>call_user_func_array([$this-&gt;getAddon(), 'i18n'], $args)</code>
-      <code>call_user_func_array([rex_i18n::class, 'msg'], $args)</code>
     </MixedReturnStatement>
     <PossiblyNullArgument occurrences="1">
       <code>$plugin</code>
@@ -5355,9 +5346,8 @@
     </UnusedVariable>
   </file>
   <file src="redaxo/src/core/lib/sql/table.php">
-    <MixedArgument occurrences="7">
+    <MixedArgument occurrences="6">
       <code>$column</code>
-      <code>$columns</code>
       <code>$db</code>
       <code>$name</code>
       <code>$oldName</code>
@@ -6176,7 +6166,7 @@
       <code>$this-&gt;previousLocale</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="1">
-      <code>[rex_i18n_trans_cb::class, 'mytranslate']</code>
+      <code>rex_i18n_trans_cb::mytranslate(...)</code>
     </MixedArgumentTypeCoercion>
   </file>
   <file src="redaxo/src/core/tests/util/markdown_test.php">

composer.json

@@ -23,7 +23,7 @@
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "0.18.4",
         "psalm/plugin-symfony": "v5.0.1",
-        "rector/rector": "0.15.2",
+        "rector/rector": "0.15.7",
         "redaxo/php-cs-fixer-config": "2.0.0",
         "redaxo/psalm-plugin": "2.0.0",
         "vimeo/psalm": "5.4.0"

rector.php

@@ -13,9 +13,11 @@
 use Rector\Config\RectorConfig;
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
+use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
 use Rector\Php80\Rector\Identical\StrEndsWithRector;
 use Rector\Php80\Rector\Identical\StrStartsWithRector;
 use Rector\Php80\Rector\NotIdentical\StrContainsRector;
+use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Redaxo\Rector\Rule\UnderscoreToCamelCasePropertyNameRector;
 use Redaxo\Rector\Rule\UnderscoreToCamelCaseVariableNameRector;
 use Redaxo\Rector\Util\UnderscoreCamelCaseConflictingNameGuard;
@@ -65,9 +67,10 @@
 
     // we will grow this rector list step by step.
     // after some basic rectors have been enabled we can finally enable whole-sets (when diffs get stable and reviewable)
-    // $services->set(Rector\SOLID\Rector\If_\ChangeAndIfToEarlyReturnRector::class);
     $services->set(CombinedAssignRector::class);
+    $services->set(FirstClassCallableRector::class);
     $services->set(InlineSimplePropertyAnnotationRector::class);
+    $services->set(RemoveUnusedVariableInCatchRector::class);
     $services->set(SimplifyBoolIdenticalTrueRector::class);
     $services->set(SimplifyConditionsRector::class);
     $services->set(SimplifyDeMorganBinaryRector::class);

redaxo/src/addons/backup/lib/backup.php

@@ -452,7 +452,7 @@ private static function addFolderToTar(rex_backup_tar $tar, $path, $dir)
                 continue;
             }
 
-            if (substr($file, 0, strlen(rex::getTempPrefix())) == rex::getTempPrefix()) {
+            if (str_starts_with($file, rex::getTempPrefix())) {
                 continue;
             }
 
@@ -476,7 +476,7 @@ public static function getTables()
     {
         $tables = [];
         foreach (rex_sql::factory()->getTables(rex::getTablePrefix()) as $table) {
-            if (substr($table, 0, strlen(rex::getTablePrefix() . rex::getTempPrefix())) != rex::getTablePrefix() . rex::getTempPrefix()) { // Tabellen die mit rex_tmp_ beginnne, werden nicht exportiert!
+            if (!str_starts_with($table, rex::getTablePrefix() . rex::getTempPrefix())) { // Tabellen die mit rex_tmp_ beginnne, werden nicht exportiert!
                 $tables[] = $table;
             }
         }

redaxo/src/addons/cronjob/lib/manager_sql.php

@@ -107,7 +107,7 @@ public function setStatus($id, $status)
         try {
             $this->sql->update();
             $success = true;
-        } catch (rex_sql_exception $e) {
+        } catch (rex_sql_exception) {
             $success = false;
         }
         $this->saveNextTime();
@@ -126,7 +126,7 @@ public function setExecutionStart($id, $reset = false)
         try {
             $this->sql->update();
             return true;
-        } catch (rex_sql_exception $e) {
+        } catch (rex_sql_exception) {
             return false;
         }
     }
@@ -142,7 +142,7 @@ public function delete($id)
         try {
             $this->sql->delete();
             $success = true;
-        } catch (rex_sql_exception $e) {
+        } catch (rex_sql_exception) {
             $success = false;
         }
         $this->saveNextTime();
@@ -296,7 +296,7 @@ public function setNextTime($id, $interval, $resetExecutionStart = false)
                 WHERE   id = ?
             ', [$nexttime, $id]);
             $success = true;
-        } catch (rex_sql_exception $e) {
+        } catch (rex_sql_exception) {
             $success = false;
         }
         $this->saveNextTime();

redaxo/src/addons/cronjob/plugins/optimize_tables/lib/cronjob.php

@@ -17,7 +17,7 @@ public function execute()
             $sql = rex_sql::factory();
             // $sql->setDebug();
             try {
-                $sql->setQuery('OPTIMIZE TABLE ' . implode(', ', array_map([$sql, 'escapeIdentifier'], $tables)));
+                $sql->setQuery('OPTIMIZE TABLE ' . implode(', ', array_map($sql->escapeIdentifier(...), $tables)));
                 return true;
             } catch (rex_sql_exception $e) {
                 $this->setMessage($e->getMessage());

redaxo/src/addons/install/lib/package/package_download.php

@@ -89,7 +89,7 @@ private function isCorrectFormat(string $file): bool
             if (true === $zip->open($file)) {
                 for ($i = 0; $i < $zip->numFiles; ++$i) {
                     $filename = $zip->getNameIndex($i);
-                    if (substr($filename, 0, strlen($this->addonkey.'/')) != $this->addonkey.'/') {
+                    if (!str_starts_with($filename, $this->addonkey.'/')) {
                         $zip->deleteIndex($i);
                     } else {
                         $success = true;

redaxo/src/addons/install/pages/index.php

@@ -20,9 +20,9 @@
             $parser->setSafeMode(true);
             $parser->setBreaksEnabled(true);
 
-            $markdown = [$parser, 'text'];
+            $markdown = $parser->text(...);
         } else {
-            $markdown = [rex_markdown::factory(), 'parse'];
+            $markdown = rex_markdown::factory()->parse(...);
         }
     }
 

redaxo/src/addons/media_manager/lib/media_manager.php

@@ -114,7 +114,7 @@ protected function applyEffects($type)
 
                 try {
                     $effect->execute();
-                } catch (rex_media_manager_not_found_exception $exception) {
+                } catch (rex_media_manager_not_found_exception) {
                     $this->notFound = true;
 
                     return;

redaxo/src/addons/media_manager/pages/effects.php

@@ -44,7 +44,7 @@
             ->setWhere(['id' => $typeId])
             ->addGlobalUpdateFields()
             ->update();
-    } catch (rex_sql_exception $e) {
+    } catch (rex_sql_exception) {
         $warning = $sql->getError();
     }
     $func = '';

redaxo/src/addons/media_manager/pages/types.php

@@ -33,7 +33,7 @@
         });
 
         $success = rex_i18n::msg('media_manager_type_deleted');
-    } catch (rex_sql_exception $e) {
+    } catch (rex_sql_exception) {
         $error = $sql->getError();
     }
     $func = '';
@@ -57,7 +57,7 @@
         $sql->setQuery('INSERT INTO '.rex::getTablePrefix() . 'media_manager_type_effect (type_id, effect, parameters, priority, updatedate, updateuser, createdate, createuser) SELECT ?, effect, parameters, priority, ?, ?, ?, ? FROM '.rex::getTablePrefix() . 'media_manager_type_effect WHERE type_id = ?', [$newTypeId, date(rex_sql::FORMAT_DATETIME), $login, date(rex_sql::FORMAT_DATETIME), $login, $typeId]);
 
         $success = rex_i18n::msg('media_manager_type_copied');
-    } catch (rex_sql_exception $e) {
+    } catch (rex_sql_exception) {
         $error = $sql->getError();
     }