From 23ba48c71f0d41bbe012d668349f6516dad527b4 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <aledeg@users.noreply.github.com>
Date: Fri, 5 Sep 2025 09:56:46 -0400
Subject: Change how files are included (#7916)

1. `include`, `include_once`, `require` and `require_once` are expressions not functions, parentheses are not necessary.
2. to move up the directory tree, it's better to use the `dirname` function instead of relying on `/..`.
---
 tests/app/Models/SearchTest.php                | 2 +-
 tests/bootstrap.php                            | 4 ++--
 tests/cli/CliOptionsParserTest.php             | 4 ++--
 tests/cli/cli-parser-test.php                  | 4 ++--
 tests/cli/i18n/I18nCompletionValidatorTest.php | 4 ++--
 tests/cli/i18n/I18nDataTest.php                | 4 ++--
 tests/cli/i18n/I18nFileTest.php                | 2 +-
 tests/cli/i18n/I18nUsageValidatorTest.php      | 4 ++--
 tests/cli/i18n/I18nValueTest.php               | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
index 8b4c9d2b5..e6efdbe55 100644
--- a/tests/app/Models/SearchTest.php
+++ b/tests/app/Models/SearchTest.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use PHPUnit\Framework\Attributes\DataProvider;
 
-require_once(LIB_PATH . '/lib_date.php');
+require_once LIB_PATH . '/lib_date.php';
 
 class SearchTest extends PHPUnit\Framework\TestCase {
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index f988855e6..6aee8b96f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -5,5 +5,5 @@ ini_set('display_errors', '1');
 
 const COPY_LOG_TO_SYSLOG = false;
 
-require(__DIR__ . '/../constants.php');
-require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
+require dirname(__DIR__) . '/constants.php';
+require LIB_PATH . '/lib_rss.php';	//Includes class autoloader
diff --git a/tests/cli/CliOptionsParserTest.php b/tests/cli/CliOptionsParserTest.php
index 6a67fa761..2fe0b7924 100644
--- a/tests/cli/CliOptionsParserTest.php
+++ b/tests/cli/CliOptionsParserTest.php
@@ -2,8 +2,8 @@
 declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
-require_once __DIR__ . '/../../cli/CliOption.php';
-require_once __DIR__ . '/../../cli/CliOptionsParser.php';
+require_once dirname(__DIR__, 2) . '/cli/CliOption.php';
+require_once dirname(__DIR__, 2) . '/cli/CliOptionsParser.php';
 
 final class CliOptionsOptionalTest extends CliOptionsParser {
 	public string $string = '';
diff --git a/tests/cli/cli-parser-test.php b/tests/cli/cli-parser-test.php
index 6806d29ce..a6b157474 100755
--- a/tests/cli/cli-parser-test.php
+++ b/tests/cli/cli-parser-test.php
@@ -2,8 +2,8 @@
 <?php
 declare(strict_types=1);
 
-require(__DIR__ . '/../../vendor/autoload.php');
-require(__DIR__ . '/CliOptionsParserTest.php');
+require dirname(__DIR__, 2) . '/vendor/autoload.php';
+require __DIR__ . '/CliOptionsParserTest.php';
 
 $optionsClass = getenv('CLI_PARSER_TEST_OPTIONS_CLASS');
 if (!is_string($optionsClass) || !class_exists($optionsClass)) {
diff --git a/tests/cli/i18n/I18nCompletionValidatorTest.php b/tests/cli/i18n/I18nCompletionValidatorTest.php
index f66d9e04f..4d62662aa 100644
--- a/tests/cli/i18n/I18nCompletionValidatorTest.php
+++ b/tests/cli/i18n/I18nCompletionValidatorTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
-require_once __DIR__ . '/../../../cli/i18n/I18nCompletionValidator.php';
-require_once __DIR__ . '/../../../cli/i18n/I18nValue.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nCompletionValidator.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php';
 
 class I18nCompletionValidatorTest extends PHPUnit\Framework\TestCase {
 	/** @var I18nValue&PHPUnit\Framework\MockObject\MockObject */
diff --git a/tests/cli/i18n/I18nDataTest.php b/tests/cli/i18n/I18nDataTest.php
index afdaacf1e..1f9e257fc 100644
--- a/tests/cli/i18n/I18nDataTest.php
+++ b/tests/cli/i18n/I18nDataTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
-require_once __DIR__ . '/../../../cli/i18n/I18nData.php';
-require_once __DIR__ . '/../../../cli/i18n/I18nValue.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nData.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php';
 
 class I18nDataTest extends PHPUnit\Framework\TestCase {
 	/** @var array<string,array<string,array<string,I18nValue>>> */
diff --git a/tests/cli/i18n/I18nFileTest.php b/tests/cli/i18n/I18nFileTest.php
index 34abdb9a3..b1aca49ea 100644
--- a/tests/cli/i18n/I18nFileTest.php
+++ b/tests/cli/i18n/I18nFileTest.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-require_once __DIR__ . '/../../../cli/i18n/I18nFile.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nFile.php';
 
 class I18nFileTest extends PHPUnit\Framework\TestCase {
 	public function test(): void {
diff --git a/tests/cli/i18n/I18nUsageValidatorTest.php b/tests/cli/i18n/I18nUsageValidatorTest.php
index 5a2268141..0429d1277 100644
--- a/tests/cli/i18n/I18nUsageValidatorTest.php
+++ b/tests/cli/i18n/I18nUsageValidatorTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
-require_once __DIR__ . '/../../../cli/i18n/I18nValue.php';
-require_once __DIR__ . '/../../../cli/i18n/I18nUsageValidator.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nUsageValidator.php';
 
 class I18nUsageValidatorTest extends PHPUnit\Framework\TestCase {
 
diff --git a/tests/cli/i18n/I18nValueTest.php b/tests/cli/i18n/I18nValueTest.php
index 85ff00fee..fb1fca804 100644
--- a/tests/cli/i18n/I18nValueTest.php
+++ b/tests/cli/i18n/I18nValueTest.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-require_once __DIR__ . '/../../../cli/i18n/I18nValue.php';
+require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php';
 
 class I18nValueTest extends PHPUnit\Framework\TestCase {
 	public static function testConstructorWithoutState(): void {
-- 
cgit v1.2.3