Merge branch 'master' into patch

Author: iMattPro

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ on:
         type: string
       PHPBB_BRANCH:
         required: false
-        default: '3.3.x'
+        default: 'master'
         type: string
       SNIFF:
         required: false
@@ -61,11 +61,11 @@ on:
       PRIMARY_PHP_VERSION:
         required: false
         type: string
-        default: '7.2'
+        default: '8.1'
       PHP_VERSION_MATRIX:
         required: false
         type: string
-        default: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
+        default: '["8.1", "8.2", "8.3", "8.4"]'
     secrets:
       CODECOV_TOKEN:
         required: false
@@ -84,7 +84,7 @@ jobs:
     # START Basic Checks Job (EPV, code sniffer, images check, etc.)
     basic-checks:
         if: ${{ inputs.EPV == '1' || inputs.EXECUTABLE_FILES == '1' || inputs.IMAGE_ICC == '1' || inputs.SNIFF == '1' }}
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
             matrix:
                 include:
@@ -111,7 +111,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
@@ -153,32 +153,34 @@ jobs:
     # START MySQL and MariaDB Job
     mysql-tests:
         if: ${{ inputs.RUN_MYSQL_JOBS == '1' }}
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
           matrix:
             php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }}
-            db: ['mysql:5.7']
+            db: ['mysql:8.0', 'mysql:8.1', 'mariadb:10.5']
             include:
-              - php: ${{ inputs.PRIMARY_PHP_VERSION }}
-                db: 'mariadb:10.1'
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
                 db: 'mariadb:10.2'
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
                 db: 'mariadb:10.3'
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
                 db: 'mariadb:10.4'
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
-                db: 'mariadb:10.5'
+                db: 'mariadb:10.6'
+              - php: ${{ inputs.PRIMARY_PHP_VERSION }}
+                db: 'mariadb:10.9'
+              - php: ${{ inputs.PRIMARY_PHP_VERSION }}
+                db: 'mariadb:10.10'
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
-                db: 'mysql:5.6'
+                db: 'mariadb:10.11'
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
-                db: 'mysql:5.6'
+                db: 'mysql:5.7'
                 db_alias: 'MyISAM Tests'
                 MYISAM: 1
               - php: ${{ startsWith(inputs.PRIMARY_PHP_VERSION, '7') && '7.4' || inputs.PRIMARY_PHP_VERSION }}
-                db: 'mysql:8.0'
+                db: 'mysql:5.7'
                 COVERAGE: ${{ inputs.CODECOV == '1' && '1' || '0' }}
-                db_alias: ${{ inputs.CODECOV == '1' && 'mysql:8.0 with Coverage' || 'mysql:8.0' }}
+                db_alias: ${{ inputs.CODECOV == '1' && 'mysql:5.7 with Coverage' || 'mysql:5.7' }}
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
@@ -271,7 +273,7 @@ jobs:
               run: |
                   if [ $COVERAGE == '1' ]
                   then
-                      sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<filter>\n\t\t<whitelist>\n\t\t\t<directory>..\/<\/directory>\n\t\t\t<exclude>\n\t\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t\t<\/exclude>\n\t\t<\/whitelist>\n\t<\/filter>/g;p;}' .github/phpunit-$DB-github.xml &> phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml
+                      sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<coverage>\n\t\t<include>\n\t\t\t<directory>..\/<\/directory>\n\t\t<\/include>\n\t\t<exclude>\n\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t<\/exclude>\n\t<\/coverage>/g;p;}' .github/phpunit-$DB-github.xml &> phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml
                   else
                       mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
                   fi
@@ -316,11 +318,11 @@ jobs:
     # START PostgreSQL Job
     postgres-tests:
         if: ${{ inputs.RUN_PGSQL_JOBS == '1' }}
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
           matrix:
             php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }}
-            db: ['postgres:14']
+            db: ['postgres:15']
             include:
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
                 db: 'postgres:9.5'
