From 4a38b259a54ed1d429054c9828e120b247b36749 Mon Sep 17 00:00:00 2001 From: Andrey Maklakov <42170813+andrey-maklakov@users.noreply.github.com> Date: Mon, 26 Jun 2023 11:40:36 +0500 Subject: [PATCH] Config parameters changing for `Blank lines before namespace` (#13) * Config parameters changing for `Blank lines before namespace` * Update cs_rules.php * Update composer.json --------- Co-authored-by: Andrey Maklakov Co-authored-by: Eldario --- CHANGELOG.md | 8 ++++++++ composer.json | 2 +- cs_rules.php | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6540676..57120b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver]. +## Unreleased + +### Changed + +- `single_blank_line_before_namespace` has been replaced with `blank_lines_before_namespace` according base package issue. [#7053] + +[#7053]:https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/pull/7053 + ## v1.4.0 ### Added diff --git a/composer.json b/composer.json index 12ecf12..9c9057f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^8.0", - "friendsofphp/php-cs-fixer": "^v3.16.0" + "friendsofphp/php-cs-fixer": "^v3.18.0" }, "require-dev": { "phpstan/phpstan": "^1.10" diff --git a/cs_rules.php b/cs_rules.php index 5204575..eb781af 100644 --- a/cs_rules.php +++ b/cs_rules.php @@ -86,7 +86,8 @@ 'short_scalar_cast' => true, 'single_line_comment_style' => true, 'single_blank_line_at_eof' => true, - 'single_blank_line_before_namespace' => true, + 'blank_lines_before_namespace' => true, + 'single_blank_line_before_namespace' => false, // deprecated 'single_line_after_imports' => true, 'single_quote' => true, 'space_after_semicolon' => true,