Skip to content

Commit 2e5cd3e

Browse files
authored
Merge pull request #348 from doctrine/13.0.x
Merge 13.0.x up into 14.0.x
2 parents 0781565 + 6905772 commit 2e5cd3e

File tree

6 files changed

+9
-44
lines changed

6 files changed

+9
-44
lines changed

.github/workflows/ci-dockerfile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
runs-on: "ubuntu-22.04"
2323

2424
steps:
25-
- uses: "actions/checkout@v4"
25+
- uses: "actions/checkout@v5"
2626

2727
- name: "Lint Dockerfile"
28-
uses: "hadolint/hadolint-action@v3.1.0"
28+
uses: "hadolint/hadolint-action@v3.2.0"
2929
with:
3030
dockerfile: ".docker/validate-against-schema/Dockerfile"

.github/workflows/ci-shell-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: "Checkout"
27-
uses: "actions/checkout@v4"
27+
uses: "actions/checkout@v5"
2828

2929
- name: "Lint shell scripts with ShellCheck"
3030
uses: "ludeeus/[email protected]"

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,6 @@ on:
1111
- cron: "0 17 * * *"
1212

1313
jobs:
14-
coding-standards:
15-
name: "Coding Standards"
16-
17-
runs-on: "ubuntu-22.04"
18-
19-
strategy:
20-
matrix:
21-
php-version:
22-
- "7.4"
23-
24-
steps:
25-
- name: "Checkout"
26-
uses: "actions/checkout@v4"
27-
28-
- name: "Install PHP"
29-
uses: "shivammathur/setup-php@v2"
30-
with:
31-
coverage: "none"
32-
php-version: "${{ matrix.php-version }}"
33-
34-
- name: "Cache dependencies installed with composer"
35-
uses: "actions/cache@v4"
36-
with:
37-
path: "~/.composer/cache"
38-
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
39-
restore-keys: "php-${{ matrix.php-version }}-composer-"
40-
41-
- name: "Install dependencies with composer"
42-
run: "composer update --no-interaction --no-progress --no-suggest"
43-
44-
- name: "Run squizlabs/php_codesniffer"
45-
run: "vendor/bin/phpcs"
46-
4714
validate-against-schema:
4815
name: "Validate against schema"
4916

@@ -56,7 +23,7 @@ jobs:
5623

5724
steps:
5825
- name: "Checkout"
59-
uses: "actions/checkout@v4"
26+
uses: "actions/checkout@v5"
6027

6128
- name: "Install PHP"
6229
uses: "shivammathur/setup-php@v2"
@@ -100,7 +67,7 @@ jobs:
10067

10168
steps:
10269
- name: "Checkout"
103-
uses: "actions/checkout@v4"
70+
uses: "actions/checkout@v5"
10471

10572
- name: "Install PHP"
10673
uses: "shivammathur/setup-php@v2"
@@ -139,7 +106,7 @@ jobs:
139106

140107
steps:
141108
- name: "Checkout"
142-
uses: "actions/checkout@v4"
109+
uses: "actions/checkout@v5"
143110

144111
- name: "Install PHP"
145112
uses: "shivammathur/setup-php@v2"

.github/workflows/release-on-milestone-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/website-schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ on:
1818
jobs:
1919
json-validate:
2020
name: "Validate JSON schema"
21-
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.2.2"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.3.0"

phpcs.xml.dist

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd"
66
>
7-
<description>Check the code of the sniffs in doctrine/coding-standards.</description>
7+
<description>Used by the binaries inside bin/</description>
88

99
<arg name="basepath" value="." />
1010
<arg name="extensions" value="php" />
@@ -17,6 +17,4 @@
1717
<arg value="s" />
1818

1919
<rule ref="Doctrine" />
20-
21-
<file>lib</file>
2220
</ruleset>

0 commit comments

Comments
 (0)