Merge branch '5.x' into 6.x

# Conflicts:
#	composer.json

Author: LordSimal

composer.json

@@ -8,7 +8,7 @@
         "php": "^8.1",
         "cakephp/console": "^5.1.5",
         "nette/utils": "^4.0",
-        "rector/rector": "~2.3.0",
+        "rector/rector": "~2.4.0",
         "symfony/process": "^6.0 || ^7.0",
         "symfony/string": "^6.0 || ^7.0"
     },