Changeset 42343 for trunk/tests/phpunit/includes/mock-fs.php

Timestamp:

11/30/2017 11:09:33 PM (9 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

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

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

@@ -11 +11 @@
 
         public $verbose = false; // Enable to debug WP_Filesystem_Base::find_folder() / etc.
-        public $errors = array();
-        public $method = 'MockFS';
+        public $errors  = array();
+        public $method  = 'MockFS';
 
         function __construct() {}
@@ -22 +22 @@
         // Copy of core's function, but accepts a path.
         function abspath( $path = false ) {
-                if ( ! $path )
+                if ( ! $path ) {
                         $path = ABSPATH;
+                }
                 $folder = $this->find_folder( $path );
 
                 // Perhaps the FTP folder is rooted at the WordPress installation, Check for wp-includes folder in root, Could have some false positives, but rare.
-                if ( ! $folder && $this->is_dir('/wp-includes') )
+                if ( ! $folder && $this->is_dir( '/wp-includes' ) ) {
                         $folder = '/';
+                }
                 return $folder;
         }
@@ -39 +41 @@
          */
         function init( $paths = '', $home_dir = '/' ) {
-                $this->fs = new MockFS_Directory_Node( '/' );
+                $this->fs     = new MockFS_Directory_Node( '/' );
                 $this->fs_map = array(
                         '/' => $this->fs,
                 );
-                $this->cache = array(); // Used by find_folder() and friends
-                $this->cwd = isset( $this->fs_map[ $home_dir ] ) ? $this->fs_map[ $home_dir ] : '/';
+                $this->cache  = array(); // Used by find_folder() and friends
+                $this->cwd    = isset( $this->fs_map[ $home_dir ] ) ? $this->fs_map[ $home_dir ] : '/';
                 $this->setfs( $paths );
         }
@@ -52 +54 @@
          */
         function setfs( $paths ) {
-                if ( ! is_array($paths) )
+                if ( ! is_array( $paths ) ) {
                         $paths = explode( "\n", $paths );
+                }
 
                 $paths = array_filter( array_map( 'trim', $paths ) );
@@ -59 +62 @@
                 foreach ( $paths as $path ) {
                         // Allow for comments
-                        if ( '#' == $path[0] )
-                                continue;
+                        if ( '#' == $path[0] ) {
+                                continue;
+                        }
 
                         // Directories
-                        if ( '/' == $path[ strlen($path) -1 ] )
+                        if ( '/' == $path[ strlen( $path ) - 1 ] ) {
                                 $this->mkdir( $path );
-                        else // Files (with dummy content for now)
+                        } else { // Files (with dummy content for now)
                                 $this->put_contents( $path, 'This is a test file' );
+                        }
                 }
 
@@ -96 +101 @@
                         $this->mkdir( $dirname );
                         $parent_node = $this->locate_parent_node( $path );
-                        if ( ! $parent_node )
+                        if ( ! $parent_node ) {
                                 return false;
+                        }
                 }
 
@@ -103 +109 @@
 
                 $parent_node->children[ $node->name ] = $node;
-                $this->fs_map[ $path ] = $node;
+                $this->fs_map[ $path ]                = $node;
 
                 return true;
@@ -109 +115 @@
 
         function put_contents( $path, $contents = '', $mode = null ) {
-                if ( ! $this->is_dir( dirname( $path ) ) )
+                if ( ! $this->is_dir( dirname( $path ) ) ) {
                         $this->mkdir( dirname( $path ) );
-
-                $parent = $this->locate_parent_node( $path );
+                }
+
+                $parent   = $this->locate_parent_node( $path );
                 $new_file = new MockFS_File_Node( $path, $contents );
 
                 $parent->children[ $new_file->name ] = $new_file;
-                $this->fs_map[ $path ] = $new_file;
+                $this->fs_map[ $path ]               = $new_file;
         }
 
         function get_contents( $file ) {
-                if ( ! $this->is_file( $file ) )
+                if ( ! $this->is_file( $file ) ) {
                         return false;
+                }
                 return $this->fs_map[ $file ]->contents;
         }
@@ -130 +138 @@
 
         function chdir( $path ) {
-                if ( ! isset( $this->fs_map[ $path ] ) )
+                if ( ! isset( $this->fs_map[ $path ] ) ) {
                         return false;
+                }
 
                 $this->cwd = $this->fs_map[ $path ];
@@ -153 +162 @@
         function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
 
-                if ( empty( $path ) || '.' == $path )
+                if ( empty( $path ) || '.' == $path ) {
                         $path = $this->cwd();
-
-                if ( ! $this->exists( $path ) )
+                }
+
+                if ( ! $this->exists( $path ) ) {
                         return false;
+                }
 
                 $limit_file = false;
                 if ( $this->is_file( $path ) ) {
                         $limit_file = $this->locate_node( $path )->name;
-                        $path = dirname( $path ) . '/';
+                        $path       = dirname( $path ) . '/';
                 }
 
                 $ret = array();
                 foreach ( $this->fs_map[ $path ]->children as $entry ) {
-                        if ( '.' == $entry->name || '..' == $entry->name )
-                                continue;
-
-                        if ( ! $include_hidden && '.' == $entry->name )
-                                continue;
-
-                        if ( $limit_file && $entry->name != $limit_file )
-                                continue;
-
-                        $struc = array();
+                        if ( '.' == $entry->name || '..' == $entry->name ) {
+                                continue;
+                        }
+
+                        if ( ! $include_hidden && '.' == $entry->name ) {
+                                continue;
+                        }
+
+                        if ( $limit_file && $entry->name != $limit_file ) {
+                                continue;
+                        }
+
+                        $struc         = array();
                         $struc['name'] = $entry->name;
                         $struc['type'] = $entry->type;
 
                         if ( 'd' == $struc['type'] ) {
-                                if ( $recursive )
+                                if ( $recursive ) {
                                         $struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
-                                else
+                                } else {
                                         $struc['files'] = array();
+                                }
                         }
 
@@ -214 +229 @@
 
 class MockFS_Directory_Node extends MockFS_Node {
-        public $type = 'd';
+        public $type     = 'd';
         public $children = array(); // The child nodes of this directory
 }
 
 class MockFS_File_Node extends MockFS_Node {
-        public $type = 'f';
+        public $type     = 'f';
         public $contents = ''; // The contents of the file