Unset DirectoryIterator in the FileBackend

This is necessory to close all handlers on the directory and than it is
possible to rmdir the directory without a 'permission denied' on a
windows machine.

Corresponding unit test failure:
1) FileBackendTest::testRecursiveClean
Dir mwstore://localtesting/unittest-cont1/e/a no longer exists
(FSFileBackend).
Failed asserting that true matches expected false.

Change-Id: Ide58c6d0ec101bf0ddcd6b7414c51075fc28825b

diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 43e6cb3..0f435a3 100644 (file)
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -507,6 +507,7 @@ abstract class FileBackendStore extends FileBackend {
                                        $subDir = $params['dir'] . "/{$subDirRel}"; // full path
                                        $status->merge( $this->doClean( array( 'dir' => $subDir ) + $params ) );
                                }
+                               unset( $subDirsRel ); // free directory for rmdir() on Windows (for FS backends)
                        }
                }
 

diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php b/tests/phpunit/includes/filebackend/FileBackendTest.php
index b6d44fd..add7066 100644 (file)
--- a/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -1289,6 +1289,8 @@ class FileBackendTest extends MediaWikiTestCase {
 
                $base = self::baseStorePath();
                $dirs = array(
+                       "$base/unittest-cont1",
+                       "$base/unittest-cont1/e",
                        "$base/unittest-cont1/e/a",
                        "$base/unittest-cont1/e/a/b",
                        "$base/unittest-cont1/e/a/b/c",
@@ -2022,6 +2024,8 @@ class FileBackendTest extends MediaWikiTestCase {
                        foreach ( $iter as $file ) {
                                $this->backend->quickDelete( array( 'src' => "$base/$container/$file" ) );
                        }
+                       // free the directory, to avoid Permission denied under windows on rmdir
+                       unset( $iter );
                }
                $this->backend->clean( array( 'dir' => "$base/$container", 'recursive' => 1 ) );
        }