Index: branches/5.2.x/tools/build/inc/phpunit.xml
===================================================================
diff -u -r16761 -r16822
--- branches/5.2.x/tools/build/inc/phpunit.xml	(.../phpunit.xml)	(revision 16761)
+++ branches/5.2.x/tools/build/inc/phpunit.xml	(.../phpunit.xml)	(revision 16822)
@@ -1,46 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit colors="true"
 	bootstrap="../../../core/kernel/tests/bootstrap.php"
+	cacheDirectory="../../../system/cache/phpunit"
+	cacheResultFile="../../../system/cache/.phpunit.result.cache"
 	beStrictAboutOutputDuringTests="true"
 	verbose="true">
 
+	<!--
+	 - cacheDirectory - for PHPUnit 10+
+	 - cacheResultFile - for PHPUnit 9
+	-->
+
 	<php>
 		<ini name="memory_limit" value="-1"/>
 	</php>
 
 	<testsuites>
-		<testsuite name="all">
-			<directory>../../../core/tests</directory>
-			<directory>../../../modules/*/tests</directory>
-			<exclude>../../../core/tests/unit</exclude>
+		<testsuite name="Unit">
+			<directory>../../../core/tests/Unit</directory>
+			<directory>../../../modules/*/tests/Unit</directory>
 		</testsuite>
-		<testsuite name="custom">
-			<directory>../../../modules/custom/tests</directory>
+		<testsuite name="Functional">
+			<directory>../../../core/tests/Functional</directory>
+			<directory>../../../modules/*/tests/Functional</directory>
 		</testsuite>
 	</testsuites>
 
-	<logging>
-		<!--<log type="coverage-html" target="../../../build/coverage" title="BankAccount"
-			 charset="UTF-8" yui="true" highlight="true"
-			 lowUpperBound="35" highLowerBound="70"/>
-		<log type="coverage-clover" target="../../../build/logs/clover.xml"/>-->
-		<log type="junit" target="../../../build/logs/junit.xml"/>
-		<!--<log type="junit" target="../../../build/logs/junit.xml" logIncompleteSkipped="false"/>-->
-	</logging>
-
 	<filter>
 		<!--<blacklist>
 			<directory suffix=".php">..</directory>
 		</blacklist>-->
-		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">../../..</directory>
+		<whitelist addUncoveredFilesFromWhitelist="false">
+			<directory suffix=".php">../../../core/*</directory>
+			<directory suffix=".php">../../../modules/*</directory>
 			<exclude>
-				<directory>../../../blog</directory>
 				<directory>../../../modules/mpdf</directory>
 				<directory>../../../core/editor</directory>
 				<directory>../../../core/ckeditor</directory>
-				<directory>../../../system</directory>
-				<directory>../../../vendor</directory>
 
 				<directory>../../../core/tests</directory>
 				<directory>../../../modules/*/tests</directory>
Index: branches/5.2.x/tools/build/build_all.xml
===================================================================
diff -u -r16783 -r16822
--- branches/5.2.x/tools/build/build_all.xml	(.../build_all.xml)	(revision 16783)
+++ branches/5.2.x/tools/build/build_all.xml	(.../build_all.xml)	(revision 16822)
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="In-Portal (full)" default="build">
 	<property file="build.properties" />
+	<property name="phpunit.testsuite" value="" />
+
 	<resolvepath propertyName="base.dir" file="${base.dir}"/>
 
 	<property name="scan.dir" value="${base.dir}"/>
 	<property name="pdepend.exclude" value="blog,build,core/editor,core/ckeditor,core/units/general/libchart,modules/mpdf,system,vendor"/>
 	<property name="phpcpd.exclude" value="--exclude blog --exclude build --exclude core/editor --exclude core/ckeditor --exclude core/units/general/libchart --exclude modules/mpdf --exclude system --exclude vendor"/>
+	<property name="phpunit.config.file" value="${build.config.dir}/inc/phpunit.xml"/>
 
 	<import file="targets/common.xml"/>
 
Index: branches/5.2.x/composer.json
===================================================================
diff -u -r16792 -r16822
--- branches/5.2.x/composer.json	(.../composer.json)	(revision 16792)
+++ branches/5.2.x/composer.json	(.../composer.json)	(revision 16822)
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"behat/mink": "^1.7",
 		"aik099/phpunit-mink": "^2.4",
-		"yoast/phpunit-polyfills": "^1.1",
+		"yoast/phpunit-polyfills": "^2.0",
 		"qa-tools/qa-tools": "^1.2",
 		"phpspec/prophecy": "^1.10",
 		"aik099/coding-standard": "dev-in-portal"
