diff --git a/.gitattributes b/.gitattributes index 2807459b5e..800d51adec 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,6 @@ .gitattributes export-ignore .github/ export-ignore .gitignore export-ignore -package.xml export-ignore phpcs.xml.dist export-ignore phpstan.neon export-ignore phpunit.xml.dist export-ignore diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5036ca4dcd..fa5c6561bd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -54,7 +54,7 @@ A clear and concise description of what you expected to happen. | PHP version | [e.g., 7.2, 7.4] | PHP_CodeSniffer version | [e.g., 3.5.5, master] | Standard | [e.g., PSR2, PSR12, Squiz, custom] -| Install type | [e.g. Composer (global/local), PHAR, PEAR, git clone, other (please expand)] +| Install type | [e.g. Composer (global/local), PHAR, git clone, other (please expand)] ## Additional context Add any other context about the problem here. diff --git a/bin/phpcbf.bat b/bin/phpcbf.bat index 82e9d561b1..da3b0401a1 100644 --- a/bin/phpcbf.bat +++ b/bin/phpcbf.bat @@ -5,8 +5,6 @@ REM @author Greg Sherwood REM @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600) REM @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence -if "%PHP_PEAR_PHP_BIN%" neq "" ( - set PHPBIN=%PHP_PEAR_PHP_BIN% -) else set PHPBIN=php +set PHPBIN=php "%PHPBIN%" "%~dp0\phpcbf" %* diff --git a/bin/phpcs.bat b/bin/phpcs.bat index 7fe506cf98..a95722b4e3 100755 --- a/bin/phpcs.bat +++ b/bin/phpcs.bat @@ -5,8 +5,6 @@ REM @author Greg Sherwood REM @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600) REM @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence -if "%PHP_PEAR_PHP_BIN%" neq "" ( - set PHPBIN=%PHP_PEAR_PHP_BIN% -) else set PHPBIN=php +set PHPBIN=php "%PHPBIN%" "%~dp0\phpcs" %* diff --git a/scripts/build-phar.php b/scripts/build-phar.php index 81ee997f19..7bc50a2bca 100644 --- a/scripts/build-phar.php +++ b/scripts/build-phar.php @@ -11,7 +11,6 @@ * @author Greg Sherwood * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600) * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence - * @link http://pear.php.net/package/PHP_CodeSniffer */ use PHP_CodeSniffer\Config;