Remove deprecated code

config/services.yml

@@ -37,6 +37,7 @@ services:
             - '@vse.abbc3.bbcodes_help'
             - '@config'
             - '@routing.helper'
+            - '@language'
             - '@template'
             - '@user'
         tags:

event/listener.php

@@ -11,6 +11,7 @@
 namespace vse\abbc3\event;
 
 use phpbb\config\config;
+use phpbb\language\language;
 use phpbb\routing\helper;
 use phpbb\template\template;
 use phpbb\user;
@@ -39,6 +40,9 @@ class listener implements EventSubscriberInterface
 	/** @var helper */
 	protected $helper;
 
+	/** @var language */
+	protected $language;
+
 	/** @var template */
 	protected $template;
 
@@ -55,11 +59,12 @@ class listener implements EventSubscriberInterface
 	 * @param bbcodes_help    $bbcodes_help
 	 * @param config          $config
 	 * @param helper          $helper
+	 * @param language        $language
 	 * @param template        $template
 	 * @param user            $user
 	 * @access public
 	 */
-	public function __construct(bbcodes_config $bbcodes_config, bbcodes_display $bbcodes_display, bbcodes_help $bbcodes_help, config $config, helper $helper, template $template, user $user)
+	public function __construct(bbcodes_config $bbcodes_config, bbcodes_display $bbcodes_display, bbcodes_help $bbcodes_help, config $config, helper $helper, language $language, template $template, user $user)
 	{
 		$this->bbcodes_config = $bbcodes_config;
 		$this->bbcodes_display = $bbcodes_display;
@@ -68,6 +73,7 @@ public function __construct(bbcodes_config $bbcodes_config, bbcodes_display $bbc
 		$this->helper = $helper;
 		$this->template = $template;
 		$this->user = $user;
+		$this->language = $language;
 	}
 
 	/**
@@ -228,7 +234,7 @@ public function add_to_quickreply($event)
 	{
 		if ($this->quick_reply)
 		{
-			$this->user->add_lang('posting');
+			$this->language->add_lang('posting');
 			$this->template->assign_var('S_ABBC3_QUICKREPLY', true);
 			$this->template->assign_vars($this->bbcodes_display->bbcode_statuses($event['forum_id']));
 		}

tests/event/listener_base.php

@@ -27,6 +27,9 @@ class listener_base extends \phpbb_test_case
 	/** @var \phpbb\routing\helper|\PHPUnit_Framework_MockObject_MockObject */
 	protected $helper;
 
+	/** @var \phpbb\language\language */
+	protected $language;
+
 	/** @var \vse\abbc3\event\listener */
 	protected $listener;
 
@@ -64,11 +67,9 @@ protected function setUp(): void
 
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->getMock();
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 		$this->user = $this->getMockBuilder('\phpbb\user')
-			->setConstructorArgs([
-				new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
-				'\phpbb\datetime'
-			])
+			->setConstructorArgs([$this->language, '\phpbb\datetime'])
 			->getMock();
 		$this->user->data['username'] = 'admin';
 
@@ -96,6 +97,7 @@ protected function set_listener()
 			$this->bbcodes_help,
 			$this->config,
 			$this->helper,
+			$this->language,
 			$this->template,
 			$this->user
 		);

tests/event/quick_reply_test.php

@@ -34,15 +34,14 @@ public function test_set_quick_reply($enabled, $forum_id)
 			->with($forum_id)
 			->willReturn([]);
 
-		$this->user->expects($enabled ? self::once() : self::never())
-			->method('add_lang')
-			->with('posting');
-
 		$this->template->expects($enabled ? self::once() : self::never())
 			->method('assign_var')
 			->with('S_ABBC3_QUICKREPLY', true);
 
+		$event_data = ['forum_id'];
+		$event = new \phpbb\event\data(compact($event_data));
+
 		$this->listener->set_quick_reply();
-		$this->listener->add_to_quickreply(['forum_id' => $forum_id]);
+		$this->listener->add_to_quickreply($event);
 	}
 }