Merge pull request #31 from iMattPro/tweaks

I was bored

Author: iMattPro

acp/pwa_acp_module.php

@@ -35,15 +35,11 @@ public function main($id, string $mode): void
 	{
 		global $phpbb_container;
 
-		/** @var admin_controller $admin_controller */
-		$admin_controller = $phpbb_container->get('phpbb.pwakit.admin.controller');
-
-		// Make the $u_action url available in the admin controller
-		$admin_controller->set_page_url($this->u_action);
-
 		$this->tpl_name = 'acp_pwakit';
 		$this->page_title = 'ACP_PWA_KIT_SETTINGS';
 
-		$admin_controller->main($id, $mode);
+		/** @var admin_controller $admin_controller */
+		$admin_controller = $phpbb_container->get('phpbb.pwakit.admin.controller');
+		$admin_controller->main($id, $mode, $this->u_action);
 	}
 }

controller/admin_controller.php

@@ -26,10 +26,10 @@ class admin_controller
 	protected const FORM_KEY = 'acp_pwakit';
 
 	/** @var string $id */
-	public string $id;
+	protected string $id;
 
 	/** @var string $u_action */
-	public string $u_action;
+	protected string $u_action;
 
 	/** @var cache_driver $cache */
 	protected cache_driver $cache;
@@ -102,33 +102,24 @@ public function __construct(cache_driver $cache, config $config, db_driver $db,
 		$this->language->add_lang('posting'); // Used by upload() file errors
 	}
 
-	/**
-	 * Set page url
-	 *
-	 * @param string $u_action
-	 * @return void
-	 */
-	public function set_page_url(string $u_action): void
-	{
-		$this->u_action = $u_action;
-	}
-
 	/**
 	 * Main ACP module
 	 *
 	 * @param string $id
 	 * @param string $mode
+	 * @param string $u_action
 	 * @return void
 	 */
-	public function main(string $id, string $mode = ''): void
+	public function main(string $id, string $mode, string $u_action): void
 	{
-		$this->id = $id;
-
 		if ($mode !== 'settings')
 		{
 			return;
 		}
 
+		$this->id = $id;
+		$this->u_action = $u_action;
+
 		add_form_key(self::FORM_KEY);
 
 		$action = $this->get_action();

tests/unit/acp_module_test.php

@@ -132,10 +132,6 @@ public function test_main_module($mode)
 			->with('phpbb.pwakit.admin.controller')
 			->willReturn($admin_controller);
 
-		$admin_controller
-			->expects(self::once())
-			->method('set_page_url');
-
 		$admin_controller
 			->expects(self::once())
 			->method('main');

tests/unit/admin_controller_test.php

@@ -118,8 +118,6 @@ protected function setUp(): void
 			'adm/',
 			$phpEx
 		);
-
-		$this->admin_controller->set_page_url('');
 	}
 
 	public function module_access_test_data(): array
@@ -510,7 +508,7 @@ public function test_delete($image, $confirmed, $error)
 	 */
 	private function call_admin_controller(string $mode = 'settings'): void
 	{
-		$this->admin_controller->main(0, $mode);
+		$this->admin_controller->main('\\phpbb\\pwakit\\acp\\pwa_acp_module', $mode, '');
 	}
 
 	/**