Merge branch 'feature/tests-stabilize-pear-var' of https://github.com…

…/jrfnl/PHP_CodeSniffer
squizlabs · Sep 24, 2020 · 9a9676f · 9a9676f
2 parents 954a1c6 + 33af771
commit 9a9676f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -9,16 +9,13 @@
 
 namespace PHP_CodeSniffer\Tests;
 
-$GLOBALS['PHP_CODESNIFFER_PEAR'] = false;
-
-if (is_file(__DIR__.'/../autoload.php') === true) {
+if ($GLOBALS['PHP_CODESNIFFER_PEAR'] === false) {
     include_once 'Core/AllTests.php';
     include_once 'Standards/AllSniffs.php';
 } else {
     include_once 'CodeSniffer/Core/AllTests.php';
     include_once 'CodeSniffer/Standards/AllSniffs.php';
     include_once 'FileList.php';
-    $GLOBALS['PHP_CODESNIFFER_PEAR'] = true;
 }
 
 // PHPUnit 7 made the TestSuite run() method incompatible with

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -44,6 +44,13 @@ class_alias('PHPUnit_TextUI_TestRunner', 'PHPUnit'.'\TextUI\TestRunner');
     class_alias('PHPUnit_Framework_TestResult', 'PHPUnit'.'\Framework\TestResult');
 }
 
+// Determine whether this is a PEAR install or not.
+$GLOBALS['PHP_CODESNIFFER_PEAR'] = false;
+
+if (is_file(__DIR__.'/../autoload.php') === false) {
+    $GLOBALS['PHP_CODESNIFFER_PEAR'] = true;
+}
+
 
 /**
  * A global util function to help print unit test fixing data.