diff --git a/composer.json b/composer.json index 9812210a9d..85c0b42f69 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "ext-mbstring": "*" }, "require-dev": { - "friendsofphp/php-cs-fixer": "v3.25.0", + "friendsofphp/php-cs-fixer": "v3.34.0", "friendsofredaxo/linter": "1.4.0", "jetbrains/phpstorm-attributes": "^1.0", "phpstan/extension-installer": "1.3.1", @@ -22,8 +22,8 @@ "phpunit/phpunit": "^10.0.7", "psalm/plugin-phpunit": "0.18.4", "psalm/plugin-symfony": "v5.0.3", - "rector/rector": "0.18.1", - "redaxo/php-cs-fixer-config": "2.2.0", + "rector/rector": "0.18.4", + "redaxo/php-cs-fixer-config": "2.3.0", "redaxo/psalm-plugin": "2.0.0", "vimeo/psalm": "5.15.0" }, diff --git a/redaxo/src/addons/media_manager/lib/not_found_exception.php b/redaxo/src/addons/media_manager/lib/not_found_exception.php index f20d42049d..f017eeb6fc 100644 --- a/redaxo/src/addons/media_manager/lib/not_found_exception.php +++ b/redaxo/src/addons/media_manager/lib/not_found_exception.php @@ -3,6 +3,4 @@ /** * @package redaxo\media-manager */ -class rex_media_manager_not_found_exception extends rex_exception -{ -} +class rex_media_manager_not_found_exception extends rex_exception {} diff --git a/redaxo/src/addons/metainfo/lib/handler/clang_handler.php b/redaxo/src/addons/metainfo/lib/handler/clang_handler.php index 1f5f6b955e..b0c4723cc0 100644 --- a/redaxo/src/addons/metainfo/lib/handler/clang_handler.php +++ b/redaxo/src/addons/metainfo/lib/handler/clang_handler.php @@ -54,9 +54,7 @@ public function handleSave(array $params, rex_sql $sqlFields) /** * @return void */ - protected function buildFilterCondition(array $params) - { - } + protected function buildFilterCondition(array $params) {} public function renderFormItem($field, $tag, $tagAttr, $id, $label, $labelIt, $inputType) { diff --git a/redaxo/src/addons/structure/tests/navigation_test.php b/redaxo/src/addons/structure/tests/navigation_test.php index a3147b252a..f987a6fb47 100644 --- a/redaxo/src/addons/structure/tests/navigation_test.php +++ b/redaxo/src/addons/structure/tests/navigation_test.php @@ -27,7 +27,6 @@ public function testFactory(): void public function testConstructAnonymousClass(): void { // no exception - new class() extends rex_navigation { - }; + new class() extends rex_navigation {}; } } diff --git a/redaxo/src/core/lib/api_function.php b/redaxo/src/core/lib/api_function.php index 711680da80..8187f5b684 100644 --- a/redaxo/src/core/lib/api_function.php +++ b/redaxo/src/core/lib/api_function.php @@ -397,6 +397,4 @@ public static function fromJSON($json) * * @package redaxo\core */ -class rex_api_exception extends rex_exception -{ -} +class rex_api_exception extends rex_exception {} diff --git a/redaxo/src/core/lib/console/command_only_setup_packages.php b/redaxo/src/core/lib/console/command_only_setup_packages.php index 8121070eb5..9f57018dda 100644 --- a/redaxo/src/core/lib/console/command_only_setup_packages.php +++ b/redaxo/src/core/lib/console/command_only_setup_packages.php @@ -9,6 +9,4 @@ * * @internal Only usable in rex core commands */ -interface rex_command_only_setup_packages -{ -} +interface rex_command_only_setup_packages {} diff --git a/redaxo/src/core/lib/console/command_standalone.php b/redaxo/src/core/lib/console/command_standalone.php index 14c34510ad..5781d6f33e 100644 --- a/redaxo/src/core/lib/console/command_standalone.php +++ b/redaxo/src/core/lib/console/command_standalone.php @@ -7,6 +7,4 @@ * * @internal Only usable in rex core commands */ -interface rex_command_standalone -{ -} +interface rex_command_standalone {} diff --git a/redaxo/src/core/lib/exception.php b/redaxo/src/core/lib/exception.php index 50e07a5ddb..dd617525ad 100644 --- a/redaxo/src/core/lib/exception.php +++ b/redaxo/src/core/lib/exception.php @@ -56,18 +56,14 @@ public function getErrorCode(): ?int * * @package redaxo\core */ -class rex_sql_could_not_connect_exception extends rex_sql_exception -{ -} +class rex_sql_could_not_connect_exception extends rex_sql_exception {} /** * Exception class for user-friendly error messages. * * @package redaxo\core */ -class rex_functional_exception extends rex_exception -{ -} +class rex_functional_exception extends rex_exception {} /** * Exception class for http-status code handling. @@ -102,6 +98,4 @@ public function getHttpCode() * * @package redaxo\core */ -class rex_yaml_parse_exception extends rex_exception -{ -} +class rex_yaml_parse_exception extends rex_exception {} diff --git a/redaxo/src/core/lib/packages/null.php b/redaxo/src/core/lib/packages/null.php index 7f3af1036f..7acd2212b1 100644 --- a/redaxo/src/core/lib/packages/null.php +++ b/redaxo/src/core/lib/packages/null.php @@ -79,9 +79,7 @@ public function removeConfig($key) return false; } - public function setProperty($key, $value) - { - } + public function setProperty($key, $value) {} public function getProperty($key, $default = null) { @@ -93,9 +91,7 @@ public function hasProperty($key) return false; } - public function removeProperty($key) - { - } + public function removeProperty($key) {} public function isAvailable() { diff --git a/redaxo/src/core/lib/packages/plugins/interface.php b/redaxo/src/core/lib/packages/plugins/interface.php index 6e02a2ead0..adf92796bd 100644 --- a/redaxo/src/core/lib/packages/plugins/interface.php +++ b/redaxo/src/core/lib/packages/plugins/interface.php @@ -7,6 +7,4 @@ * * @package redaxo\core\packages */ -interface rex_plugin_interface extends rex_package_interface -{ -} +interface rex_plugin_interface extends rex_package_interface {} diff --git a/redaxo/src/core/lib/util/socket/socket.php b/redaxo/src/core/lib/util/socket/socket.php index 4e6ffc77c2..16217cc9a9 100644 --- a/redaxo/src/core/lib/util/socket/socket.php +++ b/redaxo/src/core/lib/util/socket/socket.php @@ -485,6 +485,4 @@ protected static function parseUrl($url) * * @package redaxo\core */ -class rex_socket_exception extends rex_exception -{ -} +class rex_socket_exception extends rex_exception {} diff --git a/redaxo/src/core/tests/base/instance_pool_trait_test.php b/redaxo/src/core/tests/base/instance_pool_trait_test.php index 1bf4519d2c..0b849df1bd 100644 --- a/redaxo/src/core/tests/base/instance_pool_trait_test.php +++ b/redaxo/src/core/tests/base/instance_pool_trait_test.php @@ -15,13 +15,9 @@ class rex_test_instance_pool_base public function __construct() {} } -final class rex_test_instance_pool_1 extends rex_test_instance_pool_base -{ -} +final class rex_test_instance_pool_1 extends rex_test_instance_pool_base {} -final class rex_test_instance_pool_2 extends rex_test_instance_pool_base -{ -} +final class rex_test_instance_pool_2 extends rex_test_instance_pool_base {} /** * @internal diff --git a/redaxo/src/core/tests/extension_test.php b/redaxo/src/core/tests/extension_test.php index 0d44e91fc0..bf10b1f164 100644 --- a/redaxo/src/core/tests/extension_test.php +++ b/redaxo/src/core/tests/extension_test.php @@ -23,8 +23,7 @@ public function testIsRegistered(): void static::assertFalse(rex_extension::isRegistered($EP), 'isRegistered() returns false for non-registered extension points'); - rex_extension::register($EP, static function () { - }); + rex_extension::register($EP, static function () {}); static::assertTrue(rex_extension::isRegistered($EP), 'isRegistered() returns true for registered extension points'); } @@ -39,8 +38,7 @@ public function testRegisterPoint(): void return $ep->getSubject() . ' test2'; }); - rex_extension::register($EP, static function () { - }); + rex_extension::register($EP, static function () {}); rex_extension::register($EP, static function (rex_extension_point $ep) { return $ep->getSubject() . ' test3';