WAIT - PHPCS master to 3.x branch rename | GH Actions: allow for upstream branch rename

Author: jrfnl

.github/workflows/cs.yml

@@ -39,8 +39,9 @@ jobs:
         run: |
           # The sniff stage doesn't run the unit tests, so no need for PHPUnit.
           composer remove --no-update --dev phpunit/phpunit --no-scripts --no-interaction
-          # Using PHPCS `master` as an early detection system for bugs upstream.
-          composer require --no-update squizlabs/php_codesniffer:"dev-master" --no-interaction
+          # Using PHPCS `3.x` as an early detection system for bugs upstream.
+          # This should be changed to 4.x, but we'll need to wait for PHPCSDevCS to be compatible with 4.x.
+          composer require --no-update squizlabs/php_codesniffer:"3.x-dev" --no-interaction
 
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer

.github/workflows/quicktest.yml

@@ -95,7 +95,7 @@ jobs:
     strategy:
       matrix:
         php: ['5.4', 'latest']
-        phpcs_version: ['3.1.0', 'dev-master']
+        phpcs_version: ['3.1.0', '3.x-dev']
 
         include:
           - php: '7.2'
@@ -114,7 +114,7 @@ jobs:
       - name: Setup ini config
         id: set_ini
         run: |
-          if [ "${{ startsWith( matrix.phpcs_version, 'dev-' ) || endsWith( matrix.phpcs_version, '-dev' ) }}" == "true" ]; then
+          if [ "${{ endsWith( matrix.phpcs_version, '-dev' ) }}" == "true" ]; then
             echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On' >> "$GITHUB_OUTPUT"
           else
             echo 'PHP_INI=error_reporting=-1, display_errors=On' >> "$GITHUB_OUTPUT"

.github/workflows/test.yml

@@ -113,34 +113,34 @@ jobs:
         #
         # Additionally, PHPCS 4.x has a minimum version requirement of PHP 7.2.
         php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
-        phpcs_version: ['dev-master', '4.0.0', '4.x-dev']
+        phpcs_version: ['3.x-dev', '4.0.0', '4.x-dev']
 
         include:
           # Complete the matrix, while preventing issues with PHPCS versions incompatible with certain PHP versions.
           - php: '5.4'
             phpcs_version: '3.1.0'
           - php: '5.4'
-            phpcs_version: 'dev-master'
+            phpcs_version: '3.x-dev'
 
           - php: '5.5'
             phpcs_version: '3.1.0'
           - php: '5.5'
-            phpcs_version: 'dev-master'
+            phpcs_version: '3.x-dev'
 
           - php: '5.6'
             phpcs_version: '3.1.0'
           - php: '5.6'
-            phpcs_version: 'dev-master'
+            phpcs_version: '3.x-dev'
 
           - php: '7.0'
             phpcs_version: '3.1.0'
           - php: '7.0'
-            phpcs_version: 'dev-master'
+            phpcs_version: '3.x-dev'
 
           - php: '7.1'
             phpcs_version: '3.1.0'
           - php: '7.1'
-            phpcs_version: 'dev-master'
+            phpcs_version: '3.x-dev'
 
           - php: '7.2'
             phpcs_version: '3.1.0'
@@ -172,7 +172,7 @@ jobs:
         run: |
           # On stable PHPCS versions, allow for PHP deprecation notices.
           # Unit tests don't need to fail on those for stable releases where those issues won't get fixed anymore.
-          if [ "${{ startsWith( matrix.phpcs_version, 'dev-' ) || endsWith( matrix.phpcs_version, '-dev' ) }}" == "true" ]; then
+          if [ "${{ endsWith( matrix.phpcs_version, '-dev' ) }}" == "true" ]; then
             echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On' >> "$GITHUB_OUTPUT"
           else
             echo 'PHP_INI=error_reporting=-1, display_errors=On' >> "$GITHUB_OUTPUT"