Merge branch 'develop' into ticket/11271-develop

# By Vjacheslav Trushkin (148) and others
# Via Joas Schilling (50) and others
* develop: (635 commits)
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  ...

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 10fced05a2..588adbcfb1 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -34,10 +34,17 @@ class phpbb_controller_controller_test extends phpbb_test_case
 		$provider = new \phpbb\controller\provider;
 		$routes = $provider
 			->import_paths_from_finder($this->extension_manager->get_finder())
-			->find('./tests/controller/');
+			->find(__DIR__);
 
 		// This will need to be updated if any new routes are defined
-		$this->assertEquals(2, sizeof($routes));
+		$this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('core_controller'));
+		$this->assertEquals('/core_foo', $routes->get('core_controller')->getPath());
+
+		$this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('controller1'));
+		$this->assertEquals('/foo', $routes->get('controller1')->getPath());
+
+		$this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('controller2'));
+		$this->assertEquals('/foo/bar', $routes->get('controller2')->getPath());
 	}
 
 	public function test_controller_resolver()