Index replaces app as controller

Author: iMattPro

skeleton/event/main_listener.php.twig

@@ -112,7 +112,8 @@ class main_listener implements EventSubscriberInterface
 	 */
 	public function viewonline_page($event)
 	{
-		if ($event['on_page'][1] === 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/demo') === 0)
+{% set page = skeleton_version_compare(REQUIREMENTS.phpbb_version_min, "4.0", "<") ? 'app' : 'index' %}
+		if ($event['on_page'][1] === '{{ page }}' && strrpos($event['row']['session_page'], '{{ page }}.' . $this->php_ext . '/demo') === 0)
 		{
 			$event['location'] = $this->{{ LANGUAGE.object }}->lang('VIEWING_{{ EXTENSION.vendor_name|upper }}_{{ EXTENSION.extension_name|upper }}');
 			$event['location_url'] = $this->helper->route('{{ EXTENSION.vendor_name }}_{{ EXTENSION.extension_name }}_controller', ['name' => 'world']);

skeleton/tests/functional/view_test.php.twig

@@ -1,3 +1,4 @@
+{% set page = skeleton_version_compare(REQUIREMENTS.phpbb_version_min, "4.0", "<") ? 'app' : 'index' %}
 <?php
 /**
  *
@@ -29,7 +30,7 @@ class view_test extends \phpbb_functional_test_case
 	 */
 	public function test_view_foo()
 	{
-		$crawler = self::request('GET', 'app.php/demo/foo');
+		$crawler = self::request('GET', '{{ page }}.php/demo/foo');
 		$this->assertStringContainsString('foo', $crawler->filter('h2')->text());
 
 		$this->add_lang_ext('{{ EXTENSION.vendor_name }}/{{ EXTENSION.extension_name }}', 'common');
@@ -45,7 +46,7 @@ class view_test extends \phpbb_functional_test_case
 	 */
 	public function test_view_bar()
 	{
-		$crawler = self::request('GET', 'app.php/demo/bar');
+		$crawler = self::request('GET', '{{ page }}.php/demo/bar');
 		$this->assertStringNotContainsString('foo', $crawler->filter('h2')->text());
 		$this->assertStringContainsString('bar', $crawler->filter('h2')->text());
 	}

tests/functional/view_test.php

@@ -31,7 +31,7 @@ protected static function setup_extensions(): array
 	public function test_view_skeleton()
 	{
 		$this->add_lang_ext('phpbb/skeleton', 'common');
-		$crawler = self::request('GET', 'app.php/skeleton');
+		$crawler = self::request('GET', 'index.php/skeleton');
 		$this->assertStringContainsString($this->lang('PHPBB_CREATE_SKELETON_EXT'), $crawler->filter('h2')->text());
 	}
 }