CI: Adjust autoload include so it's no longer conditional

Reviewed at https://reviews.lunr.nl/r/1099/
lunr-php · Jan 17, 2024 · ad8859b · ad8859b
1 parent 3b724fa
commit ad8859b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/phpstan.autoload.inc.php b/tests/phpstan.autoload.inc.php
@@ -14,14 +14,16 @@
 if (file_exists($base . '/vendor/autoload.php') == TRUE)
 {
     // Load composer autoloader.
-    require_once $base . '/vendor/autoload.php';
+    $autoload_file = $base . '/vendor/autoload.php';
 }
 else
 {
     // Load decomposer autoloade.
-    require_once $base . '/decomposer.autoload.inc.php';
+    $autoload_file = $base . '/decomposer.autoload.inc.php';
 }
 
+require_once $autoload_file;
+
 // Define application config lookup path
 $paths = [
     get_include_path(),

diff --git a/tests/test.bootstrap.inc.php b/tests/test.bootstrap.inc.php
@@ -22,14 +22,16 @@
 if (file_exists($base . '/vendor/autoload.php') == TRUE)
 {
     // Load composer autoloader.
-    require_once $base . '/vendor/autoload.php';
+    $autoload_file = $base . '/vendor/autoload.php';
 }
 else
 {
     // Load decomposer autoloade.
-    require_once $base . '/decomposer.autoload.inc.php';
+    $autoload_file = $base . '/decomposer.autoload.inc.php';
 }
 
+require_once $autoload_file;
+
 if (defined('TEST_STATICS') === FALSE)
 {
     define('TEST_STATICS', __DIR__ . '/statics');