Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update compat patch #324

Merged
merged 1 commit into from
Jan 12, 2025
Merged

Update compat patch #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/expected_report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FILE ERRORS WARNINGS
----------------------------------------------------------------------
tests/input/annotation-name.php 8 0
tests/input/array_indentation.php 10 0
tests/input/arrow-functions-format.php 10 0
tests/input/arrow-functions-format.php 12 0
tests/input/assignment-operators.php 4 0
tests/input/attributes.php 15 0
tests/input/binary_operators.php 9 0
Expand Down Expand Up @@ -54,9 +54,9 @@ tests/input/use-ordering.php 1 0
tests/input/useless-semicolon.php 2 0
tests/input/UselessConditions.php 21 0
----------------------------------------------------------------------
A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
----------------------------------------------------------------------
PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


4 changes: 2 additions & 2 deletions tests/fixed/arrow-functions-format.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
];

$singleLineArrayReturn = Collection::map(
static fn () => [1, 2]
static fn () => [1, 2],
);

$wrongMultiLineArrayReturn = Collection::map(
static fn () => [
1,
2,
]
],
);
86 changes: 55 additions & 31 deletions tests/php72-compatibility.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
index d1e1fad..ea3b611 100644
index a646ff6..84c9474 100644
--- a/tests/expected_report.txt
+++ b/tests/expected_report.txt
@@ -17,26 +17,23 @@
@@ -5,7 +5,7 @@ FILE ERRORS WARNINGS
----------------------------------------------------------------------
tests/input/annotation-name.php 8 0
tests/input/array_indentation.php 10 0
-tests/input/arrow-functions-format.php 12 0
+tests/input/arrow-functions-format.php 10 0
tests/input/assignment-operators.php 4 0
tests/input/attributes.php 15 0
tests/input/binary_operators.php 9 0
@@ -17,26 +17,23 @@ tests/input/constants-var.php 6 0
tests/input/ControlStructures.php 28 0
tests/input/doc-comment-spacing.php 11 0
tests/input/duplicate-assignment-variable.php 1 0
Expand Down Expand Up @@ -37,7 +46,7 @@ index d1e1fad..ea3b611 100644
tests/input/semicolon_spacing.php 3 0
tests/input/single-line-array-spacing.php 5 0
tests/input/spread-operator.php 6 0
@@ -46,17 +43,16 @@
@@ -46,17 +43,16 @@ tests/input/strings.php 3 0
tests/input/superfluous-naming.php 11 0
tests/input/test-case.php 8 0
tests/input/trailing_comma_on_array.php 1 0
Expand All @@ -51,10 +60,10 @@ index d1e1fad..ea3b611 100644
-tests/input/UselessConditions.php 21 0
+tests/input/UselessConditions.php 20 0
----------------------------------------------------------------------
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 415 ERRORS AND 2 WARNINGS WERE FOUND IN 46 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 331 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------

Expand All @@ -63,7 +72,7 @@ diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.p
index f8f7f65..a653086 100644
--- a/tests/fixed/ControlStructures.php
+++ b/tests/fixed/ControlStructures.php
@@ -104,7 +104,7 @@ class ControlStructures
@@ -104,7 +104,7 @@ public function spaceBelowBlocks(): void

try {
echo 4;
Expand All @@ -76,7 +85,7 @@ diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
index fc734db..caf1dbb 100644
--- a/tests/fixed/EarlyReturn.php
+++ b/tests/fixed/EarlyReturn.php
@@ -11,7 +11,7 @@ class EarlyReturn
@@ -11,7 +11,7 @@ public function bar(): bool
return $bar === 'bar';
}

Expand Down Expand Up @@ -117,7 +126,7 @@ diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
index 5493471..57d9f2b 100644
--- a/tests/fixed/NamingCamelCase.php
+++ b/tests/fixed/NamingCamelCase.php
@@ -6,11 +6,14 @@ namespace Example;
@@ -6,11 +6,14 @@

class NamingCamelCase
{
Expand Down Expand Up @@ -155,7 +164,7 @@ diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingComm
index 4248238..f3ffa91 100644
--- a/tests/fixed/TrailingCommaOnFunctions.php
+++ b/tests/fixed/TrailingCommaOnFunctions.php
@@ -15,7 +15,7 @@ class TrailingCommaOnFunctions
@@ -15,7 +15,7 @@ public function a(int $arg): void
}

