Merge pull request #348 from iMattPro/updates

Some small updates

Author: iMattPro

.github/workflows/tests.yml

@@ -21,26 +21,26 @@ on:
 jobs:
     # START Basic Checks Job (EPV, code sniffer, images check, etc.)
     basic-checks:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 include:
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "none"
                       NOTESTS: 1
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 
@@ -89,7 +89,7 @@ jobs:
 
     # START MySQL and MariaDB Job
     mysql-tests:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 include:
@@ -123,6 +123,8 @@ jobs:
                       db: "mysql:5.7"
                     - php: '8.1'
                       db: "mysql:5.7"
+                    - php: '8.2'
+                      db: "mysql:5.7"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
@@ -152,14 +154,14 @@ jobs:
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 
@@ -168,7 +170,7 @@ jobs:
                   MATRIX_DB: ${{ matrix.db }}
               run: |
                   db=$(echo "${MATRIX_DB%%:*}")
-                  echo "::set-output name=db::$db"
+                  echo "db=$db" >> $GITHUB_OUTPUT
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -205,7 +207,7 @@ jobs:
 
     # START PostgreSQL Job
     postgres-tests:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 include:
@@ -221,6 +223,20 @@ jobs:
                       db: "postgres:12"
                     - php: '7.1'
                       db: "postgres:13"
+                    - php: '7.2'
+                      db: "postgres:13"
+                    - php: '7.3'
+                      db: "postgres:13"
+                    - php: '7.4'
+                      db: "postgres:13"
+                    - php: '8.0'
+                      db: "postgres:12"
+                    - php: '8.0'
+                      db: "postgres:13"
+                    - php: '8.1'
+                      db: "postgres:14"
+                    - php: '8.2'
+                      db: "postgres:14"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
@@ -252,14 +268,14 @@ jobs:
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 
@@ -268,7 +284,7 @@ jobs:
                   MATRIX_DB: ${{ matrix.db }}
               run: |
                   db=$(echo "${MATRIX_DB%%:*}")
-                  echo "::set-output name=db::$db"
+                  echo "db=$db" >> $GITHUB_OUTPUT
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -305,7 +321,7 @@ jobs:
 
     # START Other Tests Job (SQLite 3 and mssql)
     other-tests:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 include:
@@ -347,14 +363,14 @@ jobs:
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 
@@ -368,7 +384,7 @@ jobs:
                   else
                       db=$(echo "${MATRIX_DB%%:*}")
                   fi
-                  echo "::set-output name=db::$db"
+                  echo "db=$db" >> $GITHUB_OUTPUT
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2

controller/main_controller.php

@@ -173,6 +173,6 @@ public function display()
 		));
 
 		// Send all data to the template file
-		return $this->helper->render('boardrules_controller.html', $this->lang->lang('BOARDRULES'));
+		return $this->helper->render('@phpbb_boardrules/boardrules_controller.html', $this->lang->lang('BOARDRULES'));
 	}
 }

tests/controller/main_controller_test.php

@@ -20,7 +20,7 @@ class main_controller_test extends \phpbb_test_case
 	public function display_data()
 	{
 		return array(
-			array(200, 'boardrules_controller.html'),
+			array(200, '@phpbb_boardrules/boardrules_controller.html'),
 		);
 	}