Index: branches/5.2.x/tools/build/targets/common.xml
===================================================================
diff -u -r16821 -r16822
--- branches/5.2.x/tools/build/targets/common.xml	(.../common.xml)	(revision 16821)
+++ branches/5.2.x/tools/build/targets/common.xml	(.../common.xml)	(revision 16822)
@@ -31,7 +31,7 @@
 
 	<target name="build" description="Builds a project" depends="init,verify,analyze"/>
 
-	<target name="build-parallel" description="Builds a project (long targets executed in parallel)" depends="init,tools-parallel,phpunit"/>
+	<target name="build-parallel" description="Builds a project (long targets executed in parallel)" depends="init,tools-parallel,phpunit-ci"/>
 
 	<target name="tools-parallel" description="Run tools in parallel">
 		<parallel threadCount="2">
@@ -51,7 +51,7 @@
 
 	Make sure that our code is clean and functional. -->
 	<target name="verify" description="Verify code consistency" depends="init"/>
-	<!--<target name="verify" description="Verify code consistency" depends="init,phpunit"/>-->
+	<!--<target name="verify" description="Verify code consistency" depends="init,phpunit-ci"/>-->
 
 	<!-- ### Analyze code
 
@@ -188,15 +188,64 @@
 		</phpdoc2>
 	</target>
 
-	<target name="phpunit" description="Run tests with PHPUnit" depends="init">
-		<exec executable="phpunit" logoutput="true" checkreturn="true">
-			<arg value="--configuration"/>
-			<arg path="${build.config.dir}/phpunit.xml"/>
-			<arg value="--testsuite"/>
-			<arg value="custom"/>
-		</exec>
+	<target name="phpunit" description="Run tests with PHPUnit (print human-readable output)" depends="init">
+		<if>
+			<istrue value="${phpunit.testsuite}"/>
+			<then>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+
+					<arg value="--testsuite"/>
+					<arg value="${phpunit.testsuite}"/>
+				</exec>
+			</then>
+			<else>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+				</exec>
+			</else>
+		</if>
 	</target>
 
+	<target name="phpunit-ci" description="Run tests with PHPUnit (creates a log file for the CI server)" depends="init">
+		<if>
+			<istrue value="${phpunit.testsuite}"/>
+			<then>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+
+					<arg value="--testsuite"/>
+					<arg value="${phpunit.testsuite}"/>
+
+					<arg path="--log-junit"/>
+					<arg path="${build.logs.dir}/junit.xml"/>
+
+					<arg path="--coverage-clover"/>
+					<arg path="${build.logs.dir}/clover.xml"/>
+				</exec>
+			</then>
+			<else>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+
+					<arg path="--log-junit"/>
+					<arg path="${build.logs.dir}/junit.xml"/>
+
+					<arg path="--coverage-clover"/>
+					<arg path="${build.logs.dir}/clover.xml"/>
+				</exec>
+			</else>
+		</if>
+	</target>
+
 	<target name="init" depends="create-aliases,folders-create,deploy-ci" description="Prepare for build">
 	</target>
 
Index: branches/5.2.x/core/tests/Unit/AbstractTestCase.php
===================================================================
diff -u -r16761 -r16822
--- branches/5.2.x/core/tests/Unit/AbstractTestCase.php	(.../AbstractTestCase.php)	(revision 16761)
+++ branches/5.2.x/core/tests/Unit/AbstractTestCase.php	(.../Unit/AbstractTestCase.php)	(revision 16822)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: AbstractTestCase.php 16761 2023-11-15 11:29:03Z alex $
+* @version	$Id: AbstractTestCase.php 16822 2024-11-30 18:56:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2023 Intechnic. All rights reserved.
 * @license      GNU/GPL
