From 188f0b57d009ea1abed88173ea31cb5a82ac60a4 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Fri, 27 Feb 2026 10:58:05 +0900
Subject: [PATCH] Clean up .gitignore and add coverage option to phpunit.sh

---
 .gitignore                         |  6 ++----
 4dev/checking/phpunit.sh           | 11 +++++++++++
 4dev/tests/DB/CoreLibsDBIOTest.php |  1 -
 4dev/tests/bootstrap.php           |  2 +-
 phpunit.xml                        | 10 ++++++++++
 www/composer.json                  |  2 +-
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2de610f..4d655ccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
 .libs
 node_modules/
-composer.lock
-vendor/
+**/composer.lock
+**/vendor/
 tools/
-www/composer.lock
-www/vendor
 **/.env
 **/.target
 package-lock.json
diff --git a/4dev/checking/phpunit.sh b/4dev/checking/phpunit.sh
index a6103005..556510a0 100755
--- a/4dev/checking/phpunit.sh
+++ b/4dev/checking/phpunit.sh
@@ -19,6 +19,7 @@ Available options:
 -v, --verbose     Enable verbose output for PHPunit
 -c, --composer    Use composer version and not the default phives bundle
 -p, --php VERSION Chose PHP version in the form of "N.N", if not found will exit
+-C, --coverage     Generate code coverage report in text format (default: disabled)
 EOF
 	exit
 }
@@ -47,6 +48,7 @@ opt_verbose="";
 php_version="";
 no_php_version=0;
 use_composer=0;
+opt_generate_coverage="";
 while [ -n "${1-}" ]; do
 	case "${1}" in
 		-t | --testdox)
@@ -59,6 +61,10 @@ while [ -n "${1-}" ]; do
 			use_composer=1;
 			shift
 			;;
+		-C | --coverage)
+			opt_generate_coverage="--coverage-text";
+			shift
+			;;
 		-p | --php)
 			php_version="${2-}";
 			shift
@@ -100,9 +106,14 @@ if [ "${use_composer}" -eq 1 ]; then
 else
 	PHPUNIT_CALL+=("${BASE_PATH}tools/phpunit");
 fi;
+if [ -n "${opt_generate_coverage}" ]; then
+	echo "Will run coverage report";
+	export XDEBUG_MODE=coverage
+fi;
 PHPUNIT_CALL+=(
 	"${opt_testdox}"
 	"${opt_verbose}"
+	"${opt_generate_coverage}"
 	"-c" "${PHPUNIT_CONFIG}"
 	"${BASE_PATH}4dev/tests/"
 );
diff --git a/4dev/tests/DB/CoreLibsDBIOTest.php b/4dev/tests/DB/CoreLibsDBIOTest.php
index f9e66c6a..3e00db54 100644
--- a/4dev/tests/DB/CoreLibsDBIOTest.php
+++ b/4dev/tests/DB/CoreLibsDBIOTest.php
@@ -45,7 +45,6 @@ use CoreLibs\DB\Support\ConvertPlaceholder;
  * Test class for DB\IO + DB\SQL\PgSQL
  * This will only test the PgSQL parts
  * @coversDefaultClass \CoreLibs\DB\IO
- * @coversDefaultClass \CoreLibs\DB\SQL\PgSQL
  * @testdox \CoreLibs\DB\IO method tests for SQL\PgSQL
  */
 final class CoreLibsDBIOTest extends TestCase
diff --git a/4dev/tests/bootstrap.php b/4dev/tests/bootstrap.php
index ab99d7a2..58ea663e 100644
--- a/4dev/tests/bootstrap.php
+++ b/4dev/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 $set = 0;
-foreach (['/../../www', '/../www', '/../..', '/..', '/../../src', '/../src'] as $src) {
+foreach (['/../../www', '/../www', '/../../src', '/../src', '/../..', '/..'] as $src) {
 	if (is_file(dirname(__DIR__) . $src . '/vendor/autoload.php')) {
 		require dirname(__DIR__) . $src . '/vendor/autoload.php';
 		$set = 1;
diff --git a/phpunit.xml b/phpunit.xml
index dfc1669b..03f9b427 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -10,4 +10,14 @@
 			<directory>4dev/tests</directory>
 		</testsuite>
 	</testsuites>
+	<coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./www/lib/CoreLibs</directory>
+        </include>
+    </coverage>
+	<!-- <source>
+		<include>
+			<directory>./www/lib/CoreLibs</directory>
+		</include>
+	</source> -->
 </phpunit>
diff --git a/www/composer.json b/www/composer.json
index d723baf3..7e983187 100644
--- a/www/composer.json
+++ b/www/composer.json
@@ -17,7 +17,7 @@
     "repositories": {
         "git.egplusww.jp.Composer": {
             "type": "composer",
-            "url": "https://git.egplusww.jp/api/packages/Composer/composer"
+            "url": "https://packages.omnicomproduction.jp/api/packages/Composer/composer"
         }
     },
     "require": {