Skip to content

Commit

Permalink
replace squizlabs/php_codesniffer with phpcsstandards/php_codesniffer
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoll committed Dec 3, 2023
1 parent 235cc5d commit 687a1d6
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
restore-keys: 'cache-composer-'
- name: run composer
run: composer update --prefer-lowest --prefer-dist --no-interaction --no-progress
- run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd MO4/ruleset.xml
- run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd phpcs.mo4.xml
- run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd phpcs.xml.dist
- run: xmllint --noout --schema vendor/phpcsstandards/php_codesniffer/phpcs.xsd MO4/ruleset.xml
- run: xmllint --noout --schema vendor/phpcsstandards/php_codesniffer/phpcs.xsd phpcs.mo4.xml
- run: xmllint --noout --schema vendor/phpcsstandards/php_codesniffer/phpcs.xsd phpcs.xml.dist
- run: diff -B MO4/ruleset.xml <(xmllint --format MO4/ruleset.xml)
- run: diff -B phpcs.mo4.xml <(xmllint --format phpcs.mo4.xml)
- run: diff -B phpcs.xml.dist <(xmllint --format phpcs.xml.dist)
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
run: vendor/bin/phpunit
- name: Run tests
if: ${{ matrix.php_version == '8.1' }}
run: vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php
run: vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests vendor/phpcsstandards/php_codesniffer/tests/Standards/AllSniffs.php
- name: Run integration tests
run: vendor/bin/phpcs -s --standard=MO4 integrationtests/testfile.php
- name: Run PHPStan
Expand Down
2 changes: 1 addition & 1 deletion .phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
'directory_list' => [
'MO4',
'tests',
'vendor/squizlabs/php_codesniffer',
'vendor/phpcsstandards/php_codesniffer',
],

// A directory list that defines files that will be excluded
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ If `phpcs` complains that MO4 is not installed, please check the installed codin

## Dependencies

* [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer)
* [PHP CodeSniffer](https://github.com/phpcsstandards/PHP_CodeSniffer)
* [David Joos's Symfony Coding Standard](https://github.com/djoos/Symfony-coding-standard)
* [Composer installer for PHP_CodeSniffer coding standards](https://github.com/DealerDirect/phpcodesniffer-composer-installer)
* [Slevomat Coding Standard](https://github.com/slevomat/coding-standard)
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"php": "~7.2 || ~8.0",
"dealerdirect/phpcodesniffer-composer-installer": "~0.7",
"escapestudios/symfony2-coding-standard": "^3.10.0",
"slevomat/coding-standard": "^8.4",
"squizlabs/php_codesniffer": "^3.6.2"
"phpcsstandards/php_codesniffer": "^3.6.2",
"slevomat/coding-standard": "^8.4"
},
"require-dev": {
"ergebnis/composer-normalize": ">=2.19 <2.30",
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
>
<testsuites>
<testsuite name="MO4 Ruleset Test Suite">
<file>vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php</file>
<file>vendor/phpcsstandards/php_codesniffer/tests/Standards/AllSniffs.php</file>
</testsuite>
</testsuites>
<filter>
Expand Down
2 changes: 1 addition & 1 deletion tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

$myStandardName = 'MO4';

require_once __DIR__.'/../vendor/squizlabs/php_codesniffer/tests/bootstrap.php';
require_once __DIR__.'/../vendor/phpcsstandards/php_codesniffer/tests/bootstrap.php';

// Add this Standard.
PHP_CodeSniffer\Config::setConfigData(
Expand Down

0 comments on commit 687a1d6

Please sign in to comment.