Fix CI failures: rector and phpstan issues

dereuromark · dereuromark · commit 19265d648c58 · 2026-01-14T04:23:16.000+01:00
Apply rector fixes: - Remove @return void from __clone(), __construct(), __destruct() magic methods - Combine nested if statements in PluginAssetsTrait Fix PHPStan issue: - Remove redundant `if (!$copy)` check in PluginAssetsTrait::_process() that was always true after the preceding `if ($copy) { ... continue; }` block
diff --git a/composer.json b/composer.json
@@ -130,7 +130,7 @@
         "stan-setup": "phive install",
         "lowest": "validate-prefer-lowest",
         "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
-        "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:\"~2.2\" && mv composer.backup composer.json",
+        "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:\"~2.3.1\" && mv composer.backup composer.json",
         "rector-check": "vendor/bin/rector process --dry-run",
         "rector-fix": "vendor/bin/rector process",
         "test": "phpunit",
diff --git a/src/Command/PluginAssetsTrait.php b/src/Command/PluginAssetsTrait.php
@@ -125,10 +125,8 @@ protected function _process(
 
             $dest = $config['destDir'] . $config['link'];
             if ($copy) {
-                if (is_link($dest) || $overwrite) {
-                    if (!$this->_remove($config)) {
-                        continue;
-                    }
+                if ((is_link($dest) || $overwrite) && !$this->_remove($config)) {
+                    continue;
                 }
 
                 if (file_exists($dest)) {
@@ -139,15 +137,13 @@ protected function _process(
                 continue;
             }
 
-            if (!$copy) {
-                $result = $this->_createSymlink(
-                    $config['srcPath'],
-                    $dest,
-                    $relative,
-                );
-                if ($result) {
-                    continue;
-                }
+            $result = $this->_createSymlink(
+                $config['srcPath'],
+                $dest,
+                $relative,
+            );
+            if ($result) {
+                continue;
             }
 
             if ($this->_isSymlinkValid($config['srcPath'], $dest)) {
diff --git a/src/Console/ConsoleInput.php b/src/Console/ConsoleInput.php
@@ -60,8 +60,6 @@ public function __construct(string $handle = 'php://stdin')
 
     /**
      * Destruct and free resources
-     *
-     * @return void
      */
     public function __destruct()
     {
diff --git a/src/Database/Expression/AggregateExpression.php b/src/Database/Expression/AggregateExpression.php
@@ -249,8 +249,6 @@ public function count(): int
 
     /**
      * Clone this object and its subtree of expressions.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/BetweenExpression.php b/src/Database/Expression/BetweenExpression.php
@@ -130,8 +130,6 @@ protected function _bindValue(mixed $value, ValueBinder $binder, ?string $type):
 
     /**
      * Do a deep clone of this expression.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/CaseStatementExpression.php b/src/Database/Expression/CaseStatementExpression.php
@@ -570,8 +570,6 @@ public function traverse(Closure $callback)
 
     /**
      * Clones the inner expression objects.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/CommonTableExpression.php b/src/Database/Expression/CommonTableExpression.php
@@ -223,8 +223,6 @@ public function traverse(Closure $callback)
 
     /**
      * Clones the inner expression objects.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/ComparisonExpression.php b/src/Database/Expression/ComparisonExpression.php
@@ -190,8 +190,6 @@ public function traverse(Closure $callback)
      * Create a deep clone.
      *
      * Clones the field and value if they are expression objects.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/OrderClauseExpression.php b/src/Database/Expression/OrderClauseExpression.php
@@ -78,8 +78,6 @@ public function traverse(Closure $callback)
 
     /**
      * Create a deep clone of the order clause.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/QueryExpression.php b/src/Database/Expression/QueryExpression.php
@@ -774,8 +774,6 @@ protected function _calculateType(ExpressionInterface|string $field): ?string
 
     /**
      * Clone this object and its subtree of expressions.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/UnaryExpression.php b/src/Database/Expression/UnaryExpression.php
@@ -106,8 +106,6 @@ public function traverse(Closure $callback)
 
     /**
      * Perform a deep clone of the inner expression.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/WhenThenExpression.php b/src/Database/Expression/WhenThenExpression.php
@@ -304,8 +304,6 @@ public function traverse(Closure $callback)
 
     /**
      * Clones the inner expression objects.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Expression/WindowExpression.php b/src/Database/Expression/WindowExpression.php
@@ -334,8 +334,6 @@ protected function buildOffsetSql(
 
     /**
      * Clone this object and its subtree of expressions.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -1817,8 +1817,6 @@ protected function _dirty(): void
 
     /**
      * Handles clearing iterator and cloning all expressions and value binders.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Database/Query/SelectQuery.php b/src/Database/Query/SelectQuery.php
@@ -772,8 +772,6 @@ public function isResultsCastingEnabled(): bool
 
     /**
      * Handles clearing iterator and cloning all expressions and value binders.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/Mailer/Renderer.php b/src/Mailer/Renderer.php
@@ -109,8 +109,6 @@ public function reset()
 
     /**
      * Clone ViewBuilder instance when renderer is cloned.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/ORM/EagerLoadable.php b/src/ORM/EagerLoadable.php
@@ -316,8 +316,6 @@ public function asContainArray(): array
 
     /**
      * Handles cloning eager loadables.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/ORM/EagerLoader.php b/src/ORM/EagerLoader.php
@@ -877,8 +877,6 @@ protected function _groupKeys(array $results, array $collectKeys): array
 
     /**
      * Handles cloning eager loaders and eager loadables.
-     *
-     * @return void
      */
     public function __clone()
     {
diff --git a/src/TestSuite/Constraint/Email/MailConstraintBase.php b/src/TestSuite/Constraint/Email/MailConstraintBase.php
@@ -35,7 +35,6 @@ abstract class MailConstraintBase extends Constraint
      * Constructor
      *
      * @param int|null $at At
-     * @return void
      */
     public function __construct(?int $at = null)
     {
diff --git a/src/TestSuite/Constraint/Email/MailSentWith.php b/src/TestSuite/Constraint/Email/MailSentWith.php
@@ -33,7 +33,6 @@ class MailSentWith extends MailConstraintBase
      *
      * @param int|null $at At
      * @param string|null $method Method
-     * @return void
      */
     public function __construct(?int $at = null, ?string $method = null)
     {
diff --git a/src/TestSuite/Stub/TestExceptionRenderer.php b/src/TestSuite/Stub/TestExceptionRenderer.php
@@ -37,7 +37,6 @@ class TestExceptionRenderer implements ExceptionRendererInterface
      * Simply rethrow the given exception
      *
      * @param \Throwable $exception Exception.
-     * @return void
      * @throws \Throwable $exception Rethrows the passed exception.
      */
     public function __construct(Throwable $exception)

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public function __construct(string $handle = 'php://stdin')`
`60`	`60`
`61`	`61`	`/**`
`62`	`62`	`* Destruct and free resources`
`63`		`- *`
`64`		`- * @return void`
`65`	`63`	`*/`
`66`	`64`	`public function __destruct()`
`67`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,6 @@ public function count(): int`
`249`	`249`
`250`	`250`	`/**`
`251`	`251`	`* Clone this object and its subtree of expressions.`
`252`		`- *`
`253`		`- * @return void`
`254`	`252`	`*/`
`255`	`253`	`public function __clone()`
`256`	`254`	`{`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,6 @@ protected function _bindValue(mixed $value, ValueBinder $binder, ?string $type):`
`130`	`130`
`131`	`131`	`/**`
`132`	`132`	`* Do a deep clone of this expression.`
`133`		`- *`
`134`		`- * @return void`
`135`	`133`	`*/`
`136`	`134`	`public function __clone()`
`137`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -570,8 +570,6 @@ public function traverse(Closure $callback)`
`570`	`570`
`571`	`571`	`/**`
`572`	`572`	`* Clones the inner expression objects.`
`573`		`- *`
`574`		`- * @return void`
`575`	`573`	`*/`
`576`	`574`	`public function __clone()`
`577`	`575`	`{`
Original file line number	Diff line number	Diff line change
`@@ -223,8 +223,6 @@ public function traverse(Closure $callback)`
`223`	`223`
`224`	`224`	`/**`
`225`	`225`	`* Clones the inner expression objects.`
`226`		`- *`
`227`		`- * @return void`
`228`	`226`	`*/`
`229`	`227`	`public function __clone()`
`230`	`228`	`{`
Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,6 @@ public function traverse(Closure $callback)`
`190`	`190`	`* Create a deep clone.`
`191`	`191`	`*`
`192`	`192`	`* Clones the field and value if they are expression objects.`
`193`		`- *`
`194`		`- * @return void`
`195`	`193`	`*/`
`196`	`194`	`public function __clone()`
`197`	`195`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@ public function traverse(Closure $callback)`
`78`	`78`
`79`	`79`	`/**`
`80`	`80`	`* Create a deep clone of the order clause.`
`81`		`- *`
`82`		`- * @return void`
`83`	`81`	`*/`
`84`	`82`	`public function __clone()`
`85`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -774,8 +774,6 @@ protected function _calculateType(ExpressionInterface\|string $field): ?string`
`774`	`774`
`775`	`775`	`/**`
`776`	`776`	`* Clone this object and its subtree of expressions.`
`777`		`- *`
`778`		`- * @return void`
`779`	`777`	`*/`
`780`	`778`	`public function __clone()`
`781`	`779`	`{`