Skip to content

Commit 61391ad

Browse files
authored
Merge pull request #298 from PHPCSStandards/feature/switch-to-fork-of-phpcs
Switch to PHPCSStandards/PHP_CodeSniffer & raise minimum supported version
2 parents 78b2cae + 4ef7581 commit 61391ad

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ This initial alpha release contains the following sniffs:
550550
Individual sub-types can be allowed by excluding specific error codes.
551551

552552
[Composer PHPCS plugin]: https://github.com/PHPCSStandards/composer-installer
553-
[php_version-config]: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options#setting-the-php-version
553+
[php_version-config]: https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Configuration-Options#setting-the-php-version
554554

555555
[Unreleased]: https://github.com/PHPCSStandards/PHPCSExtra/compare/stable...HEAD
556556
[1.2.0]: https://github.com/PHPCSStandards/PHPCSExtra/compare/1.1.2...1.2.0

Modernize/ruleset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Modernize" namespace="PHPCSExtra\Modernize" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Modernize" namespace="PHPCSExtra\Modernize" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd">
33

44
<description>A collection of sniffs to detect code modernization opportunities.</description>
55
</ruleset>

NormalizedArrays/ruleset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="NormalizedArrays" namespace="PHPCSExtra\NormalizedArrays" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="NormalizedArrays" namespace="PHPCSExtra\NormalizedArrays" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd">
33

44
<description>A ruleset for PHP_CodeSniffer to check arrays for normalized format.</description>
55
</ruleset>

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Minimum Requirements
4646
-------------------------------------------
4747

4848
* PHP 5.4 or higher.
49-
* [PHP_CodeSniffer][phpcs-gh] version **3.7.1** or higher.
50-
* [PHPCSUtils][phpcsutils-gh] version **1.0.8** or higher.
49+
* [PHP_CodeSniffer][phpcs-gh] version **3.8.0** or higher.
50+
* [PHPCSUtils][phpcsutils-gh] version **1.0.9** or higher.
5151

5252

5353
Installation
@@ -566,8 +566,8 @@ This code is released under the [GNU Lesser General Public License (LGPLv3)](LIC
566566
[gha-qa-results]: https://github.com/PHPCSStandards/PHPCSExtra/actions/workflows/basics.yml
567567
[gha-test-results]: https://github.com/PHPCSStandards/PHPCSExtra/actions/workflows/test.yml
568568

569-
[phpcs-gh]: https://github.com/squizlabs/PHP_CodeSniffer
569+
[phpcs-gh]: https://github.com/PHPCSStandards/PHP_CodeSniffer
570570
[phpcsutils-gh]: https://github.com/PHPCSStandards/PHPCSUtils
571571
[composer-installer-gh]: https://github.com/PHPCSStandards/composer-installer
572572

573-
[php_version-config]: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options#setting-the-php-version
573+
[php_version-config]: https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Configuration-Options#setting-the-php-version

Universal/ruleset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Universal" namespace="PHPCSExtra\Universal" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Universal" namespace="PHPCSExtra\Universal" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd">
33

44
<description>A collection of universal sniffs. This standard is not designed to be used to check code. Include individual sniffs from this standard in a custom ruleset instead.</description>
55
</ruleset>

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
},
2323
"require" : {
2424
"php" : ">=5.4",
25-
"squizlabs/php_codesniffer" : "^3.7.1",
26-
"phpcsstandards/phpcsutils" : "^1.0.8"
25+
"squizlabs/php_codesniffer" : "^3.8.0",
26+
"phpcsstandards/phpcsutils" : "^1.0.9"
2727
},
2828
"require-dev" : {
2929
"php-parallel-lint/php-parallel-lint": "^1.3.2",

phpcs.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!--
66
#############################################################################
77
COMMAND LINE ARGUMENTS
8-
https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
8+
https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
99
#############################################################################
1010
-->
1111

0 commit comments

Comments
 (0)