Clean up .gitignore and add coverage option to phpunit.sh

.gitignore

@@ -1,10 +1,8 @@
 .libs
 node_modules/
-composer.lock
+**/composer.lock
-vendor/
+**/vendor/
 tools/
-www/composer.lock
-www/vendor
 **/.env
 **/.target
 package-lock.json

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/"
 );

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

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;

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>

www/admin/class_test.json.php

@@ -59,8 +59,9 @@ $output = $json_class::jsonConvertToArray($json);
 print "J/S::E-JSON: $json: " . DgS::printAr($output) . "<br>";
 print "J/S::E-JSON ERROR: " . $json_class::jsonGetLastError() . ": " . $json_class::jsonGetLastError(true) . "<br>";
 
+echo "<hr>";
 $json = '{"valid":"json","invalid":"\xB1\x31"}';
-$json = '{"valid":"json","invalid":"abc\x80def"}';
+// $json = '{"valid":"json","invalid":"abc\x80def"}';
 $output_no_flag = Json::jsonConvertToArray($json);
 print "No Flag JSON: $json: " . DgS::printAr($output_no_flag) . "<br>";
 print "No Flag JSON ERROR: " . Json::jsonGetLastError() . ": " . Json::jsonGetLastError(true) . "<br>";
@@ -73,6 +74,7 @@ $output_raw = json_decode($json, true, flags:JSON_INVALID_UTF8_SUBSTITUTE);
 print "No Flag JSON RAW (F-2): $json: " . DgS::printAr($output_raw) . "<br>";
 $output_raw = json_decode($json, true);
 print "No Flag JSON RAW: $json: " . DgS::printAr($output_raw) . "<br>";
+echo "<hr>";
 
 
 // $json = '{"foo": "bar"}';

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": {

www/lib/CoreLibs/Debug/Support.php

@@ -134,8 +134,8 @@ class Support
 	 * Convert bool value to string value. Short name alias for printBool
 	 *
 	 * @param  bool   $bool  Bool value to be transformed
-	 * @param  string $true  [='true'] Override default string 'true'
+	 * @param  string $true  [=true] Override default string 'true'
-	 * @param  string $false [=false'] Override default string 'false'
+	 * @param  string $false [=false] Override default string 'false'
 	 * @return string        $true or $false string for true/false bool
 	 */
 	public static function prBl(