Merge branch 'master' into dev/4.0

Signed-off-by: Matt Friedman <[email protected]> # Conflicts: # .github/workflows/tests.yml
phpbb-extensions · Jun 12, 2024 · cfc36e2 · cfc36e2
2 parents 3e25be5 + b4053c5
commit cfc36e2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -35,14 +35,14 @@ jobs:
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 
@@ -156,14 +156,14 @@ jobs:
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 
@@ -295,14 +295,14 @@ jobs:
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 
@@ -393,14 +393,14 @@ jobs:
 
         steps:
             - name: Checkout phpBB
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: phpbb/phpbb
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
             - name: Checkout extension
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
 

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "An extension which allows you to create a set of rules for your phpBB forum",
 	"homepage": "https://www.phpbb.com/customise/db/extension/boardrules/",
-	"version": "3.0.1",
+	"version": "3.0.2-dev",
 	"keywords": ["phpbb", "extension", "rules"],
 	"license": "GPL-2.0-only",
 	"authors": [
@@ -38,7 +38,7 @@
 	"extra": {
 		"display-name": "Board Rules",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.3.2"
+			"phpbb/phpbb": ">=3.3.2,<4.0.0@dev"
 		},
 		"version-check": {
 			"host": "www.phpbb.com",

diff --git a/ext.php b/ext.php
@@ -32,13 +32,15 @@ class ext extends \phpbb\extension\base
 	* the minimum version required by this extension:
 	*
 	* Requires phpBB 3.3.2 due to using role_exists check in permission migration.
+	* Not compatible with phpBB4 due to use of deprecated or changed functions, classes and Icons
 	*
 	* @return bool
 	* @access public
 	*/
 	public function is_enableable()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, '3.3.2', '>=');
+		return phpbb_version_compare(PHPBB_VERSION, '3.3.2', '>=')
+			&& phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '<');
 	}
 
 	/**