Merge pull request #64 from iMattPro/update-to-4

iMattPro · web-flow · commit de947141fced · 2025-04-02T20:57:24.000-07:00
Update master for phpbb4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,9 +4,9 @@ env:
     EXTNAME: phpbb/teamsecurity   # Your extension vendor/package name
     SNIFF: 1             # Run code sniffer on your code? 1 or 0
     IMAGE_ICC: 1         # Run icc profile sniffer on your images? 1 or 0
-    EPV: 1               # Run EPV (Extension Pre Validator) on your code? 1 or 0
+    EPV: 0               # Run EPV (Extension Pre Validator) on your code? 1 or 0
     EXECUTABLE_FILES: 1  # Run check for executable files? 1 or 0
-    PHPBB_BRANCH: 3.3.x  # The phpBB branch to run tests on
+    PHPBB_BRANCH: master # The phpBB branch to run tests on
 
 on:
     push:
@@ -21,12 +21,12 @@ on:
 jobs:
     # START Basic Checks Job (EPV, code sniffer, images check, etc.)
     basic-checks:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
             matrix:
                 include:
-                    - php: '7.2'
-                      db: "none"
+                    - db: 'none'
+                      php: '8.1'
                       NOTESTS: 1
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
@@ -48,7 +48,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
+                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv
                   coverage: none
 
             - name: Setup environment for phpBB
@@ -89,44 +89,42 @@ jobs:
 
     # START MySQL and MariaDB Job
     mysql-tests:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
             matrix:
                 include:
-                    - php: '7.2'
-                      db: "mariadb:10.1"
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "mariadb:10.2"
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "mariadb:10.3"
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "mariadb:10.4"
-                    - php: '7.2'
-                      db: "mariadb:10.5"
-                    - php: '7.2'
-                      db: "mysql:5.6"
+                    - php: '8.1'
+                      db: "mariadb:10.6"
+                    - php: '8.1'
+                      db: "mariadb:10.9"
+                    - php: '8.1'
+                      db: "mariadb:10.10"
+                    - php: '8.1'
+                      db: "mariadb:10.11"
+                    - php: '8.1'
+                      db: "mysql:5.7"
                       db_alias: "MyISAM Tests"
                       MYISAM: 1
-                    - php: '7.2'
-                      db: "mysql:5.6"
-                    - php: '7.2'
-                      db: "mysql:5.7"
-                    - php: '7.3'
-                      db: "mysql:5.7"
-                    - php: '7.4'
-                      db: "mysql:5.7"
-                    - php: '7.4'
-                      db: "mysql:8.0"
-                    - php: '8.0'
-                      db: "mysql:5.7"
                     - php: '8.1'
-                      db: "mysql:5.7"
+                      db: "mysql:8.1"
                     - php: '8.2'
-                      db: "mysql:5.7"
+                      db: "mysql:8.0"
+                    - php: '8.2'
+                      db: "mariadb:10.2"
                     - php: '8.3'
                       db: "mysql:5.7"
+                    - php: '8.3'
+                      db: "mariadb:10.2"
                     - php: '8.4'
-                      db: "mysql:5.7"
+                      db: "mysql:8.0"
+                    - php: '8.4'
+                      db: "mariadb:10.3"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
@@ -209,38 +207,32 @@ jobs:
 
     # START PostgreSQL Job
     postgres-tests:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
             matrix:
                 include:
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "postgres:9.5"
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "postgres:9.6"
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "postgres:10"
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "postgres:11"
-                    - php: '7.2'
-                      db: "postgres:12"
-                    - php: '7.2'
-                      db: "postgres:13"
-                    - php: '7.3'
-                      db: "postgres:13"
-                    - php: '7.4'
-                      db: "postgres:13"
-                    - php: '8.0'
+                    - php: '8.1'
                       db: "postgres:12"
-                    - php: '8.0'
+                    - php: '8.1'
                       db: "postgres:13"
                     - php: '8.1'
                       db: "postgres:14"
+                    - php: '8.1'
+                      db: "postgres:15"
                     - php: '8.2'
-                      db: "postgres:14"
+                      db: "postgres:9.5"
                     - php: '8.3'
-                      db: "postgres:14"
+                      db: "postgres:9.5"
                     - php: '8.4'
-                      db: "postgres:14"
+                      db: "postgres:9.5"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
@@ -294,7 +286,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
+                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
                   coverage: none
 
             - name: Setup environment for phpBB
@@ -325,24 +317,27 @@ jobs:
 
     # START Other Tests Job (SQLite 3 and mssql)
     other-tests:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 include:
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "sqlite3"
-                    - php: '7.2'
+                    - php: '8.1'
                       db: "mcr.microsoft.com/mssql/server:2017-latest"
                       db_alias: 'MSSQL 2017'
-                    - php: '7.2'
-                      db: "mcr.microsoft.com/mssql/server:2019-latest"
+                    - php: '8.1'
+                      db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
                       db_alias: 'MSSQL 2019'
+                    - php: '8.1'
+                      db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
+                      db_alias: 'MSSQL 2022'
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
         services:
             mssql:
-                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
+                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
                 env:
                     SA_PASSWORD: "Pssw0rd_12"
                     ACCEPT_EULA: "y"
