From 9b910ca2ccf538f547300dff84a0fb1c1fe0a34b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 19 Nov 2024 13:07:39 +0100
Subject: [PATCH] Continued: - sorted .gitignore file - ported files towards
 newer PHPUnit version

---
 .gitignore                                    | 40 +++++++++++++++++--
 phpunit.xml.dist                              |  5 ++-
 ...rapTest.php => FrameworkBootstrapTest.php} |  8 +++-
 .../config/FrameworkConfigurationTest.php     |  8 +++-
 4 files changed, 51 insertions(+), 10 deletions(-)
 rename tests/framework/bootstrap/{class_FrameworkBootstrapTest.php => FrameworkBootstrapTest.php} (98%)

diff --git a/.gitignore b/.gitignore
index 6e253c37..3da63340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,56 @@
+# Patches and log files in root directory
 /*.log
 /*.diff
 /*.path
+
+# Generated files
 /contrib/chash/chash.pos
 /contrib/lfdb2/*.bin*
 /contrib/lfdb2/*.out*
+
+# Generated mindmap files
 /contrib/mindmaps/*.png
 /contrib/mindmaps/*.svg
+
+# Global local configuration file
 /inc/config/config-local.php
+
+# Private aka. "local" NetBeans files
 /nbproject/private/*
+
+# Cached/"compiled" tempaltes
 /templates/_compiled/*.*
 /templates/images/_cache/*.*
+
+# Backup files
 *.*~
-/.cache
-/.project
-/.settings
+
+# Local configuration files are never committed
 /application/*/config-local.php
+
+# Database files are always ignored
 /db/*/*.serialized
+
+# Generated documentation files are being regenerated
 /docs/html/*
 /docs/latex/*
-/docs/warn.log
+
+# Any log files
+/docs/*.log
+
+# Generates reports should be ignored
 /reports/
+
+# Vendor directories should never be committed
 /vendor/
+
+# Local settings for PHPUnit
 /phpunit.xml
+
+# Local cache files by PHPUnit
+/.*.cache
+
+# ???
+/.cache
+/.project
+/.settings
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 48142e8e..8c7b3b3c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
+<phpunit
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
@@ -12,7 +13,7 @@
          bootstrap="./tests/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="CoreFramework Test Suite">
+        <testsuite name="Core Framework Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
diff --git a/tests/framework/bootstrap/class_FrameworkBootstrapTest.php b/tests/framework/bootstrap/FrameworkBootstrapTest.php
similarity index 98%
rename from tests/framework/bootstrap/class_FrameworkBootstrapTest.php
rename to tests/framework/bootstrap/FrameworkBootstrapTest.php
index 9d3645bf..e577b17c 100644
--- a/tests/framework/bootstrap/class_FrameworkBootstrapTest.php
+++ b/tests/framework/bootstrap/FrameworkBootstrapTest.php
@@ -46,8 +46,10 @@ class FrameworkBootstrapTest extends TestCase {
 
 	/**
 	 * Setup test case
+	 *
+	 * @return	void
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		// Trace message
 		//* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
 
@@ -60,8 +62,10 @@ class FrameworkBootstrapTest extends TestCase {
 
 	/**
 	 * Setup test case
+	 *
+	 * @return	void
 	 */
-	public static function setUpBeforeClass() {
+	public static function setUpBeforeClass(): void {
 		// Call parent method
 		//* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
 		parent::setUpBeforeClass();
diff --git a/tests/framework/config/FrameworkConfigurationTest.php b/tests/framework/config/FrameworkConfigurationTest.php
index 2bc7b0fb..9fde0e90 100644
--- a/tests/framework/config/FrameworkConfigurationTest.php
+++ b/tests/framework/config/FrameworkConfigurationTest.php
@@ -41,8 +41,10 @@ class FrameworkConfigurationTest extends TestCase {
 
 	/**
 	 * Setup test case
+	 *
+	 * @return	void
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		// Trace message
 		//* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
 
@@ -56,8 +58,10 @@ class FrameworkConfigurationTest extends TestCase {
 
 	/**
 	 * Setup test case
+	 *
+	 * @return	void
 	 */
-	public static function setUpBeforeClass() {
+	public static function setUpBeforeClass(): void {
 		// Trace message
 		//* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
 
-- 
2.39.5