Merge branch 'master' into dev/4.0

Author: iMattPro

README.md

@@ -4,7 +4,6 @@ This is the repository for the development of the Topic Prefixes phpBB extension
 
 [![Build Status](https://github.com/phpbb-extensions/topicprefixes/actions/workflows/tests.yml/badge.svg)](https://github.com/phpbb-extensions/topicprefixes/actions)
 [![codecov](https://codecov.io/gh/phpbb-extensions/topicprefixes/branch/master/graph/badge.svg?token=Dc0GWOeQWj)](https://codecov.io/gh/phpbb-extensions/topicprefixes)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/phpbb-extensions/topicprefixes/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/phpbb-extensions/topicprefixes/?branch=master)
 
 The phpBB Topic Prefixes extension allows phpBB board administrators to create topic prefix tags that users can easily add to their topic titles. Features include:
 

adm/style/acp_topic_prefixes.css

@@ -0,0 +1,12 @@
+.tp-toggle-on,
+.tp-toggle-off {
+	font-weight: 900;
+}
+
+.tp-toggle-on:before {
+	content: "\f205";
+}
+
+.tp-toggle-off:before {
+	content: "\f204";
+}

adm/style/acp_topic_prefixes.html

@@ -34,10 +34,7 @@ <h1>{{ lang('TOPIC_PREFIXES') }}</h1>
 				<td><strong>{{ prefix.PREFIX_TAG }}</strong></td>
 				<td>
 					<a href="{{ prefix.U_EDIT }}" style="text-decoration: none" title="{{ lang('TOPIC_PREFIX_TOGGLE_STATE') }}" data-ajax="tp_toggle">
-						{{ Icon('font', {
-							'toggle-on': prefix.PREFIX_ENABLED,
-							'toggle-off': true
-						}, '', true, 'fas acp-icon') }}
+						<i class="fa fa-fw tp-toggle-{{ prefix.PREFIX_ENABLED ? 'on' : 'off' }} acp-icon"></i>
 					</a>
 				</td>
 				<td class="actions">
@@ -71,4 +68,5 @@ <h1>{{ lang('TOPIC_PREFIXES') }}</h1>
 {% endif %}
 
 {% INCLUDEJS '@phpbb_topicprefixes/acp_topic_prefixes.js' %}
+{% INCLUDECSS '@phpbb_topicprefixes/acp_topic_prefixes.css' %}
 {% include 'overall_footer.html' %}

adm/style/acp_topic_prefixes.js

@@ -1,9 +1,8 @@
-(function($) {
-
+(function() {
 	'use strict';
 
-	$('#select_forum').on('change', function() {
-		$(this).closest('form').trigger('submit');
+	document.getElementById('select_forum').addEventListener('change', function() {
+		this.closest('form').submit();
 	});
 
 	phpbb.addAjaxCallback('tp_toggle', function(res) {
@@ -12,8 +11,7 @@
 		}
 
 		const icon = this.querySelector('i');
-		icon.classList.toggle('fa-toggle-on');
-		icon.classList.toggle('fa-toggle-off');
+		icon.classList.toggle('tp-toggle-on');
+		icon.classList.toggle('tp-toggle-off');
 	});
-
-})(jQuery);
+})();

composer.json

@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "An official phpBB extension for topic prefixes.",
 	"homepage": "https://www.phpbb.com/customise/db/extension/topicprefixes/",
-	"version": "1.1.0-dev",
+	"version": "1.0.2-dev",
 	"license": "GPL-2.0-only",
 	"authors": [
 		{
@@ -18,7 +18,7 @@
 		}
 	],
 	"require": {
-		"php": ">=8.1",
+		"php": ">=5.4",
 		"composer/installers": "^1.0 || ^2.0"
 	},
 	"require-dev": {
@@ -27,16 +27,13 @@
 	"extra": {
 		"display-name": "phpBB Topic Prefixes",
 		"soft-require": {
-			"phpbb/phpbb": ">=4.0.0@dev"
+			"phpbb/phpbb": ">=3.2.0"
 		},
 		"version-check": {
 			"host": "www.phpbb.com",
 			"directory": "/customise/db/extension/topicprefixes",
 			"filename": "version_check",
 			"ssl": true
-		},
-		"branch-alias": {
-			"dev-develop": "1.1.x-dev"
 		}
 	}
 }

controller/admin_controller.php

@@ -340,7 +340,7 @@ protected function get_forum_info($forum_id)
 	 * @param bool $content The content of the JSON response (true|false)
 	 * @access protected
 	 */
-	protected function send_json_response(bool $content): void
+	protected function send_json_response($content)
 	{
 		$json_response = new json_response;
 		$json_response->send([

ext.php

@@ -25,12 +25,12 @@ class ext extends \phpbb\extension\base
 	 * The current phpBB version should meet or exceed
 	 * the minimum version required by this extension:
 	 *
-	 * Requires phpBB 4.0.0 and PHP 8.1
+	 * Requires phpBB 3.2.0 and PHP 5.4
 	 *
 	 * @return bool
 	 */
 	public function is_enableable()
 	{
-		return PHP_VERSION_ID >= 80100 && phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>=');
+		return phpbb_version_compare(PHPBB_VERSION, '3.2.0', '>=') && PHP_VERSION_ID >= 50400;
 	}
 }

tests/functional/functional_test.php

@@ -79,11 +79,11 @@ public function test_acp_disable_prefix()
 
 		// Disable the prefix
 		$crawler = self::request('GET', 'adm/index.php?i=\phpbb\topicprefixes\acp\topic_prefixes_module&mode=manage&action=edit&forum_id=' . self::FORUM_ID . "&prefix_id={$prefix}&hash={$hash}&sid={$this->sid}");
-		self::assertCount(1, $crawler->filter('tr')->eq(2)->filter('.fa-toggle-off'));
+		self::assertCount(1, $crawler->filter('tr')->eq(2)->filter('.tp-toggle-off'));
 
 		// Enable the prefix
 		$crawler = self::request('GET', 'adm/index.php?i=\phpbb\topicprefixes\acp\topic_prefixes_module&mode=manage&action=edit&forum_id=' . self::FORUM_ID . "&prefix_id={$prefix}&hash={$hash}&sid={$this->sid}");
-		self::assertCount(1, $crawler->filter('tr')->eq(2)->filter('.fa-toggle-on'));
+		self::assertCount(1, $crawler->filter('tr')->eq(2)->filter('.tp-toggle-on'));
 	}
 
 	public function test_acp_delete_prefix()