@@ -334,12 +336,14 @@ jobs:
                 db: 'postgres:12'
               - php: ${{ inputs.PRIMARY_PHP_VERSION }}
                 db: 'postgres:13'
+              - php: ${{ inputs.PRIMARY_PHP_VERSION }}
+                db: 'postgres:14'
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
         services:
             postgres:
-                image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && 'postgres:10' || matrix.db }}
+                image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }}
                 env:
                     POSTGRES_HOST: localhost
                     POSTGRES_USER: postgres
@@ -387,7 +391,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
@@ -452,11 +456,12 @@ jobs:
                       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:2022-CU13-ubuntu-22.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }}
+                image: ${{ 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:2022-CU13-ubuntu-22.04' || matrix.db }}
                 env:
                     SA_PASSWORD: "Pssw0rd_12"
                     ACCEPT_EULA: "y"
@@ -496,7 +501,7 @@ jobs:
               env:
                   MATRIX_DB: ${{ matrix.db }}
               run: |
-                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
+                  if [ $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
@@ -508,7 +513,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
@@ -592,7 +597,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql
+                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium
                   ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }}
                   coverage: none
 
@@ -627,14 +632,16 @@ jobs:
                   icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\files" /grant "Users:(OI)(CI)F" /T
                   icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\images" /grant "Users:(OI)(CI)F" /T
                   icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\store" /grant "Users:(OI)(CI)F" /T
+                  icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\ext" /grant Users:F /T
+                  icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\vendor-ext" /grant Users:F /T
+                  icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\composer-ext.json" /grant Users:F /T
+                  icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\composer-ext.lock" /grant Users:F /T
                   $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
                   $acl = Get-ACL "${env:TEMP_DIR}"
                   $acl.AddAccessRule($accessRule)
                   Set-ACL -Path "${env:TEMP_DIR}" -ACLObject $acl
                   cd ${env:GITHUB_WORKSPACE}\phpBB3\phpBB
                   php ..\composer.phar install
-                  php ..\composer.phar remove phpunit/dbunit --dev --update-with-dependencies
-                  php ..\composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 doctrine/instantiator:^1.4 --dev --update-with-all-dependencies --ignore-platform-reqs
                   cd ..
 
             - name: Setup database

README.md

@@ -2,9 +2,7 @@
 
 Reusable GitHub Actions workflow for testing phpBB extensions across multiple environments.
 
-This repository provides a reusable GitHub Actions workflow designed for phpBB extension developers. It supports testing across PHP versions 7.2 through 8.x and database engines including MySQL, PostgreSQL, SQLite, and Microsoft SQL Server. Optional checks include PHP CodeSniffer, Extension Pre Validator (EPV), executable file detection, image ICC profile removal, and code coverage reporting via Codecov.
-
-# How to Use
+This repository provides a reusable GitHub Actions workflow designed for phpBB extension developers. It supports testing across PHP 8.x and database engines including MySQL, PostgreSQL, SQLite, and Microsoft SQL Server. Optional checks include PHP CodeSniffer, Extension Pre Validator (EPV), executable file detection, image ICC profile removal, and code coverage reporting via Codecov.
 
 On GitHub.com, go to your extension's repository, click **Add file → Create new file**, name it `.github/workflows/tests.yml`, add the workflow content shown below, and commit the file. Make sure to replace `acme/demo` with your actual extension vendor/package name, and optionally you may adjust any of the branch names and other checks.
 
@@ -28,7 +26,7 @@ on:
 jobs:
     call-tests:
         name: Extension tests
-        uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x # The phpBB branch to run tests with
+        uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master # The phpBB branch to run tests with
         with:
             EXTNAME: acme/demo   # Your extension vendor/package name
 ```
@@ -40,10 +38,10 @@ Use the test-framework branch that matches the phpBB version you're developing f
 - `3.3.x`: Targets the phpBB 3.3.x release line.
 - `master`: Targets the latest development version of phpBB (`master` branch).
 
-> ‼️ Whichever branch of this framework you choose, be sure it is appended to the `uses:` line after the `@` symbol. For example, if you're targeting the `3.3.x` branch:
+> ‼️ Whichever branch of this framework you choose, be sure it is appended to the `uses:` line after the `@` symbol. For example, if you're targeting the `master` branch:
 > 
 > ```yaml
-> uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+> uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
 > ```
 
 ## Requirements
@@ -58,19 +56,19 @@ You can fine-tune this workflow with several optional arguments in the `with` se
 ```yaml
 call-tests:
     name: Extension tests
-    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
     with:
         EXTNAME: acme/demo   # Your extension vendor/package name
 
         # OPTIONAL CONFIGURATIONS BELOW
         # The following arguments are optional and can be omitted if not needed.
 
         # The phpBB branch to use when running tests.
-        # Default is '3.3.x', which this framework is designed for.
-        # If using a different branch, ensure it's compatible with 3.3.x.
-        # To test with phpBB's master branch, refer to the Branches section of this README.
-        # Default: '3.3.x'
-        PHPBB_BRANCH: '3.3.x'
+        # Default is 'master', which this framework is designed for.
+        # If using a different branch, ensure it's compatible with master.
+        # To test with phpBB's 3.3.x branch, refer to the Branches section of this README.
+        # Default: 'master'
+        PHPBB_BRANCH: 'master'
 
         # Run phpBB's EPV (Extension Pre Validator)? 1 (yes) or 0 (no)
         # Default: 1
@@ -117,16 +115,16 @@ call-tests:
         RUN_COMPOSER_INSTALL: 0
 
         # CUSTOMISE PHP VERSIONS
-        # To override the default PHP versions tested (7.2 through 8.4):
+        # To override the default PHP versions tested (8.1 through 8.4):
 
         # Preferred PHP version used for all test jobs.
-        # Default: '7.2'
-        PRIMARY_PHP_VERSION: '7.2'
+        # Default: '8.1'
+        PRIMARY_PHP_VERSION: '8.1'
 
         # The MySQL and PostgreSQL jobs run tests across multiple PHP versions.
         # List the PHP versions you want your extension tested with.
-        # Default: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
-        PHP_VERSION_MATRIX: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
+        # Default: '["8.1", "8.2", "8.3", "8.4"]'
+        PHP_VERSION_MATRIX: '["8.1", "8.2", "8.3", "8.4"]'
 
         # Generate a code coverage report (see documentation below)? 1 (yes) or 0 (no)
         # Default: 0
@@ -160,7 +158,7 @@ call-tests:
 ```yaml
 call-tests:
     name: Extension tests
-    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
     with:
         EXTNAME: acme/demo
         RUN_PGSQL_JOBS: 0
@@ -172,7 +170,7 @@ call-tests:
 ```yaml
 call-tests:
     name: Extension tests
-    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
     with:
         EXTNAME: acme/demo
         RUN_MYSQL_JOBS: 0
@@ -186,7 +184,7 @@ call-tests:
 ```yaml
 call-tests:
     name: Extension tests
-    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
     with:
         EXTNAME: acme/demo
         RUN_FUNCTIONAL_TESTS: 0
@@ -197,7 +195,7 @@ call-tests:
 ```yaml
 call-tests:
     name: Extension tests
-    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
     with:
         EXTNAME: acme/demo
         PRIMARY_PHP_VERSION: '8.0'
@@ -223,7 +221,7 @@ This test framework supports code coverage reporting through [Codecov.io](https:
 ```yaml
 call-tests:
     name: Extension tests
-    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
     with:
         EXTNAME: acme/demo
         CODECOV: 1
@@ -263,7 +261,7 @@ call-tests:
     uses: your-org/your-repo/.github/workflows/tests.yml@your-branch
     with:
         EXTNAME: acme/demo
-        PHPBB_BRANCH: 3.3.x
+        PHPBB_BRANCH: master
 ```
 
 # Contributing