Merge branch 'master' into stable

composer.json

@@ -10,6 +10,7 @@
             "homepage": "http://vccw.cc/"
         }
     ],
+	"minimum-stability": "dev",
     "autoload": {
 		"psr-4": {
 			"": "src/"
@@ -22,6 +23,7 @@
 	},
     "require": {},
     "require-dev": {
-        "behat/behat": "~2.5"
+        "behat/behat": "~2.5",
+        "wp-cli/wp-cli": "dev-master"
     }
 }

src/Scaffold_Movefile_Command.php

@@ -1,7 +1,5 @@
 <?php
 
-use WP_CLI\Utils;
-
 /**
  * Generate a movefile.yml for Wordmove.
  *
@@ -89,28 +87,31 @@ private function create_file( $filename, $contents, $force )
 
 	/**
 	 * Initialize WP Filesystem
+	 *
+	 * @return \WP_Filesystem_Base
 	 */
 	private function init_wp_filesystem()
 	{
 		global $wp_filesystem;
+
 		WP_Filesystem();
+
 		return $wp_filesystem;
 	}
 
 	private function prompt_if_files_will_be_overwritten( $filename, $force )
 	{
-		$should_write_file = false;
 		if ( ! file_exists( $filename ) ) {
 			return true;
 		}
+
 		WP_CLI::warning( 'File already exists.' );
+
 		if ( $force ) {
-			$should_write_file = true;
+			return true;
 		} else {
-			$should_write_file = cli\confirm( 'Do you want to overwrite', false );
+			return cli\confirm( 'Do you want to overwrite', false );
 		}
-
-		return $should_write_file;
 	}
 
 	/**

src/templates/movefile.mustache

@@ -1,3 +1,6 @@
+global:
+  sql_adapter: default
+
 local:
   vhost: "{{ home_url }}"
   wordpress_path: "{{ wordpress_path }}" # use an absolute path here