Merge branch '5.x' into 6.x

# Conflicts:
#	composer.json
#	tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/config/configured_rule.php

Author: LordSimal

composer.json

@@ -5,7 +5,7 @@
     "homepage": "https://cakephp.org",
     "license": "MIT",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "cakephp/console": "^5.1.5",
         "nette/utils": "^4.0",
         "rector/rector": "~2.4.0",

tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/Fixture/fixture.php.inc

@@ -1,10 +1,10 @@
 <?php
 
-namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRectorTest\Fixture;
+namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveMethodCallArgsRector\Fixture;
 
-use Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRector\Source\SomeModelType;
+use Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveMethodCallArgsRector\Source\SomeModelType;
 
-function addMethodCallArgs()
+function removeMethodCallArgs()
 {
     $object = new SomeModelType();
     $object->getAttribute('paging');
@@ -15,11 +15,11 @@ function addMethodCallArgs()
 -----
 <?php
 
-namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRectorTest\Fixture;
+namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveMethodCallArgsRector\Fixture;
 
-use Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRector\Source\SomeModelType;
+use Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveMethodCallArgsRector\Source\SomeModelType;
 
-function addMethodCallArgs()
+function removeMethodCallArgs()
 {
     $object = new SomeModelType();
     $object->setAttribute('paging', []);

tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/Source/SomeModelType.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRector\Source;
+namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveMethodCallArgsRector\Source;
 
 final class SomeModelType
 {

tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/config/configured_rule.php

@@ -3,7 +3,7 @@
 
 use Cake\Upgrade\Rector\Cake5\RemoveMethodCall\RemoveMethodCall;
 use Cake\Upgrade\Rector\Cake5\RemoveMethodCall\RemoveMethodCallRector;
-use Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRector\Source\SomeModelType;
+use Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveMethodCallArgsRector\Source\SomeModelType;
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {