Skip to content

Commit fe44689

Browse files
committed
GH Actions/tests: tweak a condition
... to hopefully prevent the script from throwing a parse error on Windows.
1 parent f7dcac5 commit fe44689

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,20 +217,15 @@ jobs:
217217
id: set_ini
218218
run: |
219219
# Set the "short_open_tag" ini to make sure specific conditions are tested.
220-
# Also turn on error_reporting to ensure all notices are shown.
221-
if [[ ${{ matrix.custom_ini }} == true && "${{ startsWith( matrix.php, '5.' ) }}" == true ]]; then
222-
echo 'PHP_INI=error_reporting=-1, display_errors=On, date.timezone=Australia/Sydney, short_open_tag=On, asp_tags=On' >> "$GITHUB_OUTPUT"
223-
elif [[ ${{ matrix.custom_ini }} == true && "${{ startsWith( matrix.php, '7.' ) }}" == true ]]; then
224-
echo 'PHP_INI=error_reporting=-1, display_errors=On, date.timezone=Australia/Sydney, short_open_tag=On' >> "$GITHUB_OUTPUT"
225-
else
226-
echo 'PHP_INI=error_reporting=-1, display_errors=On' >> "$GITHUB_OUTPUT"
220+
if [[ ${{ matrix.custom_ini }} == true && "${{ matrix.php }}" == '5.4' ]]; then
221+
echo 'PHP_INI=, date.timezone=Australia/Sydney, short_open_tag=On, asp_tags=On' >> "$GITHUB_OUTPUT"
227222
fi
228223
229224
- name: Install PHP
230225
uses: shivammathur/setup-php@v2
231226
with:
232227
php-version: ${{ matrix.php }}
233-
ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
228+
ini-values: error_reporting=-1, display_errors=On${{ steps.set_ini.outputs.PHP_INI }}
234229
coverage: xdebug
235230

236231
# This action also handles the caching of the dependencies.

0 commit comments

Comments
 (0)