merge 3.x => 3.next

.phive/phars.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.55" installed="2.1.55" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="2.3.0" installed="2.3.0" location="./tools/phpstan" copy="false"/>
 </phive>

composer.json

@@ -73,7 +73,7 @@
         "stan": "@phpstan",
         "stan-baseline": "tools/phpstan --generate-baseline",
         "stan-setup": "phive install",
-        "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:\"~2.3.1\" && mv composer.backup composer.json",
+        "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:\"~2.7.0\" && mv composer.backup composer.json",
         "rector-check": "vendor/bin/rector process --dry-run",
         "rector-fix": "vendor/bin/rector process",
         "test": "phpunit",

rector.php

@@ -3,13 +3,16 @@
 
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
 use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
-use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
+use Rector\CodeQuality\Rector\If_\ArrayExplicitBoolCompareRector;
+use Rector\CodeQuality\Rector\If_\ObjectExplicitBoolCompareRector;
 use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector;
 use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassMethod\RemoveMixedDocblockOverruledByNativeTypeRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessUnionReturnDocblockRector;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Set\ValueObject\SetList;
@@ -51,8 +54,11 @@
         ReturnTypeFromStrictFluentReturnRector::class,
         SplitDoubleAssignRector::class,
         NewlineAfterStatementRector::class,
-        ExplicitBoolCompareRector::class,
         TypedPropertyFromCreateMockAssignRector::class,
+        ArrayExplicitBoolCompareRector::class,
+        ObjectExplicitBoolCompareRector::class,
+        RemoveUselessUnionReturnDocblockRector::class,
+        RemoveMixedDocblockOverruledByNativeTypeRector::class,
 
         // Parent SimpleBakeCommand::buildOptionParser() switched from public
         // to protected in cakephp/bake 3.6.4. Narrowing this override would

src/Controller/Component/AuthorizationComponent.php

@@ -126,9 +126,7 @@ protected function performCheck(
         string $method = 'can',
     ): ResultInterface|bool {
         $request = $this->getController()->getRequest();
-        if ($action === null) {
-            $action = $this->getDefaultAction($request);
-        }
+        $action ??= $this->getDefaultAction($request);
 
         $identity = $this->getIdentity($request);
         if (!$identity instanceof IdentityInterface) {
@@ -152,9 +150,7 @@ protected function performCheck(
     public function applyScope(mixed $resource, ?string $action = null, mixed ...$optionalArgs): mixed
     {
         $request = $this->getController()->getRequest();
-        if ($action === null) {
-            $action = $this->getDefaultAction($request);
-        }
+        $action ??= $this->getDefaultAction($request);
         $identity = $this->getIdentity($request);
         if (!$identity instanceof IdentityInterface) {
             return $this->getService($request)->applyScope(null, $action, $resource);

src/Middleware/AuthorizationMiddleware.php

@@ -90,11 +90,9 @@ public function __construct(
         array $config = [],
         ?ContainerInterface $container = null,
     ) {
-        if ($this->_defaultConfig['identityDecorator'] === null) {
-            $this->_defaultConfig['identityDecorator'] = interface_exists(AuthenIdentityInterface::class)
-                ? Identity::class
-                : IdentityDecorator::class;
-        }
+        $this->_defaultConfig['identityDecorator'] ??= interface_exists(AuthenIdentityInterface::class)
+            ? Identity::class
+            : IdentityDecorator::class;
 
         $this->subject = $subject;
         $this->container = $container;

src/Policy/OrmResolver.php

@@ -157,9 +157,7 @@ protected function findPolicy(string $class, string $name, string $namespace): m
         }
 
         // Check the application/plugin.
-        if ($policyClass === null) {
-            $policyClass = App::className($namespace . '.' . $name, 'Policy', 'Policy');
-        }
+        $policyClass ??= App::className($namespace . '.' . $name, 'Policy', 'Policy');
 
         if ($policyClass === null) {
             throw new MissingPolicyException([$class]);

tests/test_app/TestApp/Policy/ArticlePolicy.php

@@ -37,7 +37,7 @@ public function canAdd($user): bool
      * @param \Authorization\IdentityInterface $user
      * @return bool
      */
-    public function canEdit($user, Article $article)
+    public function canEdit($user, Article $article): bool
     {
         if ($user === null) {
             return false;
@@ -56,7 +56,7 @@ public function canEdit($user, Article $article)
      * @param \Authorization\IdentityInterface $user
      * @return bool
      */
-    public function canModify($user, Article $article)
+    public function canModify($user, Article $article): bool
     {
         if (in_array($user['role'], ['admin', 'author'])) {
             return true;
@@ -71,7 +71,7 @@ public function canModify($user, Article $article)
      * @param \Authorization\IdentityInterface $user
      * @return bool
      */
-    public function canDelete($user, Article $article)
+    public function canDelete($user, Article $article): bool
     {
         if ($user['role'] === 'admin') {
             return true;
@@ -84,7 +84,6 @@ public function canDelete($user, Article $article)
      * Scope method for index
      *
      * @param \Authorization\IdentityInterface $user
-     * @return bool
      */
     public function scopeIndex($user, Article $article): Article
     {