Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12589] Add test searching in a non absolute directory
  [ticket/12589] Fix tests
  [ticket/12589] Search directly in $directory if it's an absolute sub-path

tests/extension/finder_test.php

@@ -132,6 +132,22 @@ class phpbb_extension_finder_test extends phpbb_test_case
 		);
 	}
 
+	public function test_non_absolute_directory_get_classes()
+	{
+		$classes = $this->finder
+			->directory('type/')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'\vendor2\foo\sub\type\alternative',
+				'\vendor2\foo\type\alternative',
+			),
+			$classes
+		);
+	}
+
 	public function test_sub_directory_get_classes()
 	{
 		$classes = $this->finder