From 973f5aa8c5ef1830bc6803a0ad6c5054a762183b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 14 Mar 2014 11:08:25 +0100 Subject: [PATCH] [ticket/12268] Move class out of extension namespace and rename it PHPBB3-12268 --- phpBB/phpbb/extension/finder.php | 2 +- phpBB/phpbb/{extension => }/recursive_filter_iterator.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename phpBB/phpbb/{extension => }/recursive_filter_iterator.php (75%) diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index 4fb46c6ffd..6cc6e1808a 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -476,7 +476,7 @@ class finder $directory_pattern = '#' . $directory_pattern . '#'; $iterator = new \RecursiveIteratorIterator( - new \phpbb\extension\recursive_filter_iterator( + new \phpbb\recursive_dot_prefix_filter_iterator( new \RecursiveDirectoryIterator( $path, \FilesystemIterator::SKIP_DOTS diff --git a/phpBB/phpbb/extension/recursive_filter_iterator.php b/phpBB/phpbb/recursive_filter_iterator.php similarity index 75% rename from phpBB/phpbb/extension/recursive_filter_iterator.php rename to phpBB/phpbb/recursive_filter_iterator.php index e776942197..28e1067d11 100644 --- a/phpBB/phpbb/extension/recursive_filter_iterator.php +++ b/phpBB/phpbb/recursive_filter_iterator.php @@ -7,18 +7,18 @@ * */ -namespace phpbb\extension; +namespace phpbb; /** -* Class recursive_filter_iterator +* Class recursive_dot_prefix_filter_iterator * * This filter ignores directories starting with a dot. * When searching for php classes and template files of extensions * we don't need to look inside these directories. * -* @package phpbb\extension +* @package phpbb */ -class recursive_filter_iterator extends \RecursiveFilterIterator +class recursive_dot_prefix_filter_iterator extends \RecursiveFilterIterator { public function accept() {