Fisheye: Tag 16822 refers to a dead (removed) revision in file `branches/5.2.x/core/tests/AbstractTestCase.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/5.2.x/composer.lock
===================================================================
diff -u -r16792 -r16822
--- branches/5.2.x/composer.lock	(.../composer.lock)	(revision 16792)
+++ branches/5.2.x/composer.lock	(.../composer.lock)	(revision 16822)
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "446cbcf570fca40149427fa3c80c43be",
+    "content-hash": "6ee270cc584b92544d79e7879fd6158f",
     "packages": [
         {
             "name": "composer/ca-bundle",
-            "version": "1.4.3",
+            "version": "1.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "031d14d579d2fa090b8049586325faf746abd1ca"
+                "reference": "14756a2c62df6395822301372d021337ed33029a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/031d14d579d2fa090b8049586325faf746abd1ca",
-                "reference": "031d14d579d2fa090b8049586325faf746abd1ca",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/14756a2c62df6395822301372d021337ed33029a",
+                "reference": "14756a2c62df6395822301372d021337ed33029a",
                 "shasum": ""
             },
             "require": {
@@ -64,7 +64,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.4.3"
+                "source": "https://github.com/composer/ca-bundle/tree/1.4.4"
             },
             "funding": [
                 {
@@ -80,7 +80,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-08T15:22:14+00:00"
+            "time": "2024-09-25T07:48:01+00:00"
         },
         {
             "name": "mtdowling/cron-expression",
@@ -2380,21 +2380,21 @@
         },
         {
             "name": "yoast/phpunit-polyfills",
-            "version": "1.1.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
-                "reference": "a0f7d708794a738f328d7b6c94380fd1d6c40446"
+                "reference": "562f449a2ec8ab92fe7b30d94da9622c7b1345fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/a0f7d708794a738f328d7b6c94380fd1d6c40446",
-                "reference": "a0f7d708794a738f328d7b6c94380fd1d6c40446",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/562f449a2ec8ab92fe7b30d94da9622c7b1345fe",
+                "reference": "562f449a2ec8ab92fe7b30d94da9622c7b1345fe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+                "php": ">=5.6",
+                "phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
             },
             "require-dev": {
                 "php-parallel-lint/php-console-highlighter": "^1.0.0",
@@ -2404,7 +2404,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -2439,7 +2439,7 @@
                 "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
                 "source": "https://github.com/Yoast/PHPUnit-Polyfills"
             },
-            "time": "2024-04-05T16:01:51+00:00"
+            "time": "2024-09-06T22:38:28+00:00"
         }
     ],
     "aliases": [],
Index: branches/5.2.x/tools/build/inc/custom_phpunit.xml
===================================================================
diff -u -r16761 -r16822
--- branches/5.2.x/tools/build/inc/custom_phpunit.xml	(.../custom_phpunit.xml)	(revision 16761)
+++ branches/5.2.x/tools/build/inc/custom_phpunit.xml	(.../custom_phpunit.xml)	(revision 16822)
@@ -1,48 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit colors="true"
 	bootstrap="../../../core/kernel/tests/bootstrap.php"
+	cacheDirectory="../../../system/cache/phpunit"
+	cacheResultFile="../../../system/cache/.phpunit.result.cache"
 	beStrictAboutOutputDuringTests="true"
 	verbose="true">
 
+	<!--
+	 - cacheDirectory - for PHPUnit 10+
+	 - cacheResultFile - for PHPUnit 9
+	-->
+
 	<php>
 		<ini name="memory_limit" value="-1"/>
 	</php>
 
 	<testsuites>
-		<testsuite name="all">
-			<directory>../../../core/tests</directory>
-			<directory>../../../modules/custom/tests</directory>
-			<exclude>../../../core/tests/unit</exclude>
+		<testsuite name="Unit">
+			<directory>../../../modules/custom/tests/Unit</directory>
 		</testsuite>
+		<testsuite name="Functional">
+			<directory>../../../modules/custom/tests/Functional</directory>
+		</testsuite>
 	</testsuites>
 
-	<logging>
-		<!--<log type="coverage-html" target="../../../build/coverage" title="BankAccount"
-			 charset="UTF-8" yui="true" highlight="true"
-			 lowUpperBound="35" highLowerBound="70"/>
-		<log type="coverage-clover" target="../../../build/logs/clover.xml"/>-->
-		<log type="junit" target="../../../build/logs/junit.xml"/>
-		<!--<log type="junit" target="../../../build/logs/junit.xml" logIncompleteSkipped="false"/>-->
-	</logging>
-
 	<filter>
 		<!--<blacklist>
 			<directory suffix=".php">..</directory>
 		</blacklist>-->
-		<whitelist addUncoveredFilesFromWhitelist="true">
+		<whitelist addUncoveredFilesFromWhitelist="false">
 			<directory suffix=".php">../../../modules/custom</directory>
 			<exclude>
-				<directory>../../../blog</directory>
 				<directory>../../../modules/mpdf</directory>
-				<directory>../../../core/editor</directory>
-				<directory>../../../core/ckeditor</directory>
-				<directory>../../../system</directory>
-				<directory>../../../vendor</directory>
-
-				<directory>../../../core/tests</directory>
 				<directory>../../../modules/*/tests</directory>
-
-				<file>../../../core/kernel/tests/bootstrap.php</file>
 			</exclude>
 		</whitelist>
 	</filter>
Index: branches/5.2.x/tools/build/build_custom.xml
===================================================================
diff -u -r16783 -r16822
--- branches/5.2.x/tools/build/build_custom.xml	(.../build_custom.xml)	(revision 16783)
+++ branches/5.2.x/tools/build/build_custom.xml	(.../build_custom.xml)	(revision 16822)
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="In-Portal (custom module only)" default="build">
 	<property file="build.properties" />
+	<property name="phpunit.testsuite" value="" />
+
 	<resolvepath propertyName="base.dir" file="${base.dir}"/>
 
 	<property name="scan.dir" value="${base.dir}/modules/custom"/>
 
 	<!--TODO: update tasks, that uses "pdepend.exclude" and "phpcpd.exclude" to handle empty exclusion list-->
 	<property name="pdepend.exclude" value="no-match"/>
 	<property name="phpcpd.exclude" value="--exclude no-match"/>
+	<property name="phpunit.config.file" value="${build.config.dir}/inc/custom_phpunit.xml"/>
 
 	<import file="targets/common.xml"/>
 
Index: branches/5.2.x/core/tests/Functional/AbstractBrowserTestCase.php
===================================================================
diff -u -r16761 -r16822
--- branches/5.2.x/core/tests/Functional/AbstractBrowserTestCase.php	(.../AbstractBrowserTestCase.php)	(revision 16761)
+++ branches/5.2.x/core/tests/Functional/AbstractBrowserTestCase.php	(.../Functional/AbstractBrowserTestCase.php)	(revision 16822)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: AbstractBrowserTestCase.php 16761 2023-11-15 11:29:03Z alex $
+* @version	$Id: AbstractBrowserTestCase.php 16822 2024-11-30 18:56:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2023 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -29,6 +29,13 @@
 	);
 
 	/**
+	 * Browser aliases.
+	 *
+	 * @var array
+	 */
+	protected static $browserAliases;
+
+	/**
 	 * Page factory.
 	 *
 	 * @var TypifiedPageFactory
@@ -97,23 +104,32 @@
 	 * Allows to decouple actual test server connection details from test cases.
 	 *
 	 * @return array
+	 * @throws RuntimeException When Mink configuration file is missing.
 	 */
 	public function getBrowserAliases()
 	{
 		static $cache = null;
 
-		if ( !isset($cache) ) {
-			$cache = require_once WRITEABLE . '/mink_config.php';
+		if ( self::$browserAliases === null ) {
+			$config_file = WRITEABLE . '/mink_config.php';
 
+			if ( !file_exists($config_file) ) {
+				throw new RuntimeException('The Mink configuration file does not exist.');
+			}
+
+			$cache = require_once $config_file;
+
 			// The remote code coverage collection won't work without "baseUrl" in the browser configuration.
 			foreach ( $cache as $alias_name => $browser_configuration ) {
 				if ( !isset($browser_configuration['alias']) && !isset($browser_configuration['baseUrl']) ) {
 					$cache[$alias_name]['baseUrl'] = $this->Application->BaseURL();
 				}
 			}
+
+			self::$browserAliases = $cache;
 		}
 
-		return $cache;
+		return self::$browserAliases;
 	}
 
 }
Index: branches/5.2.x/tools/build/build.properties.dist
===================================================================
diff -u -r16820 -r16822
--- branches/5.2.x/tools/build/build.properties.dist	(.../build.properties.dist)	(revision 16820)
+++ branches/5.2.x/tools/build/build.properties.dist	(.../build.properties.dist)	(revision 16822)
@@ -16,3 +16,5 @@
 db.collation=
 db.tableprefix=
 db.charset=
+
+phpunit.testsuite=
Fisheye: Tag 16822 refers to a dead (removed) revision in file `branches/5.2.x/core/tests/AbstractBrowserTestCase.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -r16797 -r16822
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 16797)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 16822)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 16797 2024-08-16 08:27:01Z alex $
+* @version	$Id: application.php 16822 2024-11-30 18:56:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -797,8 +797,11 @@
 		$this->registerClass('Page', KERNEL_PATH . '/tests/Page/Page.php');
 		$this->registerClass('QAToolsUrlBuilder', KERNEL_PATH . '/tests/Url/QAToolsUrlBuilder.php');
 		$this->registerClass('QAToolsUrlFactory', KERNEL_PATH . '/tests/Url/QAToolsUrlFactory.php');
-		$this->registerClass('AbstractTestCase', KERNEL_PATH . '/../tests/AbstractTestCase.php');
-		$this->registerClass('AbstractBrowserTestCase', KERNEL_PATH . '/../tests/AbstractBrowserTestCase.php');
+		$this->registerClass('AbstractTestCase', KERNEL_PATH . '/../tests/Unit/AbstractTestCase.php');
+		$this->registerClass(
+			'AbstractBrowserTestCase',
+			KERNEL_PATH . '/../tests/Functional/AbstractBrowserTestCase.php'
+		);
 
 		// do not move to config - this helper is used before configs are read
 		$this->registerClass('kModulesHelper', KERNEL_PATH . self::MODULE_HELPER_PATH, 'ModulesHelper');
Fisheye: Tag 16822 refers to a dead (removed) revision in file `branches/5.2.x/core/tests/kernel/utility/formatters/kFormatterTest.php'.
Fisheye: No comparison available.  Pass `N' to diff?