Merge pull request #369 from iMattPro/fixes

Improve route matching

Author: iMattPro

event/listener.php

@@ -131,6 +131,11 @@ public function add_permission($event)
 	*/
 	public function viewonline_page($event)
 	{
+		if (!isset($event['row']['session_page']))
+		{
+			return;
+		}
+
 		$session_path = parse_url($event['row']['session_page'], PHP_URL_PATH);
 		if (!is_string($session_path))
 		{
@@ -145,12 +150,12 @@ public function viewonline_page($event)
 		{
 			$route = $this->router->match($session_path);
 		}
-		catch (\Symfony\Component\Routing\Exception\ExceptionInterface $e)
+		catch (\RuntimeException $e)
 		{
 			return;
 		}
 
-		if ($route['_route'] === 'phpbb_boardrules_main_controller')
+		if (isset($route['_route']) && $route['_route'] === 'phpbb_boardrules_main_controller')
 		{
 			$event['location'] = $this->lang->lang('BOARDRULES_VIEWONLINE');
 			$event['location_url'] = $this->controller_helper->route('phpbb_boardrules_main_controller');

tests/event/listener_test.php

@@ -70,6 +70,14 @@ protected function setUp(): void
 				{
 					return array('_route' => 'phpbb_boardrules_main_controller');
 				}
+				else if ($path === '/runtime-error')
+				{
+					throw new \RuntimeException('Unable to match route.');
+				}
+				else if ($path === '/missing-route-name')
+				{
+					return array();
+				}
 
 				throw new \Symfony\Component\Routing\Exception\ResourceNotFoundException();
 			});
@@ -371,6 +379,56 @@ public function viewonline_page_data()
 				'phpbb_boardrules_main_controller#a:0:{}',
 				'BOARDRULES_VIEWONLINE',
 			),
+			// test when the session page is missing
+			array(
+				array(
+					1 => 'app',
+				),
+				array(),
+				'$location_url',
+				'$location',
+				'$location_url',
+				'$location',
+			),
+			// test a non-routing runtime exception is treated as an unmatched page
+			array(
+				array(
+					1 => 'app',
+				),
+				array(
+					'session_page' => 'app.' . $phpEx . '/runtime-error'
+				),
+				'$location_url',
+				'$location',
+				'$location_url',
+				'$location',
+			),
+			// test a route result without a route name
+			array(
+				array(
+					1 => 'app',
+				),
+				array(
+					'session_page' => 'app.' . $phpEx . '/missing-route-name'
+				),
+				'$location_url',
+				'$location',
+				'$location_url',
+				'$location',
+			),
+			// test when on_page is index and session_page is NOT for boardrules
+			array(
+				array(
+					1 => 'index',
+				),
+				array(
+					'session_page' => 'index.' . $phpEx . '/foobar'
+				),
+				'$location_url',
+				'$location',
+				'$location_url',
+				'$location',
+			),
 			// test when the front controller has the phpBB 4 name
 			array(
 				array(