Merge branch 'release/3.2.4'

iMattPro · Aug 12, 2020 · fc12da1 · fc12da1
2 parents 7c6934c + 84ffe08
commit fc12da1
Show file tree

Hide file tree

Showing 13 changed files with 165 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.2.4 - 08-10-2020
+
+- Fixed an issue causing circular dependency errors when co-installed with mChat in phpBB 3.3.1.
+
 ## 3.2.3 - 03-13-2020
 
 - Minor fixes that might cause unexpected JavaScript behaviors in phpBB 3.3.x using jQuery 3.

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "Replace phpBB3's BBCode buttons with icons in an attractive and customizable toolbar. This extension also adds many new and useful custom BBCodes giving users more ways to customize their posts, including BBvideo (embed videos from dozens of media sites). Custom BBCodes can be arranged and sorted in any order and assigned to specific usergroups (such as Moderators and Admins only).",
 	"homepage": "https://github.com/iMattPro/abbc3",
-	"version": "3.2.3",
+	"version": "3.2.4",
 	"keywords": ["phpbb", "extension", "bbcodes", "bbvideo"],
 	"license": "GPL-2.0-only",
 	"authors": [
@@ -27,5 +27,8 @@
 			"directory": "/customise/db/extension/advanced_bbcode_box",
 			"filename": "version_check"
 		}
+	},
+	"require-dev": {
+		"phing/phing": "^2.16"
 	}
 }
diff --git a/composer.lock b/composer.lock
diff --git a/config/services.yml b/config/services.yml
@@ -33,7 +33,7 @@ services:
             - '@vse.abbc3.bbcodes_config'
             - '@vse.abbc3.bbcodes_display'
             - '@vse.abbc3.bbcodes_help'
-            - '@controller.helper'
+            - '@routing.helper'
             - '@template'
             - '@user'
             - ext/vse/abbc3/

diff --git a/event/listener.php b/event/listener.php
@@ -10,7 +10,7 @@
 
 namespace vse\abbc3\event;
 
-use phpbb\controller\helper;
+use phpbb\routing\helper;
 use phpbb\template\template;
 use phpbb\user;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abbc3",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "author": "Matt Friedman",
   "license": "GPL-2.0",
   "main": "gulpfile.js",
@@ -9,14 +9,14 @@
   },
   "devDependencies": {
     "gulp": "^4.0.2",
-    "gulp-clean-css": "^4.2.0",
+    "gulp-clean-css": "^4.3.0",
     "gulp-csslint": "^1.0.0",
     "gulp-jshint": "^2.0.0",
-    "gulp-rename": "^1.2.0",
+    "gulp-rename": "^1.4.0",
     "gulp-stylelint": "^10.0.0",
     "gulp-uglify": "^3.0.2",
     "gulp-watch": "^5.0.1",
-    "jshint": "^2.11.0",
+    "jshint": "^2.12.0",
     "jshint-stylish": "^2.0.1",
     "stylelint": "^12.0.1"
   }