public function b(
Expand All @@ -164,7 +173,7 @@ index 4248238..f3ffa91 100644
): void {
}

@@ -28,7 +28,7 @@ class TrailingCommaOnFunctions
@@ -28,7 +28,7 @@ public function uses(): void
};

$multiLine = static function (int $arg) use (
Expand All @@ -173,7 +182,7 @@ index 4248238..f3ffa91 100644
): void {
var_dump($var);
};
@@ -37,9 +37,8 @@ class TrailingCommaOnFunctions
@@ -37,9 +37,8 @@ public function uses(): void

$class = new TrailingCommaOnFunctions();

Expand All @@ -188,7 +197,7 @@ diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.p
index 71e0cfb..2151b17 100644
--- a/tests/fixed/UselessConditions.php
+++ b/tests/fixed/UselessConditions.php
@@ -95,7 +95,7 @@ class UselessConditions
@@ -95,7 +95,7 @@ public function necessaryIfConditionWithMethodCall(): bool
return false;
}

Expand All @@ -198,10 +207,10 @@ index 71e0cfb..2151b17 100644
if (! $this->isAdmin) {
return null;
diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-functions-format.php
index 4da39b8..a45074f 100644
index dcb5a3e..a45074f 100644
--- a/tests/fixed/arrow-functions-format.php
+++ b/tests/fixed/arrow-functions-format.php
@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
@@ -18,10 +18,10 @@

$multiLineArrowFunctions = Collection::from([1, 2])
->map(
Expand All @@ -214,6 +223,21 @@ index 4da39b8..a45074f 100644
);

$thisIsNotAnArrowFunction = [$this->fn => 'value'];
@@ -32,12 +32,12 @@
];

$singleLineArrayReturn = Collection::map(
- static fn () => [1, 2],
+ static fn () => [1, 2]
);

$wrongMultiLineArrayReturn = Collection::map(
static fn () => [
1,
2,
- ],
+ ]
);
diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
index 4988dab..2df56a0 100644
--- a/tests/fixed/example-class.php
Expand Down Expand Up @@ -244,7 +268,7 @@ index 4988dab..2df56a0 100644
$this->baxBax = $baxBax;

