Merge pull request #324 from wp-cli/fix/wpcs-3.0-issues

swissspidy · web-flow · commit 4125a31134e1 · 2023-08-30T16:29:02.000+02:00
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "wp-cli/extension-command": "^1.2 || ^2",
-        "wp-cli/wp-cli-tests": "^3.1"
+        "wp-cli/wp-cli-tests": "^4"
     },
     "config": {
         "process-timeout": 7200,
diff --git a/scaffold-command.php b/scaffold-command.php
@@ -4,7 +4,7 @@
 	return;
 }
 
-$wpcli_scaffold_autoloader = dirname( __FILE__ ) . '/vendor/autoload.php';
+$wpcli_scaffold_autoloader = __DIR__ . '/vendor/autoload.php';
 if ( file_exists( $wpcli_scaffold_autoloader ) ) {
 	require_once $wpcli_scaffold_autoloader;
 }
diff --git a/src/Scaffold_Command.php b/src/Scaffold_Command.php
@@ -1085,7 +1085,6 @@ protected function maybe_create_themes_dir() {
 		if ( ! is_dir( $themes_dir ) ) {
 			wp_mkdir_p( $themes_dir );
 		}
-
 	}
 
 	/**
@@ -1096,7 +1095,6 @@ protected function maybe_create_plugins_dir() {
 		if ( ! is_dir( WP_PLUGIN_DIR ) ) {
 			wp_mkdir_p( WP_PLUGIN_DIR );
 		}
-
 	}
 
 	/**
@@ -1113,7 +1111,7 @@ protected function init_wp_filesystem() {
 	 * Localizes the template path.
 	 */
 	private static function mustache_render( $template, $data = [] ) {
-		return Utils\mustache_render( dirname( dirname( __FILE__ ) ) . "/templates/{$template}", $data );
+		return Utils\mustache_render( dirname( __DIR__ ) . "/templates/{$template}", $data );
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`return;`
`5`	`5`	`}`
`6`	`6`
`7`		`-$wpcli_scaffold_autoloader = dirname( __FILE__ ) . '/vendor/autoload.php';`
	`7`	`+$wpcli_scaffold_autoloader = __DIR__ . '/vendor/autoload.php';`
`8`	`8`	`if ( file_exists( $wpcli_scaffold_autoloader ) ) {`
`9`	`9`	`require_once $wpcli_scaffold_autoloader;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1085,7 +1085,6 @@ protected function maybe_create_themes_dir() {`
`1085`	`1085`	`if ( ! is_dir( $themes_dir ) ) {`
`1086`	`1086`	`wp_mkdir_p( $themes_dir );`
`1087`	`1087`	`}`
`1088`		`-`
`1089`	`1088`	`}`
`1090`	`1089`
`1091`	`1090`	`/**`
`@@ -1096,7 +1095,6 @@ protected function maybe_create_plugins_dir() {`
`1096`	`1095`	`if ( ! is_dir( WP_PLUGIN_DIR ) ) {`
`1097`	`1096`	`wp_mkdir_p( WP_PLUGIN_DIR );`
`1098`	`1097`	`}`
`1099`		`-`
`1100`	`1098`	`}`
`1101`	`1099`
`1102`	`1100`	`/**`
`@@ -1113,7 +1111,7 @@ protected function init_wp_filesystem() {`
`1113`	`1111`	`* Localizes the template path.`
`1114`	`1112`	`*/`
`1115`	`1113`	`private static function mustache_render( $template, $data = [] ) {`
`1116`		`- return Utils\mustache_render( dirname( dirname( __FILE__ ) ) . "/templates/{$template}", $data );`
	`1114`	`+ return Utils\mustache_render( dirname( __DIR__ ) . "/templates/{$template}", $data );`
`1117`	`1115`	`}`
`1118`	`1116`
`1119`	`1117`	`/**`