Merge pull request #30 from iMattPro/fixes

Fix migration uninstall error

Author: iMattPro

acp/wpn_acp_info.php

@@ -16,10 +16,10 @@ public function module()
 	{
 		return [
 			'filename'	=> '\phpbb\webpushnotifications\acp\wpn_acp_module',
-			'title'		=> 'ACP_WEBPUSH_SETTINGS',
+			'title'		=> 'ACP_WEBPUSH_EXT_SETTINGS',
 			'modes'		=> [
 				'webpush'	=> [
-					'title' => 'ACP_WEBPUSH_SETTINGS',
+					'title' => 'ACP_WEBPUSH_EXT_SETTINGS',
 					'auth' => 'ext_phpbb/webpushnotifications && acl_a_server',
 					'cat' => ['ACP_CLIENT_COMMUNICATION']
 				],

acp/wpn_acp_module.php

@@ -76,7 +76,7 @@ public function main($id, $mode)
 			$this->lang->add_lang('webpushnotifications_module_acp', 'phpbb/webpushnotifications');
 
 			// Set the page title for our ACP page
-			$this->page_title = $this->lang->lang('ACP_WEBPUSH_SETTINGS');
+			$this->page_title = $this->lang->lang('ACP_WEBPUSH_EXT_SETTINGS');
 
 			if ($this->request->is_set_post('submit'))
 			{

adm/style/wpn_acp_settings.html

@@ -1,7 +1,7 @@
 {% include 'overall_header.html' %}
 {% INCLUDEJS '@phpbb_webpushnotifications/wpn_acp.js' %}
 
-<h1>{{ lang('ACP_WEBPUSH_SETTINGS') }}</h1>
+<h1>{{ lang('ACP_WEBPUSH_EXT_SETTINGS') }}</h1>
 
 <p>{{ lang('ACP_WEBPUSH_SETTINGS_EXPLAIN') }}</p>
 

config/routing.yml

@@ -1,15 +1,3 @@
-phpbb_webpushnotifications_ucp_push_get_notification_controller:
-    path: /push/notification
-    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:notification }
-
-phpbb_webpushnotifications_ucp_push_worker_controller:
-    path: /push/worker
-    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:worker }
-
-phpbb_webpushnotifications_ucp_push_subscribe_controller:
-    path: /push/subscribe
-    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:subscribe }
-
-phpbb_webpushnotifications_ucp_push_unsubscribe_controller:
-    path: /push/unsubscribe
-    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:unsubscribe }
+phpbb_ucp_routing:
+    resource: wpn_ucp.yml
+    prefix: /user

config/wpn_ucp.yml

@@ -0,0 +1,15 @@
+phpbb_webpushnotifications_ucp_push_get_notification_controller:
+    path: /push/notification
+    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:notification }
+
+phpbb_webpushnotifications_ucp_push_worker_controller:
+    path: /push/worker
+    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:worker }
+
+phpbb_webpushnotifications_ucp_push_subscribe_controller:
+    path: /push/subscribe
+    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:subscribe }
+
+phpbb_webpushnotifications_ucp_push_unsubscribe_controller:
+    path: /push/unsubscribe
+    defaults: { _controller: phpbb.wpn.ucp.controller.webpush:unsubscribe }

language/en/info_acp_webpushnotifications.php

@@ -38,7 +38,7 @@
 //
 
 $lang = array_merge($lang, [
-	'ACP_WEBPUSH_SETTINGS'				=> 'Web Push settings',
+	'ACP_WEBPUSH_EXT_SETTINGS'			=> 'Web Push settings',
 	'ACP_WEBPUSH_REMOVE_WARNING'		=> 'Web Push Notifications are now built-in to phpBB',
 	'ACP_WEBPUSH_REMOVE_NOTICE'			=> 'The extension “phpBB Browser Push Notifications” is no longer needed and should be uninstalled.<br>All settings and user preferences associated with the extension will be migrated into phpBB‘s built-in push notifications when you uninstall the extension.',
 	'LOG_CONFIG_WEBPUSH'				=> '<strong>Altered Web Push settings</strong>',

migrations/add_webpush.php

@@ -21,7 +21,7 @@ public function effectively_installed(): bool
 
 	public static function depends_on()
 	{
-		return ['\phpbb\webpushnotifications\migrations\handle_subscriptions'];
+		return ['\phpbb\db\migration\data\v33x\v3312rc1'];
 	}
 
 	public function update_schema(): array
@@ -72,7 +72,7 @@ public function update_data(): array
 			['config.add', ['wpn_webpush_vapid_private', '']],
 			['module.add', ['acp', 'ACP_CLIENT_COMMUNICATION', [
 				'module_basename'	=> '\phpbb\webpushnotifications\acp\wpn_acp_module',
-				'module_langname'	=> 'ACP_WEBPUSH_SETTINGS',
+				'module_langname'	=> 'ACP_WEBPUSH_EXT_SETTINGS',
 				'module_mode'		=> 'webpush',
 				'after'				=> 'ACP_JABBER_SETTINGS',
 			]]],
@@ -85,7 +85,7 @@ public function revert_data(): array
 			['config.remove', ['wpn_webpush_enable']],
 			['config.remove', ['wpn_webpush_vapid_public']],
 			['config.remove', ['wpn_webpush_vapid_private']],
-			['module.remove', ['acp', 'ACP_BOARD_CONFIGURATION', 'ACP_WEBPUSH_SETTINGS']]
+			['module.remove', ['acp', 'ACP_BOARD_CONFIGURATION', 'ACP_WEBPUSH_EXT_SETTINGS']]
 		];
 	}
 }

migrations/handle_subscriptions.php

@@ -14,6 +14,11 @@
 
 class handle_subscriptions extends migration
 {
+	public static function depends_on()
+	{
+		return ['\phpbb\webpushnotifications\migrations\add_webpush'];
+	}
+
 	public function effectively_installed()
 	{
 		return !$this->db_tools->sql_table_exists($this->table_prefix . 'wpn_notification_push');

tests/functional/functional_test.php

@@ -40,7 +40,7 @@ public function test_acp_module()
 
 		$crawler = self::request('GET', 'adm/index.php?i=-phpbb-webpushnotifications-acp-wpn_acp_module&mode=webpush&sid=' . $this->sid);
 
-		$this->assertContainsLang('ACP_WEBPUSH_SETTINGS', $crawler->filter('div.main > h1')->text());
+		$this->assertContainsLang('ACP_WEBPUSH_EXT_SETTINGS', $crawler->filter('div.main > h1')->text());
 		$this->assertContainsLang('ACP_WEBPUSH_SETTINGS_EXPLAIN', $crawler->filter('div.main > p')->text());
 		$this->assertContainsLang('WEBPUSH_GENERATE_VAPID_KEYS', $crawler->filter('input[type="button"]')->attr('value'));