diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e3cc5a05..f4bc33f2 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -32,7 +32,7 @@ jobs: php-version: "${{ matrix.php-version }}" - name: "Cache dependencies installed with composer" - uses: "actions/cache@v2" + uses: "actions/cache@v4" with: path: "~/.composer/cache" key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}" @@ -65,7 +65,7 @@ jobs: php-version: "${{ matrix.php-version }}" - name: "Cache dependencies installed with composer" - uses: "actions/cache@v2" + uses: "actions/cache@v4" with: path: "~/.composer/cache" key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}" @@ -109,7 +109,7 @@ jobs: php-version: "${{ matrix.php-version }}" - name: "Cache dependencies installed with composer" - uses: "actions/cache@v2" + uses: "actions/cache@v4" with: path: "~/.composer/cache" key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}" @@ -148,7 +148,7 @@ jobs: php-version: "${{ matrix.php-version }}" - name: "Cache dependencies installed with composer" - uses: "actions/cache@v2" + uses: "actions/cache@v4" with: path: "~/.composer/cache" key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}" diff --git a/.github/workflows/website-schema.yml b/.github/workflows/website-schema.yml new file mode 100644 index 00000000..e251588e --- /dev/null +++ b/.github/workflows/website-schema.yml @@ -0,0 +1,21 @@ + +name: "Website config validation" + +on: + pull_request: + branches: + - "*.x" + paths: + - ".doctrine-project.json" + - ".github/workflows/website-schema.yml" + push: + branches: + - "*.x" + paths: + - ".doctrine-project.json" + - ".github/workflows/website-schema.yml" + +jobs: + json-validate: + name: "Validate JSON schema" + uses: "doctrine/.github/.github/workflows/website-schema.yml@7.1.0" diff --git a/tests/expected_report.txt b/tests/expected_report.txt index 5cc438a8..00e5bb9b 100644 --- a/tests/expected_report.txt +++ b/tests/expected_report.txt @@ -34,7 +34,7 @@ tests/input/null_coalesce_equal_operator.php 5 0 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/PropertyDeclaration.php 14 0 +tests/input/PropertyDeclaration.php 16 0 tests/input/return_type_on_closures.php 26 0 tests/input/return_type_on_methods.php 22 0 tests/input/semicolon_spacing.php 3 0 @@ -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 466 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES +A TOTAL OF 468 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES ---------------------------------------------------------------------- -PHPCBF CAN FIX 382 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +PHPCBF CAN FIX 384 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ---------------------------------------------------------------------- diff --git a/tests/php74-compatibility.patch b/tests/php74-compatibility.patch index 625e73f6..033494c3 100644 --- a/tests/php74-compatibility.patch +++ b/tests/php74-compatibility.patch @@ -26,7 +26,7 @@ index 087995d..5284a56 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/PropertyDeclaration.php 14 0 +-tests/input/PropertyDeclaration.php 16 0 -tests/input/return_type_on_closures.php 26 0 -tests/input/return_type_on_methods.php 22 0 +tests/input/PropertyDeclaration.php 6 0 @@ -50,10 +50,10 @@ index 087995d..5284a56 100644 -tests/input/UselessConditions.php 21 0 +tests/input/UselessConditions.php 20 0 ---------------------------------------------------------------------- --A TOTAL OF 466 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES +-A TOTAL OF 468 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 382 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +-PHPCBF CAN FIX 384 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +PHPCBF CAN FIX 344 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ---------------------------------------------------------------------- diff --git a/tests/php80-compatibility.patch b/tests/php80-compatibility.patch index ee61ce14..0a033504 100644 --- a/tests/php80-compatibility.patch +++ b/tests/php80-compatibility.patch @@ -14,7 +14,7 @@ index 087995d..f99aa86 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/PropertyDeclaration.php 14 0 +-tests/input/PropertyDeclaration.php 16 0 +tests/input/PropertyDeclaration.php 11 0 tests/input/return_type_on_closures.php 26 0 tests/input/return_type_on_methods.php 22 0 @@ -23,10 +23,10 @@ index 087995d..f99aa86 100644 tests/input/useless-semicolon.php 2 0 tests/input/UselessConditions.php 21 0 ---------------------------------------------------------------------- --A TOTAL OF 466 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES +-A TOTAL OF 468 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 382 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +-PHPCBF CAN FIX 384 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +PHPCBF CAN FIX 374 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ----------------------------------------------------------------------