Skip to content

Commit 184db66

Browse files
committed
Revert changes to the Composer package name
In contrast to earlier information, arrangements are now being made to allow the package to continue under its original name on Packagist. The commit (in the new repo) to rename the package [has been reverted](PHPCSStandards/PHP_CodeSniffer#135).
1 parent 15e1fc9 commit 184db66

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.github/workflows/basic-qa.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
# Using PHPCS `master` as an early detection system for bugs upstream.
4141
- name: Set PHPCS version
42-
run: composer require phpcsstandards/php_codesniffer:"dev-master" --no-update --no-scripts --no-interaction
42+
run: composer require squizlabs/php_codesniffer:"dev-master" --no-update --no-scripts --no-interaction
4343

4444
- name: Install Composer dependencies
4545
uses: ramsey/composer-install@v2
@@ -68,10 +68,10 @@ jobs:
6868
# Validate the Ruleset XML files.
6969
# @link http://xmlsoft.org/xmllint.html
7070
- name: Validate the WordPress rulesets
71-
run: xmllint --noout --schema vendor/phpcsstandards/php_codesniffer/phpcs.xsd ./*/ruleset.xml
71+
run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./*/ruleset.xml
7272

7373
- name: Validate the sample ruleset
74-
run: xmllint --noout --schema vendor/phpcsstandards/php_codesniffer/phpcs.xsd ./phpcs.xml.dist.sample
74+
run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./phpcs.xml.dist.sample
7575

7676
# Validate the Documentation XML files.
7777
- name: Validate documentation against schema
@@ -117,7 +117,7 @@ jobs:
117117

118118
- name: "Set PHPCS version (master)"
119119
if: ${{ matrix.phpcs_version != 'lowest' }}
120-
run: composer require phpcsstandards/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
120+
run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
121121

122122
- name: Install Composer dependencies
123123
uses: ramsey/composer-install@v2
@@ -128,7 +128,7 @@ jobs:
128128

129129
- name: "Set PHPCS version (lowest)"
130130
if: ${{ matrix.phpcs_version == 'lowest' }}
131-
run: composer update phpcsstandards/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
131+
run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
132132

133133
- name: Test the WordPress-Core ruleset
134134
run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core

.github/workflows/quicktest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: "Set PHPCS version (master)"
5454
if: ${{ matrix.phpcs_version != 'lowest' }}
55-
run: composer require phpcsstandards/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
55+
run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
5656

5757
- name: Install Composer dependencies (PHP < 8.0 )
5858
if: ${{ matrix.php < 8.0 && matrix.php != 'latest' }}
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: "Set PHPCS version (lowest)"
7272
if: ${{ matrix.phpcs_version == 'lowest' }}
73-
run: composer update phpcsstandards/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
73+
run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
7474

7575
- name: Lint PHP files against parse errors
7676
if: ${{ matrix.phpcs_version == 'dev-master' }}

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: "Set PHPCS version (master)"
8686
if: ${{ matrix.phpcs_version != 'lowest' }}
87-
run: composer require phpcsstandards/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
87+
run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
8888

8989
- name: Install Composer dependencies (PHP < 8.0 )
9090
if: ${{ matrix.php < 8.0 }}
@@ -102,7 +102,7 @@ jobs:
102102

103103
- name: "Set PHPCS version (lowest)"
104104
if: ${{ matrix.phpcs_version == 'lowest' }}
105-
run: composer update phpcsstandards/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
105+
run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
106106

107107
- name: Lint PHP files against parse errors
108108
if: ${{ matrix.phpcs_version == 'dev-master' }}

Tests/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
// Get the PHPCS dir from an environment variable.
2727
$phpcsDir = getenv( 'PHPCS_DIR' );
28-
$composerPHPCSPath = dirname( __DIR__ ) . $ds . 'vendor' . $ds . 'phpcsstandards' . $ds . 'php_codesniffer';
28+
$composerPHPCSPath = dirname( __DIR__ ) . $ds . 'vendor' . $ds . 'squizlabs' . $ds . 'php_codesniffer';
2929

3030
if ( false === $phpcsDir && is_dir( $composerPHPCSPath ) ) {
3131
// PHPCS installed via Composer.

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"ext-libxml": "*",
2222
"ext-tokenizer": "*",
2323
"ext-xmlreader": "*",
24-
"phpcsstandards/php_codesniffer": "^3.7.2",
24+
"squizlabs/php_codesniffer": "^3.7.2",
2525
"phpcsstandards/phpcsutils": "^1.0.8",
2626
"phpcsstandards/phpcsextra": "^1.2.0"
2727
},
@@ -46,16 +46,16 @@
4646
"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
4747
],
4848
"check-cs": [
49-
"@php ./vendor/phpcsstandards/php_codesniffer/bin/phpcs"
49+
"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"
5050
],
5151
"fix-cs": [
52-
"@php ./vendor/phpcsstandards/php_codesniffer/bin/phpcbf"
52+
"@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf"
5353
],
5454
"run-tests": [
55-
"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/phpcsstandards/php_codesniffer/tests/AllTests.php --no-coverage"
55+
"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php --no-coverage"
5656
],
5757
"coverage": [
58-
"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/phpcsstandards/php_codesniffer/tests/AllTests.php"
58+
"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php"
5959
],
6060
"check-complete": [
6161
"@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness -q ./WordPress"

0 commit comments

Comments
 (0)