Merge pull request #177 from iMattPro/updates

iMattPro · web-flow · commit a6e49c49aed1 · 2023-05-12T06:52:39.000-07:00
testing updates
diff --git a/.github/workflows/tests.yml b/.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
diff --git a/README.md b/README.md
@@ -39,4 +39,4 @@ Pages can convert/import data from [Static Pages MOD 1.0.3](https://www.phpbb.co
 Note: Pages will keep a backup of the Static Pages MOD data in a database table named `pages_mod_backup`. Pages will never delete or alter this backup table. Pages has not been tested with any other similar MODs.
 
 ## License
-[GNU General Public License v2](http://opensource.org/licenses/GPL-2.0)
+[GNU General Public License v2](https://opensource.org/licenses/GPL-2.0)
diff --git a/controller/main_controller.php b/controller/main_controller.php
@@ -90,6 +90,7 @@ public function display($route)
 		));
 
 		// Send all data to the template file
+		// We do not use @phpbb_pages to allow templates from outside the extension
 		return $this->helper->render($page->get_template(), $page_title);
 	}
 
diff --git a/entity/page.php b/entity/page.php
@@ -481,7 +481,7 @@ public function set_order($order)
 	*/
 	public function get_template()
 	{
-		return (!empty($this->data['page_template'])) ? (string) $this->data['page_template'] : 'pages_default.html';
+		return !empty($this->data['page_template']) ? (string) $this->data['page_template'] : 'pages_default.html';
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ public function display($route)`
`90`	`90`	`));`
`91`	`91`
`92`	`92`	`// Send all data to the template file`
	`93`	`+ // We do not use @phpbb_pages to allow templates from outside the extension`
`93`	`94`	`return $this->helper->render($page->get_template(), $page_title);`
`94`	`95`	`}`
`95`	`96`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ public function set_order($order)`
`481`	`481`	`*/`
`482`	`482`	`public function get_template()`
`483`	`483`	`{`
`484`		`- return (!empty($this->data['page_template'])) ? (string) $this->data['page_template'] : 'pages_default.html';`
	`484`	`+ return !empty($this->data['page_template']) ? (string) $this->data['page_template'] : 'pages_default.html';`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`/**`