diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9065e828..a23949fe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,7 +62,7 @@ images provided by [Pipeline-Component][]. [PHPUnit]: https://phpunit.de/ [PHPUnit Polyfills]: https://github.com/Yoast/PHPUnit-Polyfills/ -[PHP_CodeSniffer]: https://github.com/squizlabs/PHP_CodeSniffer +[PHP_CodeSniffer]: https://github.com/PHPCSStandards/PHP_CodeSniffer [PHPCompatibility]: https://github.com/PHPCompatibility/PHPCompatibility [PHP-Parallel-Lint]: https://github.com/php-parallel-lint/PHP-Parallel-Lint [PHP-Security-Checker]: https://github.com/fabpot/local-php-security-checker diff --git a/README.md b/README.md index 18933822..ae09ca37 100644 --- a/README.md +++ b/README.md @@ -258,7 +258,7 @@ THE SOFTWARE. [changelog]: https://github.com/PHPCSStandards/composer-installer/releases [code-of-conduct-shield]: https://img.shields.io/badge/Contributor%20Covenant-v2.0-ff69b4.svg [code-of-conduct]: CODE_OF_CONDUCT.md -[codesniffer]: https://github.com/squizlabs/PHP_CodeSniffer +[codesniffer]: https://github.com/PHPCSStandards/PHP_CodeSniffer [composer-manual-scripts]: https://getcomposer.org/doc/articles/scripts.md [composer-manual-caret]: https://getcomposer.org/doc/articles/versions.md#caret-version-range- [composer]: https://getcomposer.org/ @@ -277,7 +277,7 @@ THE SOFTWARE. [scrutinizer]: https://scrutinizer-ci.com/g/dealerdirect/phpcodesniffer-composer-installer/ [ghactionstest-shield]: https://github.com/PHPCSStandards/composer-installer/actions/workflows/integrationtest.yml/badge.svg [ghactions]: https://github.com/PHPCSStandards/composer-installer/actions/workflows/integrationtest.yml -[tutorial]: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Coding-Standard-Tutorial +[tutorial]: https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Coding-Standard-Tutorial [using-composer-plugins]: https://getcomposer.org/doc/articles/plugins.md#using-plugins [v0.4]: https://github.com/PHPCSStandards/composer-installer/releases/tag/v0.4.0 [v0.7]: https://github.com/PHPCSStandards/composer-installer/releases/tag/v0.7.0 diff --git a/tests/IntegrationTest/PreexistingPHPCSConfigTest.php b/tests/IntegrationTest/PreexistingPHPCSConfigTest.php index f02e3dc5..7f83bcb3 100644 --- a/tests/IntegrationTest/PreexistingPHPCSConfigTest.php +++ b/tests/IntegrationTest/PreexistingPHPCSConfigTest.php @@ -28,7 +28,7 @@ * the plugin handles this correctly in all supported PHPCS versions. * * @link https://github.com/PHPCSStandards/composer-installer/pull/98 - * @link https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options + * @link https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Configuration-Options */ final class PreexistingPHPCSConfigTest extends TestCase { diff --git a/tests/PHPCSVersions.php b/tests/PHPCSVersions.php index 0ea9e5ce..62748d01 100644 --- a/tests/PHPCSVersions.php +++ b/tests/PHPCSVersions.php @@ -86,6 +86,8 @@ final class PHPCSVersions '3.6.2' => '3.6.2', '3.7.0' => '3.7.0', '3.7.1' => '3.7.1', + '3.7.2' => '3.7.2', + '3.8.0' => '3.8.0', ); /** @@ -354,10 +356,19 @@ function ($version) { break; case '8.3': + $versions = array_filter( + self::$allPhpcsVersions, + function ($version) { + // PHPCS 3.8.0 is the first PHPCS version with runtime support for PHP 8.3. + return version_compare($version, '3.8.0', '>='); + } + ); + break; + case '8.4': /* - * At this point in time, it is unclear as of which PHPCS version PHP 8.3/8.4 will be supported. - * In other words: tests should only use dev-master/4.x when on PHP 8.3/8.4 for the time being. + * At this point in time, it is unclear as of which PHPCS version PHP 8.4 will be supported. + * In other words: tests should only use dev-master/4.x when on PHP 8.4 for the time being. */ $versions = array(); break; diff --git a/tests/fixtures/dummy-src/src/DummySrcSubDir/ruleset.xml b/tests/fixtures/dummy-src/src/DummySrcSubDir/ruleset.xml index 3e434f11..6da623b2 100644 --- a/tests/fixtures/dummy-src/src/DummySrcSubDir/ruleset.xml +++ b/tests/fixtures/dummy-src/src/DummySrcSubDir/ruleset.xml @@ -1,5 +1,5 @@ - + Dummy PHPCS standard for testing. diff --git a/tests/fixtures/dummy-subdir/DummySubDir/ruleset.xml b/tests/fixtures/dummy-subdir/DummySubDir/ruleset.xml index cc09bc8a..b37cd584 100644 --- a/tests/fixtures/dummy-subdir/DummySubDir/ruleset.xml +++ b/tests/fixtures/dummy-subdir/DummySubDir/ruleset.xml @@ -1,5 +1,5 @@ - + Dummy PHPCS standard for testing. diff --git a/tests/fixtures/incorrect-type/IncorrectType/ruleset.xml b/tests/fixtures/incorrect-type/IncorrectType/ruleset.xml index 3e889097..bdaf0018 100644 --- a/tests/fixtures/incorrect-type/IncorrectType/ruleset.xml +++ b/tests/fixtures/incorrect-type/IncorrectType/ruleset.xml @@ -1,5 +1,5 @@ - + Dummy PHPCS standard for testing. diff --git a/tests/fixtures/multistandard/My-Third-Standard/ruleset.xml b/tests/fixtures/multistandard/My-Third-Standard/ruleset.xml index ca6a9818..1beb5b10 100644 --- a/tests/fixtures/multistandard/My-Third-Standard/ruleset.xml +++ b/tests/fixtures/multistandard/My-Third-Standard/ruleset.xml @@ -1,5 +1,5 @@ - + Dummy PHPCS standard for testing. diff --git a/tests/fixtures/multistandard/MyFirstStandard/ruleset.xml b/tests/fixtures/multistandard/MyFirstStandard/ruleset.xml index 424ac051..f903a2bf 100644 --- a/tests/fixtures/multistandard/MyFirstStandard/ruleset.xml +++ b/tests/fixtures/multistandard/MyFirstStandard/ruleset.xml @@ -1,5 +1,5 @@ - + Dummy PHPCS standard for testing. diff --git a/tests/fixtures/multistandard/MySecondStandard/ruleset.xml b/tests/fixtures/multistandard/MySecondStandard/ruleset.xml index 462d4141..05ac7dc1 100644 --- a/tests/fixtures/multistandard/MySecondStandard/ruleset.xml +++ b/tests/fixtures/multistandard/MySecondStandard/ruleset.xml @@ -1,5 +1,5 @@ - + Dummy PHPCS standard for testing. diff --git a/tests/fixtures/no-ruleset/NoRuleset/ruleset.xml.dist b/tests/fixtures/no-ruleset/NoRuleset/ruleset.xml.dist index 15b517c7..a5a113bf 100644 --- a/tests/fixtures/no-ruleset/NoRuleset/ruleset.xml.dist +++ b/tests/fixtures/no-ruleset/NoRuleset/ruleset.xml.dist @@ -1,5 +1,5 @@ - + Dummy PHPCS standard for testing.