Skip to content

Commit d6979aa

Browse files
committed
Fix references to 4.x dev branch
1 parent 808dbf2 commit d6979aa

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/csqa.yml

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

3838
# Using PHPCS `master` as an early detection system for bugs upstream.
3939
- name: "Composer: adjust dependencies"
40-
run: composer require --no-update squizlabs/php_codesniffer:"dev-4.x"
40+
run: composer require --no-update squizlabs/php_codesniffer:"4.x-dev"
4141

4242
# Install dependencies and handle caching in one go.
4343
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer

.github/workflows/test.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
#
3636
# The matrix is set up so as not to duplicate the builds which are run for code coverage.
3737
php: ["5.5", "5.6", "7.0", "7.1", "7.2", "7.3"]
38-
phpcs_version: ["3.5.6", "4.0.0", "dev-4.x"]
38+
phpcs_version: ["3.5.6", "4.0.0", "4.x-dev"]
3939

4040
include:
4141
- php: "8.4"
@@ -44,31 +44,31 @@ jobs:
4444
phpcs_version: "3.6.1"
4545

4646
- php: "8.3"
47-
phpcs_version: "dev-4.x"
47+
phpcs_version: "4.x-dev"
4848
- php: "8.3"
4949
phpcs_version: "3.6.1"
5050

5151
- php: "8.2"
52-
phpcs_version: "dev-4.x"
52+
phpcs_version: "4.x-dev"
5353
- php: "8.2"
5454
phpcs_version: "3.6.1"
5555

5656
- php: "8.1"
57-
phpcs_version: "dev-4.x"
57+
phpcs_version: "4.x-dev"
5858
- php: "8.1"
5959
phpcs_version: "3.6.1"
6060

6161
- php: "8.0"
62-
phpcs_version: "dev-4.x"
62+
phpcs_version: "4.x-dev"
6363
- php: "8.0"
6464
phpcs_version: "3.5.7"
6565

6666
- php: "7.4"
67-
phpcs_version: "dev-4.x"
67+
phpcs_version: "4.x-dev"
6868

6969
# Experimental builds.
7070
- php: "8.5" # Nightly.
71-
phpcs_version: "dev-4.x"
71+
phpcs_version: "4.x-dev"
7272

7373
name: "Test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
7474

@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
# On stable PHPCS versions, allow for PHP deprecation notices.
8585
# Unit tests don't need to fail on those for stable releases where those issues won't get fixed anymore.
86-
if [ "${{ matrix.phpcs_version }}" != "dev-4.x" ]; then
86+
if [ "${{ matrix.phpcs_version }}" != "4.x-dev" ]; then
8787
echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On, zend.assertions=1' >> $GITHUB_OUTPUT
8888
else
8989
echo 'PHP_INI=error_reporting=-1, display_errors=On, zend.assertions=1' >> $GITHUB_OUTPUT
@@ -148,12 +148,12 @@ jobs:
148148
matrix:
149149
include:
150150
- php: "8.4"
151-
phpcs_version: "dev-4.x"
151+
phpcs_version: "4.x-dev"
152152
- php: "7.4"
153153
phpcs_version: "3.5.6"
154154

155155
- php: "5.4"
156-
phpcs_version: "dev-4.x"
156+
phpcs_version: "4.x-dev"
157157
- php: "5.4"
158158
phpcs_version: "3.5.6"
159159

@@ -168,7 +168,7 @@ jobs:
168168
run: |
169169
# On stable PHPCS versions, allow for PHP deprecation notices.
170170
# Unit tests don't need to fail on those for stable releases where those issues won't get fixed anymore.
171-
if [ "${{ matrix.phpcs_version }}" != "dev-4.x" ]; then
171+
if [ "${{ matrix.phpcs_version }}" != "4.x-dev" ]; then
172172
echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On, zend.assertions=1' >> $GITHUB_OUTPUT
173173
else
174174
echo 'PHP_INI=error_reporting=-1, display_errors=On, zend.assertions=1' >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)