diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index ffcb2c830e..e787919588 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -284,8 +284,8 @@ class finder $classes[] = 'phpbb_' . str_replace('/', '_', $class); } else - { - $class = preg_replace('#^ext/#', '', $class); + { + $class = preg_replace('#^ext/#', '', $class); $classes[] = '\\' . str_replace('/', '\\', $class); } } diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index d6f9e93478..8e6e71aaf8 100644 --- a/tests/extension/finder_test.php +++ b/tests/extension/finder_test.php @@ -43,10 +43,10 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'bar\my\hidden_class', - 'foo\a_class', - 'foo\b_class', - 'phpbb\default\implementation', + '\bar\my\hidden_class', + '\foo\a_class', + '\foo\b_class', + '\phpbb\default\implementation', ), $classes ); @@ -67,7 +67,7 @@ class phpbb_extension_finder_test extends phpbb_test_case public function test_prefix_get_directories() { $dirs = $this->finder - ->prefix('ty') + ->prefix('ty') ->get_directories(); sort($dirs); @@ -88,8 +88,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'bar\my\hidden_class', - 'phpbb\default\implementation', + '\bar\my\hidden_class', + '\phpbb\default\implementation', ), $classes ); @@ -105,9 +105,9 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\sub\type\alternative', - 'foo\type\alternative', - 'phpbb\default\implementation', + '\foo\sub\type\alternative', + '\foo\type\alternative', + '\phpbb\default\implementation', ), $classes ); @@ -122,7 +122,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\type\alternative', + '\foo\type\alternative', ), $classes ); @@ -137,7 +137,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\sub\type\alternative', + '\foo\sub\type\alternative', ), $classes ); @@ -152,7 +152,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\sub\type\alternative', + '\foo\sub\type\alternative', ), $classes ); @@ -168,8 +168,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\type\alternative', - 'foo\type\dummy\empty', + '\foo\type\alternative', + '\foo\type\dummy\empty', ), $classes );