diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml index 9e35b8fc0b..c0fc7eeee2 100644 --- a/.github/workflows/basic-qa.yml +++ b/.github/workflows/basic-qa.yml @@ -39,7 +39,7 @@ jobs: # Using PHPCS `master` as an early detection system for bugs upstream. - name: Set PHPCS version - run: composer require phpcsstandards/php_codesniffer:"dev-master" --no-update --no-scripts --no-interaction + run: composer require squizlabs/php_codesniffer:"dev-master" --no-update --no-scripts --no-interaction - name: Install Composer dependencies uses: ramsey/composer-install@v2 @@ -68,10 +68,10 @@ jobs: # Validate the Ruleset XML files. # @link http://xmlsoft.org/xmllint.html - name: Validate the WordPress rulesets - run: xmllint --noout --schema vendor/phpcsstandards/php_codesniffer/phpcs.xsd ./*/ruleset.xml + run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./*/ruleset.xml - name: Validate the sample ruleset - run: xmllint --noout --schema vendor/phpcsstandards/php_codesniffer/phpcs.xsd ./phpcs.xml.dist.sample + run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./phpcs.xml.dist.sample # Validate the Documentation XML files. - name: Validate documentation against schema @@ -117,7 +117,7 @@ jobs: - name: "Set PHPCS version (master)" if: ${{ matrix.phpcs_version != 'lowest' }} - run: composer require phpcsstandards/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction + run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction - name: Install Composer dependencies uses: ramsey/composer-install@v2 @@ -128,7 +128,7 @@ jobs: - name: "Set PHPCS version (lowest)" if: ${{ matrix.phpcs_version == 'lowest' }} - run: composer update phpcsstandards/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction + run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction - name: Test the WordPress-Core ruleset run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index bafa089b7e..182c24c1de 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -52,7 +52,7 @@ jobs: - name: "Set PHPCS version (master)" if: ${{ matrix.phpcs_version != 'lowest' }} - run: composer require phpcsstandards/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction + run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction - name: Install Composer dependencies (PHP < 8.0 ) if: ${{ matrix.php < 8.0 && matrix.php != 'latest' }} @@ -70,7 +70,7 @@ jobs: - name: "Set PHPCS version (lowest)" if: ${{ matrix.phpcs_version == 'lowest' }} - run: composer update phpcsstandards/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction + run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction - name: Lint PHP files against parse errors if: ${{ matrix.phpcs_version == 'dev-master' }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 7108233cce..3a4bde4397 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -84,7 +84,7 @@ jobs: - name: "Set PHPCS version (master)" if: ${{ matrix.phpcs_version != 'lowest' }} - run: composer require phpcsstandards/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction + run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction - name: Install Composer dependencies (PHP < 8.0 ) if: ${{ matrix.php < 8.0 }} @@ -102,7 +102,7 @@ jobs: - name: "Set PHPCS version (lowest)" if: ${{ matrix.phpcs_version == 'lowest' }} - run: composer update phpcsstandards/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction + run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction - name: Lint PHP files against parse errors if: ${{ matrix.phpcs_version == 'dev-master' }} diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index fabe3a9ba2..fd4c952893 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -25,7 +25,7 @@ */ // Get the PHPCS dir from an environment variable. $phpcsDir = getenv( 'PHPCS_DIR' ); -$composerPHPCSPath = dirname( __DIR__ ) . $ds . 'vendor' . $ds . 'phpcsstandards' . $ds . 'php_codesniffer'; +$composerPHPCSPath = dirname( __DIR__ ) . $ds . 'vendor' . $ds . 'squizlabs' . $ds . 'php_codesniffer'; if ( false === $phpcsDir && is_dir( $composerPHPCSPath ) ) { // PHPCS installed via Composer. diff --git a/composer.json b/composer.json index 21d1a40c3c..b6e8abd2f7 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-libxml": "*", "ext-tokenizer": "*", "ext-xmlreader": "*", - "phpcsstandards/php_codesniffer": "^3.7.2", + "squizlabs/php_codesniffer": "^3.7.2", "phpcsstandards/phpcsutils": "^1.0.8", "phpcsstandards/phpcsextra": "^1.2.0" }, @@ -46,16 +46,16 @@ "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git" ], "check-cs": [ - "@php ./vendor/phpcsstandards/php_codesniffer/bin/phpcs" + "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs" ], "fix-cs": [ - "@php ./vendor/phpcsstandards/php_codesniffer/bin/phpcbf" + "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf" ], "run-tests": [ - "@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/phpcsstandards/php_codesniffer/tests/AllTests.php --no-coverage" + "@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php --no-coverage" ], "coverage": [ - "@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/phpcsstandards/php_codesniffer/tests/AllTests.php" + "@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php" ], "check-complete": [ "@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness -q ./WordPress"