Skip to content

Commit 5b3d705

Browse files
greg0iregreg0ire
committed
Merge remote-tracking branch 'origin/12.0.x' into 13.0.x
2 parents 3cc2cef + 74f8512 commit 5b3d705

File tree

5 files changed

+34
-13
lines changed

5 files changed

+34
-13
lines changed

‎.github/workflows/continuous-integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
php-version: "${{ matrix.php-version }}"
3333

3434
- name: "Cache dependencies installed with composer"
35-
uses: "actions/cache@v2"
35+
uses: "actions/cache@v4"
3636
with:
3737
path: "~/.composer/cache"
3838
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
@@ -65,7 +65,7 @@ jobs:
6565
php-version: "${{ matrix.php-version }}"
6666

6767
- name: "Cache dependencies installed with composer"
68-
uses: "actions/cache@v2"
68+
uses: "actions/cache@v4"
6969
with:
7070
path: "~/.composer/cache"
7171
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"
@@ -109,7 +109,7 @@ jobs:
109109
php-version: "${{ matrix.php-version }}"
110110

111111
- name: "Cache dependencies installed with composer"
112-
uses: "actions/cache@v2"
112+
uses: "actions/cache@v4"
113113
with:
114114
path: "~/.composer/cache"
115115
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
@@ -148,7 +148,7 @@ jobs:
148148
php-version: "${{ matrix.php-version }}"
149149

150150
- name: "Cache dependencies installed with composer"
151-
uses: "actions/cache@v2"
151+
uses: "actions/cache@v4"
152152
with:
153153
path: "~/.composer/cache"
154154
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"

‎.github/workflows/website-schema.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
name: "Website config validation"
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- "*.x"
8+
paths:
9+
- ".doctrine-project.json"
10+
- ".github/workflows/website-schema.yml"
11+
push:
12+
branches:
13+
- "*.x"
14+
paths:
15+
- ".doctrine-project.json"
16+
- ".github/workflows/website-schema.yml"
17+
18+
jobs:
19+
json-validate:
20+
name: "Validate JSON schema"
21+
uses: "doctrine/.github/.github/workflows/[email protected]"

‎tests/expected_report.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tests/input/null_coalesce_equal_operator.php 5 0
3434
tests/input/null_coalesce_operator.php 3 0
3535
tests/input/null_safe_operator.php 1 0
3636
tests/input/optimized-functions.php 1 0
37-
tests/input/PropertyDeclaration.php 14 0
37+
tests/input/PropertyDeclaration.php 16 0
3838
tests/input/return_type_on_closures.php 26 0
3939
tests/input/return_type_on_methods.php 22 0
4040
tests/input/semicolon_spacing.php 3 0
@@ -54,9 +54,9 @@ tests/input/use-ordering.php 1 0
5454
tests/input/useless-semicolon.php 2 0
5555
tests/input/UselessConditions.php 21 0
5656
----------------------------------------------------------------------
57-
A TOTAL OF 466 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
57+
A TOTAL OF 468 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
5858
----------------------------------------------------------------------
59-
PHPCBF CAN FIX 382 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
59+
PHPCBF CAN FIX 384 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
6060
----------------------------------------------------------------------
6161

6262

‎tests/php74-compatibility.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ index 087995d..5284a56 100644
2626
tests/input/null_coalesce_operator.php 3 0
2727
-tests/input/null_safe_operator.php 1 0
2828
tests/input/optimized-functions.php 1 0
29-
-tests/input/PropertyDeclaration.php 14 0
29+
-tests/input/PropertyDeclaration.php 16 0
3030
-tests/input/return_type_on_closures.php 26 0
3131
-tests/input/return_type_on_methods.php 22 0
3232
+tests/input/PropertyDeclaration.php 6 0
@@ -50,10 +50,10 @@ index 087995d..5284a56 100644
5050
-tests/input/UselessConditions.php 21 0
5151
+tests/input/UselessConditions.php 20 0
5252
----------------------------------------------------------------------
53-
-A TOTAL OF 466 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
53+
-A TOTAL OF 468 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
5454
+A TOTAL OF 428 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
5555
----------------------------------------------------------------------
56-
-PHPCBF CAN FIX 382 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
56+
-PHPCBF CAN FIX 384 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5757
+PHPCBF CAN FIX 344 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5858
----------------------------------------------------------------------
5959

‎tests/php80-compatibility.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ index 087995d..f99aa86 100644
1414
tests/input/null_coalesce_operator.php 3 0
1515
tests/input/null_safe_operator.php 1 0
1616
tests/input/optimized-functions.php 1 0
17-
-tests/input/PropertyDeclaration.php 14 0
17+
-tests/input/PropertyDeclaration.php 16 0
1818
+tests/input/PropertyDeclaration.php 11 0
1919
tests/input/return_type_on_closures.php 26 0
2020
tests/input/return_type_on_methods.php 22 0
@@ -23,10 +23,10 @@ index 087995d..f99aa86 100644
2323
tests/input/useless-semicolon.php 2 0
2424
tests/input/UselessConditions.php 21 0
2525
----------------------------------------------------------------------
26-
-A TOTAL OF 466 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
26+
-A TOTAL OF 468 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
2727
+A TOTAL OF 458 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
2828
----------------------------------------------------------------------
29-
-PHPCBF CAN FIX 382 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
29+
-PHPCBF CAN FIX 384 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
3030
+PHPCBF CAN FIX 374 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
3131
----------------------------------------------------------------------
3232

0 commit comments

Comments
 (0)