Skip to content

Commit b9b8925

Browse files
committed
Merge commit '2f08e742ff01b3ab5e469a5abb3e44083e8328ca' into 4.x
2 parents 9951290 + 2f08e74 commit b9b8925

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

.github/workflows/end-to-end-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: shivammathur/setup-php@v2
4646
with:
4747
php-version: ${{ matrix.php }}
48-
ini-values: "error_reporting=-1, display_errors=On"
48+
ini-values: "error_reporting=-1, display_errors=On, display_startup_errors=On"
4949
coverage: none
5050

5151
- name: "Install bashunit"

.github/workflows/quicktest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: shivammathur/setup-php@v2
4545
with:
4646
php-version: ${{ matrix.php }}
47-
ini-values: 'error_reporting=-1, display_errors=On'
47+
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
4848
coverage: none
4949

5050
# Install dependencies and handle caching in one go.

.github/workflows/reusable-build-phar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
php-version: ${{ inputs.phpVersion }}
4242
coverage: none
43-
ini-values: phar.readonly=Off, error_reporting=-1, display_errors=On
43+
ini-values: phar.readonly=Off, error_reporting=-1, display_errors=On, display_startup_errors=On
4444

4545
- name: Build the phar files
4646
run: php scripts/build-phar.php

.github/workflows/test-requirements-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
uses: shivammathur/setup-php@v2
100100
with:
101101
php-version: 'latest'
102-
ini-values: 'error_reporting=-1, display_errors=On'
102+
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
103103
coverage: none
104104

105105
- name: Set matrix
@@ -132,7 +132,7 @@ jobs:
132132
uses: shivammathur/setup-php@v2
133133
with:
134134
php-version: ${{ matrix.php }}
135-
ini-values: 'error_reporting=-1, display_errors=On'
135+
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
136136
extensions: ${{ matrix.extensions }}
137137
coverage: none
138138
env:
@@ -199,7 +199,7 @@ jobs:
199199
uses: shivammathur/setup-php@v2
200200
with:
201201
php-version: ${{ matrix.php }}
202-
ini-values: 'error_reporting=-1, display_errors=On'
202+
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
203203
extensions: ${{ matrix.extensions }}
204204
coverage: none
205205
env:

.github/workflows/test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,16 @@ jobs:
177177
- name: Setup ini config
178178
id: set_ini
179179
shell: bash
180+
# yamllint disable rule:line-length
180181
run: |
181182
# Set the "short_open_tag" ini to make sure specific conditions are tested.
182183
# Also turn on error_reporting to ensure all notices are shown.
183184
if [[ ${{ matrix.custom_ini }} == true ]]; then
184-
echo 'PHP_INI=error_reporting=-1, display_errors=On, date.timezone=Australia/Sydney, short_open_tag=On' >> "$GITHUB_OUTPUT"
185+
echo 'PHP_INI=error_reporting=-1, display_errors=On, display_startup_errors=On, date.timezone=Australia/Sydney, short_open_tag=On' >> "$GITHUB_OUTPUT"
185186
else
186-
echo 'PHP_INI=error_reporting=-1, display_errors=On' >> "$GITHUB_OUTPUT"
187+
echo 'PHP_INI=error_reporting=-1, display_errors=On, display_startup_errors=On' >> "$GITHUB_OUTPUT"
187188
fi
189+
# yamllint enable rule:line-length
188190
189191
- name: Install PHP
190192
uses: shivammathur/setup-php@v2
@@ -315,7 +317,7 @@ jobs:
315317
uses: shivammathur/setup-php@v2
316318
with:
317319
php-version: ${{ matrix.php }}
318-
ini-values: error_reporting=-1, display_errors=On${{ steps.set_ini.outputs.PHP_INI }}
320+
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On${{ steps.set_ini.outputs.PHP_INI }}
319321
extensions: ${{ matrix.extensions }}
320322
coverage: xdebug
321323

.github/workflows/verify-release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
trigger-schema-site-update:
2828
runs-on: ubuntu-latest
2929

30-
# Only run this workflow in the context of this repo.
31-
if: github.repository_owner == 'PHPCSStandards'
30+
# Only run this workflow in the context of this repo, don't run for changed workflow PR dry-runs.
31+
if: github.repository_owner == 'PHPCSStandards' && github.event_name != 'pull_request'
3232

3333
name: "Trigger update of schema website"
3434

@@ -46,8 +46,8 @@ jobs:
4646
trigger-wiki-update:
4747
runs-on: ubuntu-latest
4848

49-
# Only run this workflow in the context of this repo.
50-
if: github.repository_owner == 'PHPCSStandards'
49+
# Only run this workflow in the context of this repo, don't run for changed workflow PR dry-runs.
50+
if: github.repository_owner == 'PHPCSStandards' && github.event_name != 'pull_request'
5151

5252
name: "Trigger update of wiki"
5353

@@ -149,7 +149,7 @@ jobs:
149149
uses: shivammathur/setup-php@v2
150150
with:
151151
php-version: 'latest'
152-
ini-values: error_reporting=-1, display_errors=On
152+
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On
153153
coverage: none
154154

155155
- name: Create a PHP file
@@ -219,7 +219,7 @@ jobs:
219219
uses: shivammathur/setup-php@v2
220220
with:
221221
php-version: 'latest'
222-
ini-values: error_reporting=-1, display_errors=On
222+
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On
223223
coverage: none
224224
tools: phive
225225

0 commit comments

Comments
 (0)