[FileBackend] Removed PHP < 5.3 b/c cruft.
authorAaron <aschulz@wikimedia.org>
Fri, 4 May 2012 22:39:30 +0000 (15:39 -0700)
committerAaron <aschulz@wikimedia.org>
Fri, 4 May 2012 22:39:30 +0000 (15:39 -0700)
Change-Id: Ied29fab9c2582384fd95b76831649f77639a3647

includes/filerepo/backend/FSFileBackend.php

index 23077b7..d7649c5 100644 (file)
@@ -635,21 +635,13 @@ abstract class FSFileBackendList implements Iterator {
                        return new DirectoryIterator( $dir );
                } else { // recursive
                        # Get an iterator that will return leaf nodes (non-directories)
-                       if ( MWInit::classExists( 'FilesystemIterator' ) ) { // PHP >= 5.3
-                               # RecursiveDirectoryIterator extends FilesystemIterator.
-                               # FilesystemIterator::SKIP_DOTS default is inconsistent in PHP 5.3.x.
-                               $flags = FilesystemIterator::CURRENT_AS_SELF | FilesystemIterator::SKIP_DOTS;
-                               return new RecursiveIteratorIterator(
-                                       new RecursiveDirectoryIterator( $dir, $flags ),
-                                       RecursiveIteratorIterator::CHILD_FIRST // include dirs
-                               );
-                       } else { // PHP < 5.3
-                               # RecursiveDirectoryIterator extends DirectoryIterator
-                               return new RecursiveIteratorIterator(
-                                       new RecursiveDirectoryIterator( $dir ),
-                                       RecursiveIteratorIterator::CHILD_FIRST // include dirs
-                               );
-                       }
+                       # RecursiveDirectoryIterator extends FilesystemIterator.
+                       # FilesystemIterator::SKIP_DOTS default is inconsistent in PHP 5.3.x.
+                       $flags = FilesystemIterator::CURRENT_AS_SELF | FilesystemIterator::SKIP_DOTS;
+                       return new RecursiveIteratorIterator(
+                               new RecursiveDirectoryIterator( $dir, $flags ),
+                               RecursiveIteratorIterator::CHILD_FIRST // include dirs
+                       );
                }
        }