From 4de1fd8db8c59529d770618b8386928665469046 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Mon, 6 Nov 2023 22:36:06 +0100 Subject: [PATCH] Switch to PHPCSStandards/PHP_CodeSniffer The Squizlabs repo has been abandoned. The project continues in a fork in the PHPCSStandards organisation. Note: I'm not changing the version constraints. All tags since 2.0.0 have been recreated in the PHPCSStandards fork, though the package name in those tags has not been changed. Based on tests I've run, the package should install fine when old tags are requested, though if a user has a `composer.json` which _also_ includes `squizlabs/php_codesniffer` in their dependency chain, this means that both will be installed, which could lead to issues. I recommend tagging a release straight-away. This should then allow _our_ dependencies to update their own requirements and version constraints and to release once PHPCS 3.8.0 has been tagged, to prevent these type of problems. Ref: * https://github.com/squizlabs/PHP_CodeSniffer/issues/3932 --- CONTRIBUTING.md | 2 +- README.md | 6 +++--- composer.json | 2 +- src/Plugin.php | 2 +- tests/IntegrationTest/BaseLineTest.php | 10 +++++----- .../InstallUpdateEventsTest.php | 2 +- tests/IntegrationTest/InvalidPackagesTest.php | 6 +++--- .../PlayNiceWithScriptsTest.php | 2 +- .../PreexistingPHPCSConfigTest.php | 10 +++++----- ...reexistingPHPCSInstalledPathsConfigTest.php | 8 ++++---- .../RegisterExternalStandardsTest.php | 18 +++++++++--------- tests/TestCase.php | 8 +++++--- tests/fixtures/dummy-src/composer.json | 2 +- .../dummy-src/src/DummySrcSubDir/ruleset.xml | 2 +- .../dummy-subdir/DummySubDir/ruleset.xml | 2 +- tests/fixtures/dummy-subdir/composer.json | 2 +- .../incorrect-type/IncorrectType/ruleset.xml | 2 +- tests/fixtures/incorrect-type/composer.json | 2 +- .../My-Third-Standard/ruleset.xml | 2 +- .../multistandard/MyFirstStandard/ruleset.xml | 2 +- .../multistandard/MySecondStandard/ruleset.xml | 2 +- tests/fixtures/multistandard/composer.json | 2 +- .../no-ruleset/NoRuleset/ruleset.xml.dist | 2 +- tests/fixtures/no-ruleset/composer.json | 2 +- 24 files changed, 51 insertions(+), 49 deletions(-) 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..645c0c1c 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ Create a composer package of your coding standard by adding a `composer.json` fi "description" : "Package contains all coding standards of the Acme company", "require" : { "php" : ">=5.4.0", - "squizlabs/php_codesniffer" : "^3.6" + "phpcsstandards/php_codesniffer" : "^3.8" }, "type" : "phpcodesniffer-standard" } @@ -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/composer.json b/composer.json index 70b38a17..f35a0963 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "require": { "php": ">=5.4", "composer-plugin-api": "^1.0 || ^2.0", - "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" + "phpcsstandards/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" }, "require-dev": { "ext-json": "*", diff --git a/src/Plugin.php b/src/Plugin.php index a2863d6c..e3e58b1e 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -44,7 +44,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface const MESSAGE_PLUGIN_UNINSTALLED = 'PHPCodeSniffer Composer Installer is uninstalled'; const MESSAGE_RUNNING_INSTALLER = 'Running PHPCodeSniffer Composer Installer'; - const PACKAGE_NAME = 'squizlabs/php_codesniffer'; + const PACKAGE_NAME = 'phpcsstandards/php_codesniffer'; const PACKAGE_TYPE = 'phpcodesniffer-standard'; const PHPCS_CONFIG_REGEX = '`%s:[^\r\n]+`'; diff --git a/tests/IntegrationTest/BaseLineTest.php b/tests/IntegrationTest/BaseLineTest.php index 3b57aaa6..1ed0bb97 100644 --- a/tests/IntegrationTest/BaseLineTest.php +++ b/tests/IntegrationTest/BaseLineTest.php @@ -30,7 +30,7 @@ final class BaseLineTest extends TestCase private $composerConfig = array( 'name' => 'phpcs-composer-installer/baseline-test', 'require-dev' => array( - 'squizlabs/php_codesniffer' => null, + 'phpcsstandards/php_codesniffer' => null, 'dealerdirect/phpcodesniffer-composer-installer' => '*', ), ); @@ -66,7 +66,7 @@ protected function tear_down() public function testBaseLineGlobal($phpcsVersion, $expectedStnds) { $config = $this->composerConfig; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempGlobalPath); $this->assertComposerValidates(static::$tempGlobalPath); @@ -90,7 +90,7 @@ public function testBaseLineGlobal($phpcsVersion, $expectedStnds) // Make sure the CodeSniffer.conf file does not get created when no external standards are found. $this->assertFileDoesNotExist( - static::$tempGlobalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf' + static::$tempGlobalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf' ); } @@ -121,7 +121,7 @@ public function testBaseLineLocal($phpcsVersion, $expectedStnds) } $config = $this->composerConfig; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempLocalPath); $this->assertComposerValidates(static::$tempLocalPath); @@ -145,7 +145,7 @@ public function testBaseLineLocal($phpcsVersion, $expectedStnds) // Make sure the CodeSniffer.conf file does not get created when no external standards are found. $this->assertFileDoesNotExist( - static::$tempLocalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf' + static::$tempLocalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf' ); } diff --git a/tests/IntegrationTest/InstallUpdateEventsTest.php b/tests/IntegrationTest/InstallUpdateEventsTest.php index 66b1ee95..d14b9c07 100644 --- a/tests/IntegrationTest/InstallUpdateEventsTest.php +++ b/tests/IntegrationTest/InstallUpdateEventsTest.php @@ -150,7 +150,7 @@ public function testPluginRunsOnReinstall() * 2. Reinstall PHPCS. */ $command = sprintf( - 'composer reinstall squizlabs/php_codesniffer -v --no-ansi --working-dir=%s', + 'composer reinstall phpcsstandards/php_codesniffer -v --no-ansi --working-dir=%s', escapeshellarg(static::$tempLocalPath) ); $result = $this->executeCliCommand($command); diff --git a/tests/IntegrationTest/InvalidPackagesTest.php b/tests/IntegrationTest/InvalidPackagesTest.php index 1a0e9044..7db5f303 100644 --- a/tests/IntegrationTest/InvalidPackagesTest.php +++ b/tests/IntegrationTest/InvalidPackagesTest.php @@ -28,7 +28,7 @@ final class InvalidPackagesTest extends TestCase private $composerConfigNoRuleset = array( 'name' => 'phpcs-composer-installer/invalid-package-no-ruleset-test', 'require-dev' => array( - 'squizlabs/php_codesniffer' => '*', + 'phpcsstandards/php_codesniffer' => '*', 'phpcs-composer-installer/no-ruleset' => '*', ), ); @@ -36,7 +36,7 @@ final class InvalidPackagesTest extends TestCase private $composerConfigIncorrectType = array( 'name' => 'phpcs-composer-installer/invalid-package-incorrect-type-test', 'require-dev' => array( - 'squizlabs/php_codesniffer' => '*', + 'phpcsstandards/php_codesniffer' => '*', 'phpcs-composer-installer/incorrect-type' => '*', ), ); @@ -82,7 +82,7 @@ public function testDontSetInstalledPathsForInvalidPackages($config, $standardNa // Make sure the CodeSniffer.conf file does not get created when no (valid) external standards are found. $this->assertFileDoesNotExist( - static::$tempLocalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf' + static::$tempLocalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf' ); // Make sure that the standard does not show up as registered with PHPCS. diff --git a/tests/IntegrationTest/PlayNiceWithScriptsTest.php b/tests/IntegrationTest/PlayNiceWithScriptsTest.php index 2cd2f08b..788da7f0 100644 --- a/tests/IntegrationTest/PlayNiceWithScriptsTest.php +++ b/tests/IntegrationTest/PlayNiceWithScriptsTest.php @@ -27,7 +27,7 @@ final class PlayNiceWithScriptsTest extends TestCase private $composerConfig = array( 'name' => 'phpcs-composer-installer/dont-block-scripts-test', 'require-dev' => array( - 'squizlabs/php_codesniffer' => '*', + 'phpcsstandards/php_codesniffer' => '*', 'dealerdirect/phpcodesniffer-composer-installer' => '*', 'phpcs-composer-installer/dummy-subdir' => '*', ), diff --git a/tests/IntegrationTest/PreexistingPHPCSConfigTest.php b/tests/IntegrationTest/PreexistingPHPCSConfigTest.php index f02e3dc5..31447bd5 100644 --- a/tests/IntegrationTest/PreexistingPHPCSConfigTest.php +++ b/tests/IntegrationTest/PreexistingPHPCSConfigTest.php @@ -28,14 +28,14 @@ * 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 { private $composerConfig = array( 'name' => 'phpcs-composer-installer/preexisting-config-test', 'require-dev' => array( - 'squizlabs/php_codesniffer' => null, + 'phpcsstandards/php_codesniffer' => null, 'dealerdirect/phpcodesniffer-composer-installer' => '*', ), ); @@ -71,7 +71,7 @@ protected function tear_down() public function testPreexistingNonInstalledPathsConfigIsKeptIntact($phpcsVersion) { $config = $this->composerConfig; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempLocalPath); @@ -88,7 +88,7 @@ public function testPreexistingNonInstalledPathsConfigIsKeptIntact($phpcsVersion // Verify the CodeSniffer.conf file does not exist to start with. $this->assertFileDoesNotExist( - static::$tempLocalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf' + static::$tempLocalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf' ); // Verify that the config is empty to start with. @@ -122,7 +122,7 @@ public function testPreexistingNonInstalledPathsConfigIsKeptIntact($phpcsVersion // Make sure the CodeSniffer.conf file has been created. $this->assertFileExists( - static::$tempLocalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf' + static::$tempLocalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf' ); // Verify that the config contains the newly set values. diff --git a/tests/IntegrationTest/PreexistingPHPCSInstalledPathsConfigTest.php b/tests/IntegrationTest/PreexistingPHPCSInstalledPathsConfigTest.php index 10411e47..4b7b39fc 100644 --- a/tests/IntegrationTest/PreexistingPHPCSInstalledPathsConfigTest.php +++ b/tests/IntegrationTest/PreexistingPHPCSInstalledPathsConfigTest.php @@ -34,7 +34,7 @@ final class PreexistingPHPCSInstalledPathsConfigTest extends TestCase private $composerConfig = array( 'name' => 'phpcs-composer-installer/preexisting-config-test', 'require-dev' => array( - 'squizlabs/php_codesniffer' => null, + 'phpcsstandards/php_codesniffer' => null, 'dealerdirect/phpcodesniffer-composer-installer' => '*', ), ); @@ -88,7 +88,7 @@ protected function tear_down() public function testPreexistingValidInstalledPathsConfigIsKeptIntact($phpcsVersion) { $config = $this->composerConfig; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempGlobalPath); @@ -176,7 +176,7 @@ public function testPreexistingValidInstalledPathsConfigIsKeptIntact($phpcsVersi public function testPreexistingInvalidInstalledPathsConfigIsRemoved($phpcsVersion) { $config = $this->composerConfig; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempLocalPath); @@ -216,7 +216,7 @@ public function testPreexistingInvalidInstalledPathsConfigIsRemoved($phpcsVersio * will error on an exception from the DirectoryIterator as used by PHPCS itself. * The manual setting prevents this exception, but still allows us to test this use-case. */ - $confFile = static::$tempLocalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf'; + $confFile = static::$tempLocalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf'; $confContents = file_get_contents($confFile); $this->assertNotFalse($confContents); $confContents = str_replace( diff --git a/tests/IntegrationTest/RegisterExternalStandardsTest.php b/tests/IntegrationTest/RegisterExternalStandardsTest.php index 3604c886..ef02cdea 100644 --- a/tests/IntegrationTest/RegisterExternalStandardsTest.php +++ b/tests/IntegrationTest/RegisterExternalStandardsTest.php @@ -21,7 +21,7 @@ final class RegisterExternalStandardsTest extends TestCase private $configOneStandard = array( 'name' => 'phpcs-composer-installer/register-external-stnds-one-stnd', 'require-dev' => array( - 'squizlabs/php_codesniffer' => null, + 'phpcsstandards/php_codesniffer' => null, 'phpcs-composer-installer/dummy-subdir' => '*', 'dealerdirect/phpcodesniffer-composer-installer' => '*', ), @@ -30,7 +30,7 @@ final class RegisterExternalStandardsTest extends TestCase private $configOneStandardMultiRuleset = array( 'name' => 'phpcs-composer-installer/register-external-stnds-multistnd', 'require-dev' => array( - 'squizlabs/php_codesniffer' => null, + 'phpcsstandards/php_codesniffer' => null, 'phpcs-composer-installer/multistandard' => '*', ), ); @@ -38,7 +38,7 @@ final class RegisterExternalStandardsTest extends TestCase private $configOneStandardInSrcSubdir = array( 'name' => 'phpcs-composer-installer/register-external-stnds-in-src-subdir', 'require-dev' => array( - 'squizlabs/php_codesniffer' => null, + 'phpcsstandards/php_codesniffer' => null, 'phpcs-composer-installer/dummy-src' => '*', ), ); @@ -73,7 +73,7 @@ protected function tear_down() public function testRegisterOneStandardGlobal($phpcsVersion) { $config = $this->configOneStandard; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempGlobalPath); $this->assertComposerValidates(static::$tempGlobalPath); @@ -99,7 +99,7 @@ public function testRegisterOneStandardGlobal($phpcsVersion) // Make sure the CodeSniffer.conf file has been created. $this->assertFileExists( - static::$tempGlobalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf' + static::$tempGlobalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf' ); // Verify that PHPCS sees the external standard. @@ -138,7 +138,7 @@ public function testRegisterOneStandardGlobal($phpcsVersion) public function testRegisterOneStandardLocal($phpcsVersion) { $config = $this->configOneStandard; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempLocalPath); $this->assertComposerValidates(static::$tempLocalPath); @@ -168,7 +168,7 @@ public function testRegisterOneStandardLocal($phpcsVersion) // Make sure the CodeSniffer.conf file has been created. $this->assertFileExists( - static::$tempLocalPath . '/vendor/squizlabs/php_codesniffer/CodeSniffer.conf' + static::$tempLocalPath . '/vendor/phpcsstandards/php_codesniffer/CodeSniffer.conf' ); // Verify that PHPCS sees the external standard. @@ -219,7 +219,7 @@ public function dataRegisterOneStandard() public function testRegisterOneStandardWithMultipleRulesets($phpcsVersion) { $config = $this->configOneStandardMultiRuleset; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempLocalPath); @@ -287,7 +287,7 @@ public function dataRegisterOneStandardMultipleRulesets() public function testRegisterOneStandardInSrcSubdir($phpcsVersion) { $config = $this->configOneStandardInSrcSubdir; - $config['require-dev']['squizlabs/php_codesniffer'] = $phpcsVersion; + $config['require-dev']['phpcsstandards/php_codesniffer'] = $phpcsVersion; $this->writeComposerJsonFile($config, static::$tempGlobalPath); diff --git a/tests/TestCase.php b/tests/TestCase.php index a4773111..6df75353 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -368,11 +368,13 @@ protected static function stabilizeCommand($command, $workingDir = null) */ protected static function getPhpcsCommand($workingDir = null) { - $command = '"vendor/squizlabs/php_codesniffer/bin/phpcs"'; // PHPCS 3.x. + $command = '"vendor/phpcsstandards/php_codesniffer/bin/phpcs"'; // PHPCS 3.x. - if (is_string($workingDir) && file_exists($workingDir . '/vendor/squizlabs/php_codesniffer/scripts/phpcs')) { + if (is_string($workingDir) + && file_exists($workingDir . '/vendor/phpcsstandards/php_codesniffer/scripts/phpcs') + ) { // PHPCS 2.x. - $command = '"vendor/squizlabs/php_codesniffer/scripts/phpcs"'; + $command = '"vendor/phpcsstandards/php_codesniffer/scripts/phpcs"'; } return $command; diff --git a/tests/fixtures/dummy-src/composer.json b/tests/fixtures/dummy-src/composer.json index 9ded9e25..5d728f1c 100644 --- a/tests/fixtures/dummy-src/composer.json +++ b/tests/fixtures/dummy-src/composer.json @@ -5,7 +5,7 @@ "license" : "MIT", "require" : { "php" : ">=5.4", - "squizlabs/php_codesniffer" : "*", + "phpcsstandards/php_codesniffer" : "*", "dealerdirect/phpcodesniffer-composer-installer" : "*" }, "config": { 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/dummy-subdir/composer.json b/tests/fixtures/dummy-subdir/composer.json index 8d082365..e1c14c96 100644 --- a/tests/fixtures/dummy-subdir/composer.json +++ b/tests/fixtures/dummy-subdir/composer.json @@ -5,6 +5,6 @@ "license" : "MIT", "require" : { "php" : ">=5.4", - "squizlabs/php_codesniffer" : "*" + "phpcsstandards/php_codesniffer" : "*" } } 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/incorrect-type/composer.json b/tests/fixtures/incorrect-type/composer.json index cbc76e3c..4a62e63e 100644 --- a/tests/fixtures/incorrect-type/composer.json +++ b/tests/fixtures/incorrect-type/composer.json @@ -5,7 +5,7 @@ "license" : "MIT", "require" : { "php" : ">=5.4", - "squizlabs/php_codesniffer" : "*", + "phpcsstandards/php_codesniffer" : "*", "dealerdirect/phpcodesniffer-composer-installer" : "*" }, "config": { 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/multistandard/composer.json b/tests/fixtures/multistandard/composer.json index f56d04c3..3588a781 100644 --- a/tests/fixtures/multistandard/composer.json +++ b/tests/fixtures/multistandard/composer.json @@ -5,7 +5,7 @@ "license" : "MIT", "require" : { "php" : ">=5.4", - "squizlabs/php_codesniffer" : "*", + "phpcsstandards/php_codesniffer" : "*", "dealerdirect/phpcodesniffer-composer-installer" : "*" }, "config": { 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. diff --git a/tests/fixtures/no-ruleset/composer.json b/tests/fixtures/no-ruleset/composer.json index 33aa9ac4..a3583cc1 100644 --- a/tests/fixtures/no-ruleset/composer.json +++ b/tests/fixtures/no-ruleset/composer.json @@ -5,7 +5,7 @@ "license" : "MIT", "require" : { "php" : ">=5.4", - "squizlabs/php_codesniffer" : "*", + "phpcsstandards/php_codesniffer" : "*", "dealerdirect/phpcodesniffer-composer-installer" : "*" }, "config": {