From 5740d3a0a9e0140cd1e05233e487ddbd100d29d7 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Sat, 20 Jun 2020 22:53:17 +0300 Subject: [PATCH 1/4] disallow multiple structures per file --- lib/Doctrine/ruleset.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml index c0bf70bd..7c09d6fd 100644 --- a/lib/Doctrine/ruleset.xml +++ b/lib/Doctrine/ruleset.xml @@ -42,6 +42,8 @@ + + From 7385a35e831a5688c207c5fa5cc61ae732ced343 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Sun, 21 Jun 2020 23:18:19 +0300 Subject: [PATCH 2/4] Try to make the patch apply --- tests/expected_report.txt | 4 ++-- tests/php-compatibility.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/expected_report.txt b/tests/expected_report.txt index fd6c01c0..5c22241a 100644 --- a/tests/expected_report.txt +++ b/tests/expected_report.txt @@ -31,10 +31,10 @@ tests/input/return_type_on_methods.php 17 0 tests/input/semicolon_spacing.php 3 0 tests/input/spread-operator.php 6 0 tests/input/static-closures.php 1 0 -tests/input/superfluous-naming.php 11 0 +tests/input/superfluous-naming.php 14 0 tests/input/test-case.php 8 0 tests/input/trailing_comma_on_array.php 1 0 -tests/input/traits-uses.php 11 0 +tests/input/traits-uses.php 12 0 tests/input/type-hints.php 4 0 tests/input/UnusedVariables.php 1 0 tests/input/use-ordering.php 1 0 diff --git a/tests/php-compatibility.patch b/tests/php-compatibility.patch index 68009098..21b303e6 100644 --- a/tests/php-compatibility.patch +++ b/tests/php-compatibility.patch @@ -21,7 +21,7 @@ index 1e809f9..490fcbd 100644 -tests/input/example-class.php 34 0 -tests/input/forbidden-comments.php 8 0 +tests/input/example-class.php 39 0 -+tests/input/forbidden-comments.php 14 0 ++tests/input/forbidden-comments.php 16 0 tests/input/forbidden-functions.php 6 0 tests/input/inline_type_hint_assertions.php 7 0 tests/input/LowCaseTypes.php 2 0 @@ -54,7 +54,7 @@ index 1e809f9..490fcbd 100644 tests/input/UselessConditions.php 20 0 ---------------------------------------------------------------------- -A TOTAL OF 310 ERRORS AND 0 WARNINGS WERE FOUND IN 37 FILES -+A TOTAL OF 384 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES ++A TOTAL OF 391 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES ---------------------------------------------------------------------- -PHPCBF CAN FIX 249 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +PHPCBF CAN FIX 319 OF THESE SNIFF VIOLATIONS AUTOMATICALLY From 7022b4a5499f8c6eaeb232b0d5ef5580ece349eb Mon Sep 17 00:00:00 2001 From: Mponos George Date: Sun, 21 Jun 2020 23:23:33 +0300 Subject: [PATCH 3/4] Try to make the patch apply --- tests/php-compatibility.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/php-compatibility.patch b/tests/php-compatibility.patch index 21b303e6..997458da 100644 --- a/tests/php-compatibility.patch +++ b/tests/php-compatibility.patch @@ -42,10 +42,10 @@ index 1e809f9..490fcbd 100644 +tests/input/single-line-array-spacing.php 5 0 tests/input/spread-operator.php 6 0 tests/input/static-closures.php 1 0 - tests/input/superfluous-naming.php 11 0 + tests/input/superfluous-naming.php 14 0 tests/input/test-case.php 8 0 tests/input/trailing_comma_on_array.php 1 0 - tests/input/traits-uses.php 11 0 + tests/input/traits-uses.php 12 0 -tests/input/type-hints.php 4 0 +tests/input/type-hints.php 5 0 tests/input/UnusedVariables.php 1 0 From 50143a3d0ffe0968970acec6ad89d52ef57c474f Mon Sep 17 00:00:00 2001 From: Mponos George Date: Sun, 21 Jun 2020 23:25:33 +0300 Subject: [PATCH 4/4] Attempt to fix the tests --- tests/expected_report.txt | 2 +- tests/php-compatibility.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/expected_report.txt b/tests/expected_report.txt index 5c22241a..c7c05201 100644 --- a/tests/expected_report.txt +++ b/tests/expected_report.txt @@ -6,7 +6,7 @@ FILE ERRORS WARNINGS tests/input/array_indentation.php 10 0 tests/input/arrow-functions-format.php 10 0 tests/input/assignment-operators.php 4 0 -tests/input/class-references.php 10 0 +tests/input/class-references.php 11 0 tests/input/concatenation_spacing.php 24 0 tests/input/constants-no-lsb.php 2 0 tests/input/constants-var.php 6 0 diff --git a/tests/php-compatibility.patch b/tests/php-compatibility.patch index 997458da..12b6c185 100644 --- a/tests/php-compatibility.patch +++ b/tests/php-compatibility.patch @@ -8,7 +8,7 @@ index 1e809f9..490fcbd 100644 tests/input/arrow-functions-format.php 10 0 tests/input/assignment-operators.php 4 0 +tests/input/binary_operators.php 9 0 - tests/input/class-references.php 10 0 + tests/input/class-references.php 11 0 -tests/input/concatenation_spacing.php 24 0 +tests/input/concatenation_spacing.php 49 0 tests/input/constants-no-lsb.php 2 0