From b05c41128a0af4aeb87c39175651064eea9edb3c Mon Sep 17 00:00:00 2001 From: Simon Podlipsky Date: Sat, 18 Jun 2022 09:11:28 +0300 Subject: [PATCH] chore(deps): require slevomat/coding-standard v8 and squizlabs/php_codesniffer v3.7 - Bump min php to 7.2 --- .github/workflows/continuous-integration.yml | 2 -- composer.json | 6 +++--- lib/Doctrine/ruleset.xml | 3 ++- tests/expected_report.txt | 2 +- ...{PropertyTypeHintSpacing.php => PropertyDeclaration.php} | 2 +- ...{PropertyTypeHintSpacing.php => PropertyDeclaration.php} | 2 +- tests/php74-compatibility.patch | 2 +- tests/php80-compatibility.patch | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) rename tests/fixed/{PropertyTypeHintSpacing.php => PropertyDeclaration.php} (85%) rename tests/input/{PropertyTypeHintSpacing.php => PropertyDeclaration.php} (86%) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 16e50260..a3035eb6 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -90,7 +90,6 @@ jobs: strategy: matrix: php-version: - - "7.1" - "7.2" - "7.3" - "7.4" @@ -126,7 +125,6 @@ jobs: strategy: matrix: php-version: - - "7.1" - "7.4" - "8.0" diff --git a/composer.json b/composer.json index 56f6640a..fba38976 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ {"name": "Steve Müller", "email": "st.mueller@dzh-online.de"} ], "require": { - "php": "^7.1 || ^8.0", + "php": "^7.2 || ^8.0", "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", - "slevomat/coding-standard": "^7.0.0", - "squizlabs/php_codesniffer": "^3.6.0" + "slevomat/coding-standard": "^8", + "squizlabs/php_codesniffer": "^3.7" }, "config": { "sort-packages": true diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml index d841c154..f3bc93b4 100644 --- a/lib/Doctrine/ruleset.xml +++ b/lib/Doctrine/ruleset.xml @@ -133,6 +133,8 @@ + + @@ -408,7 +410,6 @@ - diff --git a/tests/expected_report.txt b/tests/expected_report.txt index c6449260..476a58b9 100644 --- a/tests/expected_report.txt +++ b/tests/expected_report.txt @@ -28,7 +28,7 @@ tests/input/not_spacing.php 8 0 tests/input/null_coalesce_equal_operator.php 1 0 tests/input/null_coalesce_operator.php 3 0 tests/input/optimized-functions.php 1 0 -tests/input/PropertyTypeHintSpacing.php 6 0 +tests/input/PropertyDeclaration.php 6 0 tests/input/return_type_on_closures.php 21 0 tests/input/return_type_on_methods.php 17 0 tests/input/semicolon_spacing.php 3 0 diff --git a/tests/fixed/PropertyTypeHintSpacing.php b/tests/fixed/PropertyDeclaration.php similarity index 85% rename from tests/fixed/PropertyTypeHintSpacing.php rename to tests/fixed/PropertyDeclaration.php index 14219130..5c3f27b7 100644 --- a/tests/fixed/PropertyTypeHintSpacing.php +++ b/tests/fixed/PropertyDeclaration.php @@ -4,7 +4,7 @@ namespace Spacing; -final class PropertyTypeHintSpacing +final class PropertyDeclaration { public bool $boolPropertyWithDefaultValue = false; public string $stringProperty; diff --git a/tests/input/PropertyTypeHintSpacing.php b/tests/input/PropertyDeclaration.php similarity index 86% rename from tests/input/PropertyTypeHintSpacing.php rename to tests/input/PropertyDeclaration.php index 40475e96..0891e125 100644 --- a/tests/input/PropertyTypeHintSpacing.php +++ b/tests/input/PropertyDeclaration.php @@ -4,7 +4,7 @@ namespace Spacing; -final class PropertyTypeHintSpacing +final class PropertyDeclaration { public bool $boolPropertyWithDefaultValue = false; public string $stringProperty; diff --git a/tests/php74-compatibility.patch b/tests/php74-compatibility.patch index 1301ea75..f9ca8be0 100644 --- a/tests/php74-compatibility.patch +++ b/tests/php74-compatibility.patch @@ -22,7 +22,7 @@ index fd5432c..233e24d 100644 +tests/input/null_coalesce_equal_operator.php 5 0 tests/input/null_coalesce_operator.php 3 0 tests/input/optimized-functions.php 1 0 - tests/input/PropertyTypeHintSpacing.php 6 0 + tests/input/PropertyDeclaration.php 6 0 @@ -39,15 +39,15 @@ tests/input/superfluous-naming.php 11 0 tests/input/test-case.php 8 0 tests/input/trailing_comma_on_array.php 1 0 diff --git a/tests/php80-compatibility.patch b/tests/php80-compatibility.patch index 7cceac94..9bfdfa1d 100644 --- a/tests/php80-compatibility.patch +++ b/tests/php80-compatibility.patch @@ -24,7 +24,7 @@ index c644926..d0f0a44 100644 tests/input/null_coalesce_operator.php 3 0 +tests/input/null_safe_operator.php 1 0 tests/input/optimized-functions.php 1 0 - tests/input/PropertyTypeHintSpacing.php 6 0 + tests/input/PropertyDeclaration.php 6 0 tests/input/return_type_on_closures.php 21 0 @@ -39,15 +40,15 @@ tests/input/superfluous-naming.php 11 0 tests/input/test-case.php 8 0