Merge pull request #63 from phpbb-extensions/fix/symfony_mailer

Fix compatibility with symfony mailer for phpBB 4.0 dev

Author: iMattPro

.github/workflows/tests.yml

@@ -238,7 +238,7 @@ jobs:
 
         services:
             postgres:
-                image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && 'postgres:10' || matrix.db }}
+                image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }}
                 env:
                     POSTGRES_HOST: localhost
                     POSTGRES_USER: postgres

composer.json

@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "Security measures to help watch over team member accounts.",
 	"homepage": "https://www.phpbb.com",
-	"version": "1.0.0",
+	"version": "1.1.0-dev",
 	"license": "GPL-2.0-only",
 	"authors": [
 		{
@@ -19,13 +19,18 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4",
+		"php": ">=8.1",
 		"composer/installers": "~1.0"
 	},
 	"extra": {
 		"display-name": "Team Security Measures",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.2.0"
+			"phpbb/phpbb": ">=4.0.0@dev,<4.1.0@dev"
+		}
+	},
+	"config": {
+		"allow-plugins": {
+			"composer/installers": true
 		}
 	}
 }

composer.lock

@@ -3,6 +3,7 @@ services:
         class: phpbb\teamsecurity\event\listener
         arguments:
             - '@config'
+            - '@messenger.method.email'
             - '@language'
             - '@log'
             - '@user'

config/services.yml

@@ -10,23 +10,31 @@
 
 namespace phpbb\teamsecurity\event;
 
+use phpbb\config\config;
+use phpbb\language\language;
+use phpbb\log\log;
+use phpbb\messenger\method\email;
+use phpbb\user;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Event listener
  */
 class listener implements EventSubscriberInterface
 {
-	/** @var \phpbb\config\config */
+	/** @var config */
 	protected $config;
 
-	/** @var \phpbb\language\language */
+	/** @var email */
+	protected $email_method;
+
+	/** @var language */
 	protected $language;
 
-	/** @var \phpbb\log\log */
+	/** @var log */
 	protected $log;
 
-	/** @var \phpbb\user */
+	/** @var user */
 	protected $user;
 
 	/** @var string phpBB root path */
@@ -38,17 +46,19 @@ class listener implements EventSubscriberInterface
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\config\config     $config          Config object
-	 * @param \phpbb\language\language $language        Language object
-	 * @param \phpbb\log\log           $log             The phpBB log system
-	 * @param \phpbb\user              $user            User object
+	 * @param config     $config          Config object
+	 * @param email $email_method    Email method
+	 * @param language $language        Language object
+	 * @param log           $log             The phpBB log system
+	 * @param user              $user            User object
 	 * @param string                   $phpbb_root_path phpBB root path
 	 * @param string                   $phpEx           phpEx
 	 * @access public
 	 */
-	public function __construct(\phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\user $user, $phpbb_root_path, $phpEx)
+	public function __construct(config $config, email $email_method, language $language, log $log, user $user, string $phpbb_root_path, string $phpEx)
 	{
 		$this->config = $config;
+		$this->email_method = $email_method;
 		$this->language = $language;
 		$this->log = $log;
 		$this->user = $user;
@@ -283,16 +293,11 @@ protected function in_watch_group($user_id)
 	 */
 	protected function send_message($message_data, $template, $cc_user = '')
 	{
-		if (!class_exists('messenger'))
-		{
-			include $this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext;
-		}
-
-		$messenger = new \messenger(false);
-		$messenger->template('@phpbb_teamsecurity/' . $template);
-		$messenger->to(!empty($this->config['sec_contact']) ? $this->config['sec_contact'] : $this->config['board_contact'], $this->config['board_contact_name']);
-		$messenger->cc($cc_user);
-		$messenger->assign_vars($message_data);
-		$messenger->send();
+		$this->email_method->set_use_queue(false);
+		$this->email_method->template('@phpbb_teamsecurity/' . $template);
+		$this->email_method->to(!empty($this->config['sec_contact']) ? $this->config['sec_contact'] : $this->config['board_contact'], $this->config['board_contact_name']);
+		$this->email_method->cc($cc_user);
+		$this->email_method->assign_vars($message_data);
+		$this->email_method->send();
 	}
 }

event/listener.php

@@ -18,6 +18,9 @@ class listener_base extends \phpbb_test_case
 	/** @var \phpbb\config\config */
 	protected $config;
 
+	/** @var hpbb\messenger\method\email */
+	protected $email_method;
+
 	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\log\log */
 	protected $log;
 
@@ -44,6 +47,7 @@ protected function setUp(): void
 
 		// Load/Mock classes required by the event listener class
 		$this->config = new \phpbb\config\config(array('default_dateformat' => 'D M d, Y H:i:s A'));
+		$this->email_method = $this->getMockBuilder('\phpbb\messenger\method\email')->disableOriginalConstructor()->getMock();
 		$this->log = $this->getMockBuilder('\phpbb\log\log')
 			->disableOriginalConstructor()
 			->getMock();
@@ -70,6 +74,7 @@ protected function set_listener()
 			))
 			->setConstructorArgs(array(
 				$this->config,
+				$this->email_method,
 				$this->lang,
 				$this->log,
 				$this->user,