From 6c521dfeded0c078c2e3f8520e82a5ccbbb9f06f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 10 Jun 2020 15:52:16 -0700 Subject: [PATCH 1/8] remove insight badge [ci skip] --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0116c4ef..668f3e80 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ Replace phpBB3's BBCode buttons with icons in an attractive and customizable too [![Build Status](https://img.shields.io/travis/iMattPro/abbc3/master.svg?style=flat)](https://travis-ci.org/iMattPro/abbc3) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/iMattPro/abbc3/master.svg?style=flat)](https://scrutinizer-ci.com/g/iMattPro/abbc3/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/iMattPro/abbc3/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/iMattPro/abbc3/?branch=master) -[![SymfonyInsight Stars](https://img.shields.io/symfony/i/stars/ebc35321-c3fb-4a25-8db1-89ee64bcf58b.svg?label=SymfonyInsight)](https://insight.symfony.com/projects/ebc35321-c3fb-4a25-8db1-89ee64bcf58b) [![Dev dependencies](https://img.shields.io/david/dev/iMattPro/abbc3.svg)](https://david-dm.org/iMattPro/abbc3?type=dev) [![Latest Stable Version](https://poser.pugx.org/vse/abbc3/v/stable)](https://www.phpbb.com/customise/db/extension/advanced_bbcode_box/) From 78d045033d770b95e2857ed64569b3242c5c2662 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 10 Jun 2020 17:51:54 -0700 Subject: [PATCH 2/8] Update dependencies [ci skip] --- package-lock.json | 76 +++++++++++++++++++++-------------------------- package.json | 6 ++-- 2 files changed, 37 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4eb51a0f..575aa477 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "abbc3", - "version": "3.2.2", + "version": "3.2.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -996,9 +996,9 @@ } }, "clean-css": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", - "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", + "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", "dev": true, "requires": { "source-map": "~0.6.0" @@ -1499,7 +1499,7 @@ "domelementtype": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", + "integrity": "sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8=", "dev": true }, "domhandler": { @@ -2823,20 +2823,12 @@ } }, "gonzales-pe": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.4.tgz", - "integrity": "sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz", + "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==", "dev": true, "requires": { - "minimist": "1.1.x" - }, - "dependencies": { - "minimist": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz", - "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=", - "dev": true - } + "minimist": "^1.2.5" } }, "graceful-fs": { @@ -2886,12 +2878,12 @@ } }, "gulp-clean-css": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.2.0.tgz", - "integrity": "sha512-r4zQsSOAK2UYUL/ipkAVCTRg/2CLZ2A+oPVORopBximRksJ6qy3EX1KGrIWT4ZrHxz3Hlobb1yyJtqiut7DNjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz", + "integrity": "sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg==", "dev": true, "requires": { - "clean-css": "4.2.1", + "clean-css": "4.2.3", "plugin-error": "1.0.1", "through2": "3.0.1", "vinyl-sourcemaps-apply": "0.2.1" @@ -3097,7 +3089,7 @@ "gulp-rename": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz", - "integrity": "sha1-3hxxjnxAla6GH3KW708ySGSCQL0=", + "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==", "dev": true }, "gulp-stylelint": { @@ -3980,9 +3972,9 @@ "dev": true }, "jshint": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz", - "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.1.tgz", + "integrity": "sha512-WXWePB8ssAH3DlD05IoqolsY6arhbll/1+i2JkRPpihQAuiNaR/gSt8VKIcxpV5m6XChP0hCwESQUqpuQMA8Tg==", "dev": true, "requires": { "cli": "~1.0.0", @@ -4037,9 +4029,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -4051,9 +4043,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "known-css-properties": { @@ -4497,9 +4489,9 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "minimist-options": { @@ -4534,12 +4526,12 @@ } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" } }, "ms": { @@ -5290,12 +5282,12 @@ } }, "postcss-sass": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.2.tgz", - "integrity": "sha512-hcRgnd91OQ6Ot9R90PE/khUDCJHG8Uxxd3F7Y0+9VHjBiJgNv7sK5FxyHMCBtoLmmkzVbSj3M3OlqUfLJpq0CQ==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz", + "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==", "dev": true, "requires": { - "gonzales-pe": "^4.2.4", + "gonzales-pe": "^4.3.0", "postcss": "^7.0.21" } }, diff --git a/package.json b/package.json index c97132b8..db903b17 100644 --- a/package.json +++ b/package.json @@ -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.11.1", "jshint-stylish": "^2.0.1", "stylelint": "^12.0.1" } From a6e2ab001d2bd1c6bb5540d5b46dcabf3fedc246 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 14 Jul 2020 21:54:50 -0700 Subject: [PATCH 3/8] Update tests --- tests/event/load_language_on_setup_test.php | 2 +- tests/functional/acp_bbcodes_test.php | 4 ++-- tests/functional/bbcode_posting_test.php | 4 ++-- tests/functional/bbcode_wizard_test.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/event/load_language_on_setup_test.php b/tests/event/load_language_on_setup_test.php index ce91bbec..0b7ea46c 100644 --- a/tests/event/load_language_on_setup_test.php +++ b/tests/event/load_language_on_setup_test.php @@ -72,7 +72,7 @@ public function test_load_language_on_setup($lang_set_ext, $expected_contains) foreach ($expected_contains as $expected) { - $this->assertContains($expected, $lang_set_ext); + self::assertContains($expected, $lang_set_ext); } } } diff --git a/tests/functional/acp_bbcodes_test.php b/tests/functional/acp_bbcodes_test.php index d88b7a89..681afc28 100644 --- a/tests/functional/acp_bbcodes_test.php +++ b/tests/functional/acp_bbcodes_test.php @@ -33,7 +33,7 @@ public function setUp(): void public function test_bbcodes_page() { $crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&mode=bbcodes&sid=' . $this->sid); - $this->assertContains('BBvideo', $crawler->filter('#acp_bbcodes')->text()); + self::assertStringContainsString('BBvideo', $crawler->filter('#acp_bbcodes')->text()); } /** @@ -44,6 +44,6 @@ public function test_bbcodes_page() public function test_edit_bbcodes_page() { $crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&mode=bbcodes&action=edit&bbcode=13&sid=' . $this->sid); - $this->assertContains($this->lang('ACP_GROUPS_PERMISSIONS'), $crawler->filter('#acp_bbcodes')->text()); + self::assertStringContainsString($this->lang('ACP_GROUPS_PERMISSIONS'), $crawler->filter('#acp_bbcodes')->text()); } } diff --git a/tests/functional/bbcode_posting_test.php b/tests/functional/bbcode_posting_test.php index f70c3d89..a0b0af37 100644 --- a/tests/functional/bbcode_posting_test.php +++ b/tests/functional/bbcode_posting_test.php @@ -31,7 +31,7 @@ public function test_posting_custom_bbcode() $post = $this->create_topic(2, 'Test Topic 1', '[highlight=yellow]This is a test topic posted by the testing framework.[/highlight]'); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('background-color:yellow', $crawler->filter('div.content > span')->attr('style')); - $this->assertContains('This is a test topic posted by the testing framework.', $crawler->filter('html')->text()); + self::assertStringContainsString('background-color:yellow', $crawler->filter('div.content > span')->attr('style')); + self::assertStringContainsString('This is a test topic posted by the testing framework.', $crawler->filter('html')->text()); } } diff --git a/tests/functional/bbcode_wizard_test.php b/tests/functional/bbcode_wizard_test.php index 53ee1af6..565b85d7 100644 --- a/tests/functional/bbcode_wizard_test.php +++ b/tests/functional/bbcode_wizard_test.php @@ -27,6 +27,6 @@ public function test_wizard_fails() { $crawler = self::request('GET', 'app.php/wizard/bbcode/bbvideo', array(), false); self::assert_response_status_code(404); - $this->assertContains($this->lang('GENERAL_ERROR'), $crawler->text()); + self::assertStringContainsString($this->lang('GENERAL_ERROR'), $crawler->text()); } } From 7753c42587ab782cd7ec3b11e3a89eb30ad2bb60 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 14 Jul 2020 21:55:00 -0700 Subject: [PATCH 4/8] Update composer.json and lock --- composer.json | 3 ++ composer.lock | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 82a8f746..0db4650c 100644 --- a/composer.json +++ b/composer.json @@ -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 index b09ac062..7120d2ed 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8c5adae735ba3b169fa1e0b6cb8b0af3", + "content-hash": "a3ed663afff580aed230e613f3ffdb7a", "packages": [ { "name": "composer/installers", @@ -127,7 +127,101 @@ "time": "2017-12-29T09:13:20+00:00" } ], - "packages-dev": [], + "packages-dev": [ + { + "name": "phing/phing", + "version": "2.16.3", + "source": { + "type": "git", + "url": "https://github.com/phingofficial/phing.git", + "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/b34c2bf9cd6abd39b4287dee31e68673784c8567", + "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "ext-pdo_sqlite": "*", + "mikey179/vfsstream": "^1.6", + "pdepend/pdepend": "2.x", + "pear/archive_tar": "1.4.x", + "pear/http_request2": "dev-trunk", + "pear/net_growl": "dev-trunk", + "pear/pear-core-minimal": "1.10.1", + "pear/versioncontrol_git": "@dev", + "pear/versioncontrol_svn": "~0.5", + "phpdocumentor/phpdocumentor": "2.x", + "phploc/phploc": "~2.0.6", + "phpmd/phpmd": "~2.2", + "phpunit/phpunit": ">=3.7", + "sebastian/git": "~1.0", + "sebastian/phpcpd": "2.x", + "siad007/versioncontrol_hg": "^1.0", + "simpletest/simpletest": "^1.1", + "squizlabs/php_codesniffer": "~2.2", + "symfony/yaml": "^2.8 || ^3.1 || ^4.0" + }, + "suggest": { + "pdepend/pdepend": "PHP version of JDepend", + "pear/archive_tar": "Tar file management class", + "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository", + "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system", + "phpdocumentor/phpdocumentor": "Documentation Generator for PHP", + "phploc/phploc": "A tool for quickly measuring the size of a PHP project", + "phpmd/phpmd": "PHP version of PMD tool", + "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information", + "phpunit/phpunit": "The PHP Unit Testing Framework", + "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code", + "siad007/versioncontrol_hg": "A library for interfacing with Mercurial repositories.", + "tedivm/jshrink": "Javascript Minifier built in PHP" + }, + "bin": [ + "bin/phing" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.16.x-dev" + } + }, + "autoload": { + "classmap": [ + "classes/phing/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "classes" + ], + "license": [ + "LGPL-3.0-only" + ], + "authors": [ + { + "name": "Michiel Rook", + "email": "mrook@php.net" + }, + { + "name": "Phing Community", + "homepage": "https://www.phing.info/trac/wiki/Development/Contributors" + } + ], + "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", + "homepage": "https://www.phing.info/", + "keywords": [ + "build", + "phing", + "task", + "tool" + ], + "time": "2020-02-03T18:50:54+00:00" + } + ], "aliases": [], "minimum-stability": "stable", "stability-flags": [], From ca2499e9a622cb649cab466c62a22f51644dae2c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 10 Aug 2020 13:02:06 -0700 Subject: [PATCH 5/8] Replace controller helper with routing helper --- config/services.yml | 2 +- event/listener.php | 2 +- tests/event/listener_base.php | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/services.yml b/config/services.yml index 519b024b..2a2e4210 100644 --- 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 index a25e4eb9..d17367be 100644 --- 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/tests/event/listener_base.php b/tests/event/listener_base.php index d0b30112..5b6c28f1 100644 --- a/tests/event/listener_base.php +++ b/tests/event/listener_base.php @@ -24,8 +24,8 @@ class listener_base extends \phpbb_test_case /** @var \phpbb\config\config */ protected $config; - /** @var \phpbb\controller\helper|\PHPUnit_Framework_MockObject_MockObject */ - protected $controller_helper; + /** @var \phpbb\routing\helper|\PHPUnit_Framework_MockObject_MockObject */ + protected $helper; /** @var \vse\abbc3\event\listener */ protected $listener; @@ -70,10 +70,10 @@ public function setUp() ->getMock(); $this->user->data['username'] = 'admin'; - $this->controller_helper = $this->getMockBuilder('\phpbb\controller\helper') + $this->helper = $this->getMockBuilder('\phpbb\routing\helper') ->disableOriginalConstructor() ->getMock(); - $this->controller_helper->expects($this->atMost(3)) + $this->helper->expects($this->atMost(3)) ->method('route') ->willReturnCallback(function ($route, array $params = array()) { return $route . '#' . serialize($params); @@ -93,7 +93,7 @@ protected function set_listener() $this->bbcodes_config, $this->bbcodes_display, $this->bbcodes_help, - $this->controller_helper, + $this->helper, $this->template, $this->user, $this->ext_root_path From 1ae8a9db619234a1b2e59f4822e4a45562ef1d99 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 10 Aug 2020 13:20:51 -0700 Subject: [PATCH 6/8] Remove UI tests --- tests/ui/{ui_test.php => ui_test_removed.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/ui/{ui_test.php => ui_test_removed.php} (100%) diff --git a/tests/ui/ui_test.php b/tests/ui/ui_test_removed.php similarity index 100% rename from tests/ui/ui_test.php rename to tests/ui/ui_test_removed.php From 12131fb3cac6fdc7573a7dea0170435026315561 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 10 Aug 2020 13:43:35 -0700 Subject: [PATCH 7/8] jshint update [ci skip] --- package-lock.json | 16 ++++++++++++---- package.json | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 575aa477..6ea52337 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3972,19 +3972,27 @@ "dev": true }, "jshint": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.1.tgz", - "integrity": "sha512-WXWePB8ssAH3DlD05IoqolsY6arhbll/1+i2JkRPpihQAuiNaR/gSt8VKIcxpV5m6XChP0hCwESQUqpuQMA8Tg==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz", + "integrity": "sha512-TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA==", "dev": true, "requires": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", - "lodash": "~4.17.11", + "lodash": "~4.17.19", "minimatch": "~3.0.2", "shelljs": "0.3.x", "strip-json-comments": "1.0.x" + }, + "dependencies": { + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true + } } }, "jshint-stylish": { diff --git a/package.json b/package.json index ba0f11ff..6de1d5c8 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "gulp-stylelint": "^10.0.0", "gulp-uglify": "^3.0.2", "gulp-watch": "^5.0.1", - "jshint": "^2.11.1", + "jshint": "^2.12.0", "jshint-stylish": "^2.0.1", "stylelint": "^12.0.1" } From 84ffe088dbcbd9c9d3d911a4cfa785e4d61e6459 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 10 Aug 2020 13:51:43 -0700 Subject: [PATCH 8/8] 3.2.4 bump version to 3.2.4 --- CHANGELOG.md | 4 ++++ composer.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c859e50d..c7660ba2 100644 --- 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 index 86b02d28..8eb5904b 100644 --- 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": [ diff --git a/package-lock.json b/package-lock.json index ea073492..c208b560 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "abbc3", - "version": "3.2.3", + "version": "3.2.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6de1d5c8..583f4923 100644 --- 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",