parent::__construct();
@@ -41,7 +54,7 @@ class Example extends ParentClass implements IteratorAggregate
@@ -41,7 +54,7 @@ public function __construct(private int|null $foo = null, private array $bar = [
/**
* Description
*/
Expand All @@ -257,7 +281,7 @@ diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing
index 36cbae2..d42bbfe 100644
--- a/tests/fixed/namespaces-spacing.php
+++ b/tests/fixed/namespaces-spacing.php
@@ -16,5 +16,5 @@ use const DATE_RFC3339;
@@ -16,5 +16,5 @@
strrev(
(new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
->sub(new DateInterval('P1D'))
Expand All @@ -268,7 +292,7 @@ diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parenth
index 47a06ec..6e81bbe 100644
--- a/tests/fixed/new_with_parentheses.php
+++ b/tests/fixed/new_with_parentheses.php
@@ -24,5 +24,5 @@ $y = [new stdClass()];
@@ -24,5 +24,5 @@

$z = new stdClass() ? new stdClass() : new stdClass();

Expand Down Expand Up @@ -302,7 +326,7 @@ diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_
index 51c361c..8846dd1 100644
--- a/tests/fixed/null_coalesce_operator.php
+++ b/tests/fixed/null_coalesce_operator.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
@@ -4,7 +4,7 @@

$foo = $_GET['foo'] ?? 'foo';

Expand Down Expand Up @@ -373,7 +397,7 @@ diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on
index 0c897ae..8e2c6f7 100644
--- a/tests/fixed/return_type_on_methods.php
+++ b/tests/fixed/return_type_on_methods.php
@@ -31,7 +31,7 @@ class Test
@@ -31,7 +31,7 @@ public function f(
int $c,
int $d,
int $e,
Expand All @@ -382,7 +406,7 @@ index 0c897ae..8e2c6f7 100644
): void {
}

@@ -40,7 +40,7 @@ class Test
@@ -40,7 +40,7 @@ public function g(
int $c,
int $d,
int $e,
Expand All @@ -391,7 +415,7 @@ index 0c897ae..8e2c6f7 100644
): void {
}

@@ -49,7 +49,7 @@ class Test
@@ -49,7 +49,7 @@ public function h(
int $c,
int $d,
int $e,
Expand All @@ -400,7 +424,7 @@ index 0c897ae..8e2c6f7 100644
): void {
}

@@ -58,7 +58,7 @@ class Test
@@ -58,7 +58,7 @@ public function i(
int $c,
int $d,
int $e,
Expand All @@ -409,7 +433,7 @@ index 0c897ae..8e2c6f7 100644
): void {
}

@@ -67,7 +67,7 @@ class Test
@@ -67,7 +67,7 @@ public function j(
int $c,
int $d,
int $e,
Expand All @@ -422,7 +446,7 @@ diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
index 5e26ed8..10e6f34 100644
--- a/tests/fixed/type-hints.php
+++ b/tests/fixed/type-hints.php
@@ -10,7 +10,7 @@ use Traversable;
@@ -10,7 +10,7 @@
class TraversableTypeHints
{
/** @var Traversable */
Expand All @@ -431,7 +455,7 @@ index 5e26ed8..10e6f34 100644

/**
* @param Iterator $iterator
@@ -25,5 +25,6 @@ class TraversableTypeHints
@@ -25,5 +25,6 @@ public function get(Iterator $iterator): Traversable

class UnionTypeHints
{
Expand All @@ -443,7 +467,7 @@ diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.p
index 73944e3..a0e0b2e 100644
--- a/tests/input/ControlStructures.php
+++ b/tests/input/ControlStructures.php
@@ -93,7 +93,7 @@ class ControlStructures
@@ -93,7 +93,7 @@ public function spaceBelowBlocks(): void
}
try {
echo 4;
Expand Down Expand Up @@ -498,7 +522,7 @@ diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingComm
index fc5480e..f3ffa91 100644
--- a/tests/input/TrailingCommaOnFunctions.php
+++ b/tests/input/TrailingCommaOnFunctions.php
@@ -10,7 +10,7 @@ use function var_dump;
@@ -10,7 +10,7 @@

class TrailingCommaOnFunctions
{
Expand All @@ -507,7 +531,7 @@ index fc5480e..f3ffa91 100644
{
}

@@ -23,7 +23,7 @@ class TrailingCommaOnFunctions
@@ -23,7 +23,7 @@ public function uses(): void
{
$var = null;

Expand All @@ -516,7 +540,7 @@ index fc5480e..f3ffa91 100644
var_dump($var);
};

@@ -37,8 +37,7 @@ class TrailingCommaOnFunctions
@@ -37,8 +37,7 @@ public function uses(): void

$class = new TrailingCommaOnFunctions();

Expand All @@ -530,7 +554,7 @@ diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-function
index d3903ff..8a358e8 100644
--- a/tests/input/arrow-functions-format.php
+++ b/tests/input/arrow-functions-format.php
@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
@@ -18,10 +18,10 @@

$multiLineArrowFunctions = Collection::from([1, 2])
->map(
Expand All @@ -547,7 +571,7 @@ diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing
index e7be018..e1ab639 100644
--- a/tests/input/namespaces-spacing.php
+++ b/tests/input/namespaces-spacing.php
@@ -11,5 +11,5 @@ use const DATE_RFC3339;
@@ -11,5 +11,5 @@
strrev(
(new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
->sub(new DateInterval('P1D'))
Expand Down
8 changes: 4 additions & 4 deletions tests/php73-compatibility.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ index d1e1fad..9a78bc1 100644
-tests/input/UselessConditions.php 21 0
+tests/input/UselessConditions.php 20 0
----------------------------------------------------------------------
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 417 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 419 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 333 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 335 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


Expand Down
8 changes: 4 additions & 4 deletions tests/php74-compatibility.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ index d1e1fad..ed67841 100644
-tests/input/UselessConditions.php 21 0
+tests/input/UselessConditions.php 20 0
----------------------------------------------------------------------
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 426 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 428 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 342 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 344 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


Expand Down
8 changes: 4 additions & 4 deletions tests/php80-compatibility.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ index d1e1fad..71022c4 100644
tests/input/useless-semicolon.php 2 0
tests/input/UselessConditions.php 21 0
----------------------------------------------------------------------
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 456 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 458 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 372 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 374 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


Expand Down
Loading