move parse_url() to utils.php, since it's a standalone utility

diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
index 01abb7f..a107a28 100644 (file)
--- a/php/WP_CLI/Runner.php
+++ b/php/WP_CLI/Runner.php
@@ -497,7 +497,7 @@ class Runner {
 
                        if ( 'multisite-install' == $this->arguments[1] ) {
                                // need to fake some globals to skip the checks in wp-includes/ms-settings.php
-                               $url_parts = \WP_CLI::parse_url( $url );
+                               $url_parts = Utils\parse_url( $url );
                                self::fake_current_site_blog( $url_parts );
 
                                if ( !defined( 'COOKIEHASH' ) ) {

diff --git a/php/class-wp-cli.php b/php/class-wp-cli.php
index 27051d4..c510a84 100644 (file)
--- a/php/class-wp-cli.php
+++ b/php/class-wp-cli.php
@@ -87,20 +87,10 @@ class WP_CLI {
         * Set the context in which WP-CLI should be run
         */
        static function set_url( $url ) {
-               $url_parts = self::parse_url( $url );
+               $url_parts = Utils\parse_url( $url );
                self::set_url_params( $url_parts );
        }
 
-       static function parse_url( $url ) {
-               $url_parts = parse_url( $url );
-
-               if ( !isset( $url_parts['scheme'] ) ) {
-                       $url_parts = parse_url( 'http://' . $url );
-               }
-
-               return $url_parts;
-       }
-
        private static function set_url_params( $url_parts ) {
                $f = function( $key ) use ( $url_parts ) {
                        return isset( $url_parts[ $key ] ) ? $url_parts[ $key ] : '';

diff --git a/php/utils.php b/php/utils.php
index 64a165f..c3abfdf 100644 (file)
--- a/php/utils.php
+++ b/php/utils.php
@@ -358,3 +358,13 @@ function make_progress_bar( $message, $count ) {
        return new \cli\progress\Bar( $message, $count );
 }
 
+function parse_url( $url ) {
+       $url_parts = \parse_url( $url );
+
+       if ( !isset( $url_parts['scheme'] ) ) {
+               $url_parts = parse_url( 'http://' . $url );
+       }
+
+       return $url_parts;
+}
+