Changeset 26246

Timestamp:

11/18/2013 03:32:47 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Normalize slashes in WP_Filesystem_MockFS::mkdir() and WP_Filesystem_MockFS::locate_parent_node() to avoid an infinite loop on Windows.

fixes #26091.

File:

• trunk/tests/phpunit/includes/mock-fs.php (modified) (2 diffs)

trunk/tests/phpunit/includes/mock-fs.php

@@ -82 +82 @@
      */
     private function locate_parent_node( $path ) {
-        return $this->locate_node( trailingslashit( dirname( $path ) ) );
+        $dirname = str_replace( '\\', '/', dirname( $path ) );
+        return $this->locate_node( trailingslashit( $dirname ) );
     }
 
@@ -92 +93 @@
         $parent_node = $this->locate_parent_node( $path );
         if ( ! $parent_node ) {
-            $this->mkdir( dirname( $path ) );
+            $dirname = str_replace( '\\', '/', dirname( $path ) );
+            $this->mkdir( $dirname );
             $parent_node = $this->locate_parent_node( $path );
             if ( ! $parent_node )