Use perchten/rmrdir for directory removal.

pressbooks · Apr 6, 2017 · 37ab804 · 37ab804
1 parent 4199021
commit 37ab804
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,8 @@
     "pimple/pimple": "^3.0",
     "leafo/scssphp": "^0.6.7",
     "vanilla/htmlawed": "^2.2",
-    "pressbooks/pb-api": "^1.1"
+    "pressbooks/pb-api": "^1.1",
+    "perchten/rmrdir": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~5.5",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-pb-themelock.php b/includes/class-pb-themelock.php
@@ -80,7 +80,6 @@ static function lockTheme() {
 
 	static function copyAssets() {
 		if ( ! WP_Filesystem() ) {
-			wp_die('Lacking credentials.');
 			exit;
 		}
 

diff --git a/includes/pb-utility.php b/includes/pb-utility.php
@@ -738,19 +738,5 @@ function mail_from_name( $name ) {
  */
 
 function delete_directory( $dirpath ) {
-	if ( ! function_exists( '\\WP_Filesystem' ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
-	}
-
-	if ( ! \WP_Filesystem() ) {
-		exit;
-	}
-
-	global $wp_filesystem;
-
-	if ( ! $wp_filesystem->is_dir( $dirpath ) ) {
-		throw new \InvalidArgumentException( "$dirpath must be a directory." );
-	}
-
-	$wp_filesystem->rmdir( $dirpath, true );
+	return \rmdir( $dirpath );
 }