From 7f4418dea3a8244d5b4e963002dd6e6cf2c6af51 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Thu, 5 Oct 2023 09:04:37 +0200 Subject: [PATCH 1/3] Replace deprecated rules --- composer.json | 2 +- composer.lock | 416 +++++++++++++++++----------------- resources/presets/laravel.php | 16 +- 3 files changed, 222 insertions(+), 212 deletions(-) diff --git a/composer.json b/composer.json index 0b854861..3dea0b2b 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "ext-xml": "*" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.26.1", + "friendsofphp/php-cs-fixer": "^3.34.1", "illuminate/view": "^10.23.1", "laravel-zero/framework": "^10.1.2", "mockery/mockery": "^1.6.6", diff --git a/composer.lock b/composer.lock index cd7d8c4b..ebf3294e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "529f7244d11da9ce4a2b8092f36e04d9", + "content-hash": "2eb2bfe195b7d7ecbc0a9805fd31f1e5", "packages": [], "packages-dev": [ { "name": "brianium/paratest", - "version": "v7.2.7", + "version": "v7.2.8", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "1526eb4fd195f65075456dee394d14742ae0a66c" + "reference": "882b02d197328138686bb06ce7d8cbb98fc0a16c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/1526eb4fd195f65075456dee394d14742ae0a66c", - "reference": "1526eb4fd195f65075456dee394d14742ae0a66c", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/882b02d197328138686bb06ce7d8cbb98fc0a16c", + "reference": "882b02d197328138686bb06ce7d8cbb98fc0a16c", "shasum": "" }, "require": { @@ -88,7 +88,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.2.7" + "source": "https://github.com/paratestphp/paratest/tree/v7.2.8" }, "funding": [ { @@ -100,7 +100,7 @@ "type": "paypal" } ], - "time": "2023-09-14T14:10:09+00:00" + "time": "2023-10-04T13:38:04+00:00" }, { "name": "brick/math", @@ -377,16 +377,16 @@ }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { @@ -418,9 +418,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/inflector", @@ -708,16 +708,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.26.1", + "version": "v3.34.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "d023ba6684055f6ea1da1352d8a02baca0426983" + "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d023ba6684055f6ea1da1352d8a02baca0426983", - "reference": "d023ba6684055f6ea1da1352d8a02baca0426983", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", + "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", "shasum": "" }, "require": { @@ -791,7 +791,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.26.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.34.1" }, "funding": [ { @@ -799,7 +799,7 @@ "type": "github" } ], - "time": "2023-09-08T19:09:07+00:00" + "time": "2023-10-03T23:51:05+00:00" }, { "name": "fruitcake/php-cors", @@ -1067,7 +1067,7 @@ }, { "name": "illuminate/bus", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/bus.git", @@ -1120,16 +1120,16 @@ }, { "name": "illuminate/cache", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/cache.git", - "reference": "61de89deaa24289eb3e0e64cdd42aad412dcb3e7" + "reference": "a31defc834c6ebaddd1dccc6358306562209f481" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/cache/zipball/61de89deaa24289eb3e0e64cdd42aad412dcb3e7", - "reference": "61de89deaa24289eb3e0e64cdd42aad412dcb3e7", + "url": "https://api.github.com/repos/illuminate/cache/zipball/a31defc834c6ebaddd1dccc6358306562209f481", + "reference": "a31defc834c6ebaddd1dccc6358306562209f481", "shasum": "" }, "require": { @@ -1178,20 +1178,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-05T14:23:09+00:00" + "time": "2023-10-02T18:20:22+00:00" }, { "name": "illuminate/collections", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "72c3cc6d44416db499d2ad11b8b27ae22e60a661" + "reference": "133f59956c8002448b07a3ff5f4352f3b3de5614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/72c3cc6d44416db499d2ad11b8b27ae22e60a661", - "reference": "72c3cc6d44416db499d2ad11b8b27ae22e60a661", + "url": "https://api.github.com/repos/illuminate/collections/zipball/133f59956c8002448b07a3ff5f4352f3b3de5614", + "reference": "133f59956c8002448b07a3ff5f4352f3b3de5614", "shasum": "" }, "require": { @@ -1233,11 +1233,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-07T14:13:46+00:00" + "time": "2023-09-19T22:43:12+00:00" }, { "name": "illuminate/conditionable", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -1283,7 +1283,7 @@ }, { "name": "illuminate/config", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/config.git", @@ -1331,16 +1331,16 @@ }, { "name": "illuminate/console", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/console.git", - "reference": "285b5bd13e6a689dfee4f90a84ef00fb60a1ac1d" + "reference": "9026700a83b59c8a21f1a9a52ea52a1af9e517cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/console/zipball/285b5bd13e6a689dfee4f90a84ef00fb60a1ac1d", - "reference": "285b5bd13e6a689dfee4f90a84ef00fb60a1ac1d", + "url": "https://api.github.com/repos/illuminate/console/zipball/9026700a83b59c8a21f1a9a52ea52a1af9e517cc", + "reference": "9026700a83b59c8a21f1a9a52ea52a1af9e517cc", "shasum": "" }, "require": { @@ -1350,7 +1350,7 @@ "illuminate/macroable": "^10.0", "illuminate/support": "^10.0", "illuminate/view": "^10.0", - "laravel/prompts": "^0.1", + "laravel/prompts": "^0.1.9", "nunomaduro/termwind": "^1.13", "php": "^8.1", "symfony/console": "^6.2", @@ -1392,11 +1392,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-08-30T18:44:07+00:00" + "time": "2023-10-02T18:20:22+00:00" }, { "name": "illuminate/container", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", @@ -1447,7 +1447,7 @@ }, { "name": "illuminate/contracts", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -1495,16 +1495,16 @@ }, { "name": "illuminate/database", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/database.git", - "reference": "41511347b8b74ef80b4e01d2b64d2b4a4263658a" + "reference": "f3be980302c06dcc7ed941d4b0079ae849c6c28a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/database/zipball/41511347b8b74ef80b4e01d2b64d2b4a4263658a", - "reference": "41511347b8b74ef80b4e01d2b64d2b4a4263658a", + "url": "https://api.github.com/repos/illuminate/database/zipball/f3be980302c06dcc7ed941d4b0079ae849c6c28a", + "reference": "f3be980302c06dcc7ed941d4b0079ae849c6c28a", "shasum": "" }, "require": { @@ -1560,11 +1560,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-04T14:22:40+00:00" + "time": "2023-10-02T18:33:10+00:00" }, { "name": "illuminate/events", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/events.git", @@ -1619,16 +1619,16 @@ }, { "name": "illuminate/filesystem", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "9a87706486557c2fc4ab5f8df5ef8406a806b3d0" + "reference": "8f355f9e281a4219671be0a82195f49153b1bced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/9a87706486557c2fc4ab5f8df5ef8406a806b3d0", - "reference": "9a87706486557c2fc4ab5f8df5ef8406a806b3d0", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/8f355f9e281a4219671be0a82195f49153b1bced", + "reference": "8f355f9e281a4219671be0a82195f49153b1bced", "shasum": "" }, "require": { @@ -1679,20 +1679,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-05T14:23:09+00:00" + "time": "2023-09-15T22:35:37+00:00" }, { "name": "illuminate/http", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/http.git", - "reference": "599c53ceae177d2aee397c48a309a1686bb2b763" + "reference": "6e265c75e684222e2011d96d9af2010e6f975639" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/http/zipball/599c53ceae177d2aee397c48a309a1686bb2b763", - "reference": "599c53ceae177d2aee397c48a309a1686bb2b763", + "url": "https://api.github.com/repos/illuminate/http/zipball/6e265c75e684222e2011d96d9af2010e6f975639", + "reference": "6e265c75e684222e2011d96d9af2010e6f975639", "shasum": "" }, "require": { @@ -1739,11 +1739,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-11T14:23:25+00:00" + "time": "2023-09-19T15:24:21+00:00" }, { "name": "illuminate/macroable", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -1789,7 +1789,7 @@ }, { "name": "illuminate/pipeline", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/pipeline.git", @@ -1837,16 +1837,16 @@ }, { "name": "illuminate/process", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/process.git", - "reference": "c20789c1138a001df9464686c22724a160cd552c" + "reference": "1d2711140e32eb76a20af28eae506e3e0e9dccef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/process/zipball/c20789c1138a001df9464686c22724a160cd552c", - "reference": "c20789c1138a001df9464686c22724a160cd552c", + "url": "https://api.github.com/repos/illuminate/process/zipball/1d2711140e32eb76a20af28eae506e3e0e9dccef", + "reference": "1d2711140e32eb76a20af28eae506e3e0e9dccef", "shasum": "" }, "require": { @@ -1884,20 +1884,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-06-24T18:02:28+00:00" + "time": "2023-09-25T00:45:27+00:00" }, { "name": "illuminate/session", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/session.git", - "reference": "f39be6b679781d5a7089c76965ed635491b4b5dd" + "reference": "46fa3baeccfa7ab6331d02c764c33f1f9b8134a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/session/zipball/f39be6b679781d5a7089c76965ed635491b4b5dd", - "reference": "f39be6b679781d5a7089c76965ed635491b4b5dd", + "url": "https://api.github.com/repos/illuminate/session/zipball/46fa3baeccfa7ab6331d02c764c33f1f9b8134a4", + "reference": "46fa3baeccfa7ab6331d02c764c33f1f9b8134a4", "shasum": "" }, "require": { @@ -1941,20 +1941,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-05-09T13:08:05+00:00" + "time": "2023-10-02T18:20:22+00:00" }, { "name": "illuminate/support", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "c21d327c2392eccd93748a2c9f1069a283a62d37" + "reference": "c7cf96f64ae6766a85fcd17f46afcae5a6a88744" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/c21d327c2392eccd93748a2c9f1069a283a62d37", - "reference": "c21d327c2392eccd93748a2c9f1069a283a62d37", + "url": "https://api.github.com/repos/illuminate/support/zipball/c7cf96f64ae6766a85fcd17f46afcae5a6a88744", + "reference": "c7cf96f64ae6766a85fcd17f46afcae5a6a88744", "shasum": "" }, "require": { @@ -2012,11 +2012,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-12T18:56:44+00:00" + "time": "2023-09-21T20:37:39+00:00" }, { "name": "illuminate/testing", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/testing.git", @@ -2075,16 +2075,16 @@ }, { "name": "illuminate/view", - "version": "v10.23.1", + "version": "v10.26.2", "source": { "type": "git", "url": "https://github.com/illuminate/view.git", - "reference": "13b117b69e03c82b8f3b30dff86ba8cba9910e2c" + "reference": "7bf80422ba95fdd664e8a827b6f43716ef459f14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/view/zipball/13b117b69e03c82b8f3b30dff86ba8cba9910e2c", - "reference": "13b117b69e03c82b8f3b30dff86ba8cba9910e2c", + "url": "https://api.github.com/repos/illuminate/view/zipball/7bf80422ba95fdd664e8a827b6f43716ef459f14", + "reference": "7bf80422ba95fdd664e8a827b6f43716ef459f14", "shasum": "" }, "require": { @@ -2125,7 +2125,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-08T12:16:07+00:00" + "time": "2023-09-28T13:43:11+00:00" }, { "name": "jean85/pretty-package-versions", @@ -2402,16 +2402,16 @@ }, { "name": "laravel/prompts", - "version": "v0.1.7", + "version": "v0.1.11", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "554e7d855a22e87942753d68e23b327ad79b2070" + "reference": "cce65a90e64712909ea1adc033e1d88de8455ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/554e7d855a22e87942753d68e23b327ad79b2070", - "reference": "554e7d855a22e87942753d68e23b327ad79b2070", + "url": "https://api.github.com/repos/laravel/prompts/zipball/cce65a90e64712909ea1adc033e1d88de8455ffd", + "reference": "cce65a90e64712909ea1adc033e1d88de8455ffd", "shasum": "" }, "require": { @@ -2420,6 +2420,10 @@ "php": "^8.1", "symfony/console": "^6.2" }, + "conflict": { + "illuminate/console": ">=10.17.0 <10.25.0", + "laravel/framework": ">=10.17.0 <10.25.0" + }, "require-dev": { "mockery/mockery": "^1.5", "pestphp/pest": "^2.3", @@ -2430,6 +2434,11 @@ "ext-pcntl": "Required for the spinner to be animated." }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, "autoload": { "files": [ "src/helpers.php" @@ -2444,9 +2453,9 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.7" + "source": "https://github.com/laravel/prompts/tree/v0.1.11" }, - "time": "2023-09-12T11:09:22+00:00" + "time": "2023-10-03T01:07:35+00:00" }, { "name": "league/flysystem", @@ -2800,16 +2809,16 @@ }, { "name": "nesbot/carbon", - "version": "2.70.0", + "version": "2.71.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d" + "reference": "98276233188583f2ff845a0f992a235472d9466a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3298b38ea8612e5f77d38d1a99438e42f70341d", - "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/98276233188583f2ff845a0f992a235472d9466a", + "reference": "98276233188583f2ff845a0f992a235472d9466a", "shasum": "" }, "require": { @@ -2902,7 +2911,7 @@ "type": "tidelift" } ], - "time": "2023-09-07T16:43:50+00:00" + "time": "2023-09-25T11:31:05+00:00" }, { "name": "nikic/php-parser", @@ -2962,37 +2971,37 @@ }, { "name": "nunomaduro/collision", - "version": "v7.8.1", + "version": "v7.9.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "61553ad3260845d7e3e49121b7074619233d361b" + "reference": "296d0cf9fe462837ac0da8a568b56fc026b132da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/61553ad3260845d7e3e49121b7074619233d361b", - "reference": "61553ad3260845d7e3e49121b7074619233d361b", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/296d0cf9fe462837ac0da8a568b56fc026b132da", + "reference": "296d0cf9fe462837ac0da8a568b56fc026b132da", "shasum": "" }, "require": { "filp/whoops": "^2.15.3", "nunomaduro/termwind": "^1.15.1", "php": "^8.1.0", - "symfony/console": "^6.3.2" + "symfony/console": "^6.3.4" }, "require-dev": { - "brianium/paratest": "^7.2.4", - "laravel/framework": "^10.17.1", - "laravel/pint": "^1.10.5", - "laravel/sail": "^1.23.1", - "laravel/sanctum": "^3.2.5", - "laravel/tinker": "^2.8.1", + "brianium/paratest": "^7.2.7", + "laravel/framework": "^10.23.1", + "laravel/pint": "^1.13.1", + "laravel/sail": "^1.25.0", + "laravel/sanctum": "^3.3.1", + "laravel/tinker": "^2.8.2", "nunomaduro/larastan": "^2.6.4", - "orchestra/testbench-core": "^8.5.9", - "pestphp/pest": "^2.12.1", - "phpunit/phpunit": "^10.3.1", + "orchestra/testbench-core": "^8.11.0", + "pestphp/pest": "^2.19.1", + "phpunit/phpunit": "^10.3.5", "sebastian/environment": "^6.0.1", - "spatie/laravel-ignition": "^2.2.0" + "spatie/laravel-ignition": "^2.3.0" }, "type": "library", "extra": { @@ -3051,7 +3060,7 @@ "type": "patreon" } ], - "time": "2023-08-07T08:03:21+00:00" + "time": "2023-09-19T10:45:09+00:00" }, { "name": "nunomaduro/larastan", @@ -3431,29 +3440,30 @@ }, { "name": "pestphp/pest", - "version": "v2.18.2", + "version": "v2.20.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "b53e396aac18ceae8cd5f4bb05dcb10f4a63b87d" + "reference": "a8b785f69e44ae3f902cbf08fe6b79359ba46945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/b53e396aac18ceae8cd5f4bb05dcb10f4a63b87d", - "reference": "b53e396aac18ceae8cd5f4bb05dcb10f4a63b87d", + "url": "https://api.github.com/repos/pestphp/pest/zipball/a8b785f69e44ae3f902cbf08fe6b79359ba46945", + "reference": "a8b785f69e44ae3f902cbf08fe6b79359ba46945", "shasum": "" }, "require": { - "brianium/paratest": "^7.2.6", - "nunomaduro/collision": "^7.8.1", + "brianium/paratest": "^7.2.7", + "nunomaduro/collision": "^7.9.0", "nunomaduro/termwind": "^1.15.1", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.3.3", "php": "^8.1.0", - "phpunit/phpunit": "^10.3.4" + "phpunit/phpunit": "^10.3.5" }, "conflict": { - "phpunit/phpunit": ">10.3.4", + "phpunit/phpunit": ">10.3.5", + "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, "require-dev": { @@ -3517,7 +3527,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.18.2" + "source": "https://github.com/pestphp/pest/tree/v2.20.0" }, "funding": [ { @@ -3529,7 +3539,7 @@ "type": "github" } ], - "time": "2023-09-13T22:14:31+00:00" + "time": "2023-09-29T18:05:52+00:00" }, { "name": "pestphp/pest-plugin", @@ -3946,16 +3956,16 @@ }, { "name": "phpmyadmin/sql-parser", - "version": "5.8.0", + "version": "5.8.2", "source": { "type": "git", "url": "https://github.com/phpmyadmin/sql-parser.git", - "reference": "db1b3069b5dbc220d393d67ff911e0ae76732755" + "reference": "f1720ae19abe6294cb5599594a8a57bc3c8cc287" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/db1b3069b5dbc220d393d67ff911e0ae76732755", - "reference": "db1b3069b5dbc220d393d67ff911e0ae76732755", + "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/f1720ae19abe6294cb5599594a8a57bc3c8cc287", + "reference": "f1720ae19abe6294cb5599594a8a57bc3c8cc287", "shasum": "" }, "require": { @@ -3977,7 +3987,7 @@ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "psalm/plugin-phpunit": "^0.16.1", "vimeo/psalm": "^4.11", - "zumba/json-serializer": "^3.0" + "zumba/json-serializer": "~3.0.2" }, "suggest": { "ext-mbstring": "For best performance", @@ -4029,7 +4039,7 @@ "type": "other" } ], - "time": "2023-06-05T18:19:38+00:00" + "time": "2023-09-19T12:34:29+00:00" }, { "name": "phpoption/phpoption", @@ -4108,16 +4118,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.0", + "version": "1.24.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" + "reference": "bcad8d995980440892759db0c32acae7c8e79442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", + "reference": "bcad8d995980440892759db0c32acae7c8e79442", "shasum": "" }, "require": { @@ -4149,22 +4159,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" }, - "time": "2023-09-07T20:46:32+00:00" + "time": "2023-09-26T12:28:12+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.34", + "version": "1.10.37", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "7f806b6f1403e6914c778140e2ba07c293cb4901" + "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7f806b6f1403e6914c778140e2ba07c293cb4901", - "reference": "7f806b6f1403e6914c778140e2ba07c293cb4901", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/058ba07e92f744d4dcf6061ae75283d0c6456f2e", + "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e", "shasum": "" }, "require": { @@ -4213,20 +4223,20 @@ "type": "tidelift" } ], - "time": "2023-09-13T09:49:47+00:00" + "time": "2023-10-02T16:18:37+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.5", + "version": "10.1.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "1df504e42a88044c27a90136910f0b3fe9e91939" + "reference": "355324ca4980b8916c18b9db29f3ef484078f26e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1df504e42a88044c27a90136910f0b3fe9e91939", - "reference": "1df504e42a88044c27a90136910f0b3fe9e91939", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e", + "reference": "355324ca4980b8916c18b9db29f3ef484078f26e", "shasum": "" }, "require": { @@ -4283,7 +4293,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.5" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.7" }, "funding": [ { @@ -4291,7 +4301,7 @@ "type": "github" } ], - "time": "2023-09-12T14:37:22+00:00" + "time": "2023-10-04T15:34:17+00:00" }, { "name": "phpunit/php-file-iterator", @@ -4538,16 +4548,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.3.4", + "version": "10.3.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b8d59476f19115c9774b3b447f78131781c6c32b" + "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b8d59476f19115c9774b3b447f78131781c6c32b", - "reference": "b8d59476f19115c9774b3b447f78131781c6c32b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/747c3b2038f1139e3dcd9886a3f5a948648b7503", + "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503", "shasum": "" }, "require": { @@ -4571,7 +4581,7 @@ "sebastian/comparator": "^5.0", "sebastian/diff": "^5.0", "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.0", + "sebastian/exporter": "^5.1", "sebastian/global-state": "^6.0.1", "sebastian/object-enumerator": "^5.0", "sebastian/recursion-context": "^5.0", @@ -4619,7 +4629,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.3.4" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.3.5" }, "funding": [ { @@ -4635,7 +4645,7 @@ "type": "tidelift" } ], - "time": "2023-09-12T14:42:28+00:00" + "time": "2023-09-19T05:42:37+00:00" }, { "name": "psr/clock", @@ -5316,16 +5326,16 @@ }, { "name": "sebastian/complexity", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "c70b73893e10757af9c6a48929fa6a333b56a97a" + "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/c70b73893e10757af9c6a48929fa6a333b56a97a", - "reference": "c70b73893e10757af9c6a48929fa6a333b56a97a", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", + "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", "shasum": "" }, "require": { @@ -5338,7 +5348,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.1-dev" } }, "autoload": { @@ -5362,7 +5372,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" }, "funding": [ { @@ -5370,7 +5380,7 @@ "type": "github" } ], - "time": "2023-08-31T09:55:53+00:00" + "time": "2023-09-28T11:50:59+00:00" }, { "name": "sebastian/diff", @@ -5505,16 +5515,16 @@ }, { "name": "sebastian/exporter", - "version": "5.0.1", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480" + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/32ff03d078fed1279c4ec9a407d08c5e9febb480", - "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", "shasum": "" }, "require": { @@ -5528,7 +5538,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -5571,7 +5581,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" }, "funding": [ { @@ -5579,7 +5589,7 @@ "type": "github" } ], - "time": "2023-09-08T04:46:58+00:00" + "time": "2023-09-24T13:22:09+00:00" }, { "name": "sebastian/global-state", @@ -6144,16 +6154,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.3.2", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a" + "reference": "1f69476b64fb47105c06beef757766c376b548c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/85fd65ed295c4078367c784e8a5a6cee30348b7a", - "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/1f69476b64fb47105c06beef757766c376b548c4", + "reference": "1f69476b64fb47105c06beef757766c376b548c4", "shasum": "" }, "require": { @@ -6198,7 +6208,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.3.2" + "source": "https://github.com/symfony/error-handler/tree/v6.3.5" }, "funding": [ { @@ -6214,7 +6224,7 @@ "type": "tidelift" } ], - "time": "2023-07-16T17:05:46+00:00" + "time": "2023-09-12T06:57:20+00:00" }, { "name": "symfony/event-dispatcher", @@ -6437,16 +6447,16 @@ }, { "name": "symfony/finder", - "version": "v6.3.3", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e" + "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e", - "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e", + "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4", + "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4", "shasum": "" }, "require": { @@ -6481,7 +6491,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.3.3" + "source": "https://github.com/symfony/finder/tree/v6.3.5" }, "funding": [ { @@ -6497,20 +6507,20 @@ "type": "tidelift" } ], - "time": "2023-07-31T08:31:44+00:00" + "time": "2023-09-26T12:56:25+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.3.4", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "cac1556fdfdf6719668181974104e6fcfa60e844" + "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cac1556fdfdf6719668181974104e6fcfa60e844", - "reference": "cac1556fdfdf6719668181974104e6fcfa60e844", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b50f5e281d722cb0f4c296f908bacc3e2b721957", + "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957", "shasum": "" }, "require": { @@ -6558,7 +6568,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.4" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.5" }, "funding": [ { @@ -6574,20 +6584,20 @@ "type": "tidelift" } ], - "time": "2023-08-22T08:20:46+00:00" + "time": "2023-09-04T21:33:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.4", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb" + "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb", - "reference": "36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f991a964368bee8d883e8d57ced4fe9fff04dfc", + "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc", "shasum": "" }, "require": { @@ -6671,7 +6681,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.3.4" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.5" }, "funding": [ { @@ -6687,20 +6697,20 @@ "type": "tidelift" } ], - "time": "2023-08-26T13:54:49+00:00" + "time": "2023-09-30T06:37:04+00:00" }, { "name": "symfony/mime", - "version": "v6.3.3", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98" + "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/9a0cbd52baa5ba5a5b1f0cacc59466f194730f98", - "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98", + "url": "https://api.github.com/repos/symfony/mime/zipball/d5179eedf1cb2946dbd760475ebf05c251ef6a6e", + "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e", "shasum": "" }, "require": { @@ -6755,7 +6765,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.3.3" + "source": "https://github.com/symfony/mime/tree/v6.3.5" }, "funding": [ { @@ -6771,7 +6781,7 @@ "type": "tidelift" } ], - "time": "2023-07-31T07:08:24+00:00" + "time": "2023-09-29T06:59:36+00:00" }, { "name": "symfony/options-resolver", @@ -7782,16 +7792,16 @@ }, { "name": "symfony/string", - "version": "v6.3.2", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "53d1a83225002635bca3482fcbf963001313fb68" + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68", - "reference": "53d1a83225002635bca3482fcbf963001313fb68", + "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", "shasum": "" }, "require": { @@ -7848,7 +7858,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.2" + "source": "https://github.com/symfony/string/tree/v6.3.5" }, "funding": [ { @@ -7864,7 +7874,7 @@ "type": "tidelift" } ], - "time": "2023-07-05T08:41:27+00:00" + "time": "2023-09-18T10:38:32+00:00" }, { "name": "symfony/translation", @@ -8041,16 +8051,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.3.4", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2027be14f8ae8eae999ceadebcda5b4909b81d45" + "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2027be14f8ae8eae999ceadebcda5b4909b81d45", - "reference": "2027be14f8ae8eae999ceadebcda5b4909b81d45", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5", + "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5", "shasum": "" }, "require": { @@ -8105,7 +8115,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.4" + "source": "https://github.com/symfony/var-dumper/tree/v6.3.5" }, "funding": [ { @@ -8121,7 +8131,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T14:51:05+00:00" + "time": "2023-09-12T10:11:35+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", @@ -8465,5 +8475,5 @@ "platform-overrides": { "php": "8.1.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/resources/presets/laravel.php b/resources/presets/laravel.php index dfb53f2b..eb736b0f 100644 --- a/resources/presets/laravel.php +++ b/resources/presets/laravel.php @@ -18,11 +18,7 @@ ], 'blank_line_between_import_groups' => true, 'blank_lines_before_namespace' => true, - 'control_structure_braces' => true, - 'control_structure_continuation_position' => [ - 'position' => 'same_line', - ], - 'curly_braces_position' => [ + 'braces_position' => [ 'control_structures_opening_brace' => 'same_line', 'functions_opening_brace' => 'next_line_unless_newline_at_signature_end', 'anonymous_functions_opening_brace' => 'same_line', @@ -31,6 +27,10 @@ 'allow_single_line_empty_anonymous_classes' => false, 'allow_single_line_anonymous_functions' => false, ], + 'control_structure_braces' => true, + 'control_structure_continuation_position' => [ + 'position' => 'same_line', + ], 'cast_spaces' => true, 'class_attributes_separation' => [ 'elements' => [ @@ -46,7 +46,7 @@ 'single_line' => true, ], 'clean_namespace' => true, - 'compact_nullable_typehint' => true, + 'compact_nullable_type_declaration' => true, 'concat_space' => [ 'spacing' => 'none', ], @@ -81,7 +81,7 @@ 'strategy' => 'no_multi_line', ], 'native_function_casing' => true, - 'native_function_type_declaration_casing' => true, + 'native_type_declaration_casing' => true, 'no_alias_functions' => true, 'no_alias_language_construct_call' => true, 'no_alternative_syntax' => true, @@ -122,7 +122,7 @@ 'no_unneeded_control_parentheses' => [ 'statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield'], ], - 'no_unneeded_curly_braces' => true, + 'no_unneeded_braces' => true, 'no_unreachable_default_argument_value' => true, 'no_unset_cast' => true, 'no_unused_imports' => true, From 6d584d659ed0bc76ffe1403777a51270c2239c9f Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Thu, 5 Oct 2023 09:09:44 +0200 Subject: [PATCH 2/3] Fix Tests --- tests/Feature/SummaryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/SummaryTest.php b/tests/Feature/SummaryTest.php index 79f75023..de61aa0b 100755 --- a/tests/Feature/SummaryTest.php +++ b/tests/Feature/SummaryTest.php @@ -12,7 +12,7 @@ ->toContain('1 file, 1 style issue') ->toContain(sprintf('тип %s', implode(DIRECTORY_SEPARATOR, [ 'tests', 'Fixtures', 'with-fixable-issues', 'file.php', - ])))->toContain('new_with_braces'); + ])))->toContain('new_with_parentheses'); }); it('may fail with errors', function () { From cde98394f278cc907cb6c9b017fb4090f86365e1 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Thu, 5 Oct 2023 10:07:12 +0200 Subject: [PATCH 3/3] Sort rules alphabetically --- resources/presets/laravel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/presets/laravel.php b/resources/presets/laravel.php index eb736b0f..82ce1de2 100644 --- a/resources/presets/laravel.php +++ b/resources/presets/laravel.php @@ -27,10 +27,6 @@ 'allow_single_line_empty_anonymous_classes' => false, 'allow_single_line_anonymous_functions' => false, ], - 'control_structure_braces' => true, - 'control_structure_continuation_position' => [ - 'position' => 'same_line', - ], 'cast_spaces' => true, 'class_attributes_separation' => [ 'elements' => [ @@ -51,6 +47,10 @@ 'spacing' => 'none', ], 'constant_case' => ['case' => 'lower'], + 'control_structure_braces' => true, + 'control_structure_continuation_position' => [ + 'position' => 'same_line', + ], 'declare_equal_normalize' => true, 'declare_parentheses' => true, 'elseif' => true,