diff --git a/composer.json b/composer.json index fcbe4c58cb..af802efe2a 100644 --- a/composer.json +++ b/composer.json @@ -43,8 +43,8 @@ "require-dev": { "phpunit/phpunit": "^8.0 || ^9.0" }, - "replace": { - "squizlabs/php_codesniffer": "> 2.0" + "conflict": { + "squizlabs/php_codesniffer": "*" }, "bin": [ "bin/phpcs", diff --git a/src/Config.php b/src/Config.php index 6aa090882b..e607d93dd0 100644 --- a/src/Config.php +++ b/src/Config.php @@ -58,6 +58,7 @@ * @property bool $stdin Read content from STDIN instead of supplied files. * @property string $stdinContent Content passed directly to PHPCS on STDIN. * @property string $stdinPath The path to use for content passed on STDIN. + * @property bool $trackTime Whether or not to track sniff run time. * * @property array $extensions File extensions that should be checked. * E.g., array('php', 'inc');