@@ -382,7 +377,7 @@ jobs:
               env:
                   MATRIX_DB: ${{ matrix.db }}
               run: |
-                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
+                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
                   then
                       db='mssql'
                   else
@@ -394,7 +389,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
+                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
                   coverage: none
 
             - name: Setup environment for phpBB
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This is the repository for the development of the Team Security extension for phpBB.
 
-[![Build Status](https://github.com/phpbb-extensions/teamsecurity/workflows/Tests/badge.svg)](https://github.com/phpbb-extensions/teamsecurity/actions)
+[![Build Status](https://github.com/phpbb-extensions/teamsecurity/actions/workflows/tests.yml/badge.svg)](https://github.com/phpbb-extensions/teamsecurity/actions)
 
 This extension adds passive security features to phpBB that allow the board's founder to watch for potential attacks against members of privileged groups, such as Administrators and Moderators.
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="true"
-         backupStaticAttributes="true"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../../../../tests/bootstrap.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+		 backupGlobals="true"
+		 backupStaticAttributes="false"
+		 colors="true"
+		 convertErrorsToExceptions="true"
+		 convertNoticesToExceptions="true"
+		 convertWarningsToExceptions="true"
+		 processIsolation="false"
+		 stopOnFailure="false"
+		 cacheResult="false"
+		 bootstrap="../../../../tests/bootstrap.php"
 >
+	<coverage>
+		<include>
+			<directory suffix=".php">./</directory>
+		</include>
+		<exclude>
+			<directory suffix=".php">./language/</directory>
+			<directory suffix=".php">./migrations/</directory>
+			<directory suffix=".php">./tests/</directory>
+		</exclude>
+	</coverage>
 	<testsuites>
 		<testsuite name="Extension Test Suite">
 			<directory suffix="_test.php">./tests</directory>
@@ -20,15 +31,4 @@
 			<directory suffix="_test.php">./tests/functional/</directory>
 		</testsuite>
 	</testsuites>
-
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">./</directory>
-			<exclude>
-				<directory suffix=".php">./language/</directory>
-				<directory suffix=".php">./migrations/</directory>
-				<directory suffix=".php">./tests/</directory>
-			</exclude>
-		</whitelist>
-	</filter>
 </phpunit>
diff --git a/tests/event/listener_base.php b/tests/event/listener_base.php
@@ -64,7 +64,7 @@ protected function setUp(): void
 	protected function set_listener()
 	{
 		$this->listener = $this->getMockBuilder('\phpbb\teamsecurity\event\listener')
-			->setMethods(array(
+			->onlyMethods(array(
 				'in_watch_group',
 				'send_message'
 			))
diff --git a/tests/ext_test.php b/tests/ext_test.php
@@ -10,10 +10,13 @@
 
 namespace phpbb\teamsecurity\tests;
 
+require_once __DIR__ . '/../ext.php';
+
 class ext_test extends \phpbb_database_test_case
 {
 	protected const TEAM_SECURITY = 'phpbb/teamsecurity';
 	protected $extension_manager;
+	protected $class_loader;
 
 	public function getDataSet()
 	{
@@ -24,7 +27,6 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		$this->db = null;
 		$this->extension_manager = $this->create_extension_manager();
 	}
 
@@ -53,16 +55,20 @@ public function test_disable()
 
 	protected function create_extension_manager()
 	{
-		global $phpbb_root_path, $php_ext;
+		$phpbb_root_path = __DIR__ . './../../../../';
+		$php_ext = 'php';
 
 		$config = new \phpbb\config\config(['version' => PHPBB_VERSION]);
 		$db = $this->new_dbal();
+		$db_doctrine = $this->new_doctrine_dbal();
 		$phpbb_dispatcher = new \phpbb_mock_event_dispatcher();
 		$factory = new \phpbb\db\tools\factory();
-		$db_tools = $factory->get($db);
+		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $php_ext);
+		$db_tools = $factory->get($db_doctrine);
 		$table_prefix = 'phpbb_';
 
 		$container = new \phpbb_mock_container_builder();
+		$container->set('event_dispatcher',  $phpbb_dispatcher);
 
 		$migrator = new \phpbb\db\migrator(
 			$container,
@@ -73,20 +79,19 @@ protected function create_extension_manager()
 			$phpbb_root_path,
 			$php_ext,
 			$table_prefix,
+			self::get_core_tables(),
 			[],
 			new \phpbb\db\migration\helper()
 		);
 		$container->set('migrator', $migrator);
-		$container->set('dispatcher', $phpbb_dispatcher);
 
 		return new \phpbb\extension\manager(
 			$container,
 			$db,
 			$config,
-			new \phpbb\filesystem\filesystem(),
+			$finder_factory,
 			'phpbb_ext',
 			$phpbb_root_path,
-			$php_ext,
 			null
 		);
 	}

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected function setUp(): void`
`64`	`64`	`protected function set_listener()`
`65`	`65`	`{`
`66`	`66`	`$this->listener = $this->getMockBuilder('\phpbb\teamsecurity\event\listener')`
`67`		`- ->setMethods(array(`
	`67`	`+ ->onlyMethods(array(`
`68`	`68`	`'in_watch_group',`
`69`	`69`	`'send_message'`
`70`	`70`	`))`