Skip to content

Commit

Permalink
Merge pull request #39 from PHPCSStandards/feature/more-pear-cleanup
Browse files Browse the repository at this point in the history
More clean up after removal of PEAR installation support
  • Loading branch information
jrfnl authored Nov 9, 2023
2 parents 1419b6c + 520aec2 commit d956293
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 9 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 1 addition & 3 deletions bin/phpcbf.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ REM @author Greg Sherwood <[email protected]>
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" %*
4 changes: 1 addition & 3 deletions bin/phpcs.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ REM @author Greg Sherwood <[email protected]>
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" %*
1 change: 0 additions & 1 deletion scripts/build-phar.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* @author Greg Sherwood <[email protected]>
* @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;
Expand Down

0 comments on commit d956293

Please sign in to comment.