From 2ea0e5c96ca7bc179a57afdffd5b5dc8dbaeda7a Mon Sep 17 00:00:00 2001 From: jrfnl Date: Sat, 17 Feb 2024 08:01:45 +0100 Subject: [PATCH] Remove more remnants of PEAR installation support Follow up after #4 and #39 The alternative path referred to in the bin scripts and the test bootstrap was specific for running via a PEAR install. This should no longer be needed (nor will this work). --- bin/phpcbf | 6 +----- bin/phpcs | 6 +----- tests/bootstrap.php | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/bin/phpcbf b/bin/phpcbf index 2e86a40e62..c804bdf10e 100755 --- a/bin/phpcbf +++ b/bin/phpcbf @@ -8,11 +8,7 @@ * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence */ -if (is_file(__DIR__.'/../autoload.php') === true) { - include_once __DIR__.'/../autoload.php'; -} else { - include_once 'PHP/CodeSniffer/autoload.php'; -} +require_once __DIR__.'/../autoload.php'; $runner = new PHP_CodeSniffer\Runner(); $exitCode = $runner->runPHPCBF(); diff --git a/bin/phpcs b/bin/phpcs index e8e8b02894..d098bf8783 100755 --- a/bin/phpcs +++ b/bin/phpcs @@ -8,11 +8,7 @@ * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence */ -if (is_file(__DIR__.'/../autoload.php') === true) { - include_once __DIR__.'/../autoload.php'; -} else { - include_once 'PHP/CodeSniffer/autoload.php'; -} +require_once __DIR__.'/../autoload.php'; $runner = new PHP_CodeSniffer\Runner(); $exitCode = $runner->runPHPCS(); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index cc5319227c..0703d18029 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -19,11 +19,7 @@ define('PHP_CODESNIFFER_VERBOSITY', 0); } -if (is_file(__DIR__.'/../autoload.php') === true) { - include_once __DIR__.'/../autoload.php'; -} else { - include_once 'PHP/CodeSniffer/autoload.php'; -} +require_once __DIR__.'/../autoload.php'; $tokens = new \PHP_CodeSniffer\Util\Tokens();