From 170821c9318eae0e309b2a5a3b3a0da3e562d5fb Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 24 Jan 2024 09:53:49 -0800 Subject: [PATCH 1/2] Update test environment Signed-off-by: Matt Friedman --- .github/workflows/tests.yml | 34 +++++++++++++++++----------------- composer.json | 3 ++- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ebebc64..9327641 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -93,24 +93,22 @@ jobs: strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "mariadb:10.1" - - php: '7.1' + - php: '7.2' db: "mariadb:10.2" - - php: '7.1' + - php: '7.2' db: "mariadb:10.3" - - php: '7.1' + - php: '7.2' db: "mariadb:10.4" - - php: '7.1' + - php: '7.2' db: "mariadb:10.5" - - php: '7.1' + - php: '7.2' db: "mysql:5.6" db_alias: "MyISAM Tests" MYISAM: 1 - - php: '7.1' + - php: '7.2' db: "mysql:5.6" - - php: '7.1' - db: "mysql:5.7" - php: '7.2' db: "mysql:5.7" COVERAGE: 1 @@ -127,6 +125,8 @@ jobs: db: "mysql:5.7" - php: '8.2' db: "mysql:5.7" + - php: '8.3' + db: "mysql:5.7" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -244,18 +244,16 @@ jobs: strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "postgres:9.5" - - php: '7.1' + - php: '7.2' db: "postgres:9.6" - - php: '7.1' + - php: '7.2' db: "postgres:10" - - php: '7.1' + - php: '7.2' db: "postgres:11" - - php: '7.1' + - php: '7.2' db: "postgres:12" - - php: '7.1' - db: "postgres:13" - php: '7.2' db: "postgres:13" - php: '7.3' @@ -270,6 +268,8 @@ jobs: db: "postgres:14" - php: '8.2' db: "postgres:14" + - php: '8.3' + db: "postgres:14" name: PHP ${{ matrix.php }} - ${{ matrix.db }} @@ -358,7 +358,7 @@ jobs: strategy: matrix: include: - - php: '7.1' + - php: '7.2' db: "sqlite3" - php: '7.2' db: "mcr.microsoft.com/mssql/server:2017-latest" diff --git a/composer.json b/composer.json index a8eab6b..764f878 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,8 @@ "version-check": { "host": "www.phpbb.com", "directory": "/customise/db/extension/ads", - "filename": "version_check" + "filename": "version_check", + "ssl": true } } } From b762b366ed1ccec776aa712ab8356885a740eaa4 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 24 Jan 2024 09:54:09 -0800 Subject: [PATCH 2/2] Update help for Pop Up location Signed-off-by: Matt Friedman --- language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/common.php b/language/en/common.php index d97582a..ebe45c8 100644 --- a/language/en/common.php +++ b/language/en/common.php @@ -61,7 +61,7 @@ 'AD_AFTER_FOOTER_NAVBAR' => 'After footer navbar', 'AD_AFTER_FOOTER_NAVBAR_DESC' => 'Displays on every page after footer navigation bar.', 'AD_POP_UP' => 'Pop-up', - 'AD_POP_UP_DESC' => 'Displays once per day when user visits this board as overlaying box. User need to close this box to continue to the content. Please, be aware, that this kind of advertisement is very obtrusive to the user!', + 'AD_POP_UP_DESC' => 'Displays once per day when user visits this board as overlaying box. User need to close this box to continue to the content. Please, be aware, that this kind of advertisement is very obtrusive to the user! This location does not support JavaScript code.', 'AD_SLIDE_UP' => 'Slide up', 'AD_SLIDE_UP_DESC' => 'Displays on every page after user scrolls below main content. Slides up from the bottom.', 'AD_SCRIPTS' => 'Scripts',