eventespresso / event-espresso-core

core/domain/values/Url.php

Indentation +193 added lines, -193 removed lines

@@ -17,197 +17,197 @@
 class Url
 {
 
-    /**
-     * @var string $scheme
-     */
-    private $scheme;
-
-    /**
-     * @var string $host
-     */
-    private $host;
-
-    /**
-     * @var string $path
-     */
-    private $path;
-
-    /**
-     * @var string $query
-     */
-    private $query;
-
-    /**
-     * @var string $fragment
-     */
-    private $fragment;
-
-
-    /**
-     * Url constructor.
-     *
-     * @param $url
-     * @throws InvalidArgumentException
-     */
-    public function __construct($url)
-    {
-        if (! filter_var(
-            $url,
-            FILTER_VALIDATE_URL
-        )) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'Invalid URL. Both the "Scheme" and "Host" are required.',
-                    'event_espresso'
-                )
-            );
-        }
-        $url = parse_url($url);
-        $this->setScheme($url);
-        $this->setHost($url);
-        $this->setPath($url);
-        $this->setQuery($url);
-        $this->setFragment($url);
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return a string like: 'abc://'
-     *
-     * @return string
-     */
-    public function scheme()
-    {
-        return $this->scheme;
-    }
-
-
-    /**
-     * @param array $url
-     */
-    private function setScheme($url)
-    {
-        $this->scheme = $url['scheme'] . '://';
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return a string like: 'example.com'
-     *
-     * @return string
-     */
-    public function host()
-    {
-        return $this->host;
-    }
-
-
-    /**
-     * @param array $url
-     */
-    private function setHost($url)
-    {
-        $this->host = $url['host'];
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return a string like: '/path/data'
-     *
-     * @return string
-     */
-    public function path()
-    {
-        return $this->path;
-    }
-
-
-    /**
-     * @param array $url
-     */
-    private function setPath($url)
-    {
-        $this->path = isset($url['path']) ? $url['path'] : '';
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return a string like: '?key=value'
-     *
-     * @return string
-     */
-    public function queryString()
-    {
-        return $this->query !== '' ? '?' . $this->query : '';
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return an array like: array('key' => 'value')
-     *
-     * @return array
-     */
-    public function queryParams()
-    {
-        return wp_parse_args($this->query);
-    }
-
-
-    /**
-     * @param array $url
-     */
-    private function setQuery($url)
-    {
-        $this->query = isset($url['query']) ? $url['query'] : '';
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return a string like: '#id'
-     *
-     * @return string
-     */
-    public function fragment()
-    {
-        return $this->fragment !== '' ? '#' . $this->fragment : '';
-    }
-
-
-    /**
-     * @param array $url
-     */
-    private function setFragment($url)
-    {
-        $this->fragment = isset($url['fragment']) ? $url['fragment'] : '';
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return a string like: 'abc://example.com/path/data?key=value#id'
-     *
-     * @return string
-     */
-    public function getFullUrl()
-    {
-        return $this->scheme() . $this->host() . $this->path() . $this->queryString() . $this->fragment();
-    }
-
-
-    /**
-     * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
-     * will return a string like: 'abc://example.com/path/data?key=value#id'
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getFullUrl();
-    }
+	/**
+	 * @var string $scheme
+	 */
+	private $scheme;
+
+	/**
+	 * @var string $host
+	 */
+	private $host;
+
+	/**
+	 * @var string $path
+	 */
+	private $path;
+
+	/**
+	 * @var string $query
+	 */
+	private $query;
+
+	/**
+	 * @var string $fragment
+	 */
+	private $fragment;
+
+
+	/**
+	 * Url constructor.
+	 *
+	 * @param $url
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($url)
+	{
+		if (! filter_var(
+			$url,
+			FILTER_VALIDATE_URL
+		)) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'Invalid URL. Both the "Scheme" and "Host" are required.',
+					'event_espresso'
+				)
+			);
+		}
+		$url = parse_url($url);
+		$this->setScheme($url);
+		$this->setHost($url);
+		$this->setPath($url);
+		$this->setQuery($url);
+		$this->setFragment($url);
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return a string like: 'abc://'
+	 *
+	 * @return string
+	 */
+	public function scheme()
+	{
+		return $this->scheme;
+	}
+
+
+	/**
+	 * @param array $url
+	 */
+	private function setScheme($url)
+	{
+		$this->scheme = $url['scheme'] . '://';
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return a string like: 'example.com'
+	 *
+	 * @return string
+	 */
+	public function host()
+	{
+		return $this->host;
+	}
+
+
+	/**
+	 * @param array $url
+	 */
+	private function setHost($url)
+	{
+		$this->host = $url['host'];
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return a string like: '/path/data'
+	 *
+	 * @return string
+	 */
+	public function path()
+	{
+		return $this->path;
+	}
+
+
+	/**
+	 * @param array $url
+	 */
+	private function setPath($url)
+	{
+		$this->path = isset($url['path']) ? $url['path'] : '';
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return a string like: '?key=value'
+	 *
+	 * @return string
+	 */
+	public function queryString()
+	{
+		return $this->query !== '' ? '?' . $this->query : '';
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return an array like: array('key' => 'value')
+	 *
+	 * @return array
+	 */
+	public function queryParams()
+	{
+		return wp_parse_args($this->query);
+	}
+
+
+	/**
+	 * @param array $url
+	 */
+	private function setQuery($url)
+	{
+		$this->query = isset($url['query']) ? $url['query'] : '';
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return a string like: '#id'
+	 *
+	 * @return string
+	 */
+	public function fragment()
+	{
+		return $this->fragment !== '' ? '#' . $this->fragment : '';
+	}
+
+
+	/**
+	 * @param array $url
+	 */
+	private function setFragment($url)
+	{
+		$this->fragment = isset($url['fragment']) ? $url['fragment'] : '';
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return a string like: 'abc://example.com/path/data?key=value#id'
+	 *
+	 * @return string
+	 */
+	public function getFullUrl()
+	{
+		return $this->scheme() . $this->host() . $this->path() . $this->queryString() . $this->fragment();
+	}
+
+
+	/**
+	 * For a URL like: abc://username:password@example.com:123/path/data?key=value#id
+	 * will return a string like: 'abc://example.com/path/data?key=value#id'
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->getFullUrl();
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
      */
     public function __construct($url)
     {
-        if (! filter_var(
+        if ( ! filter_var(
             $url,
             FILTER_VALIDATE_URL
         )) {
@@ -88,7 +88,7 @@ 
      */
     private function setScheme($url)
     {
-        $this->scheme = $url['scheme'] . '://';
+        $this->scheme = $url['scheme'].'://';
     }
 
 
@@ -142,7 +142,7 @@ 
      */
     public function queryString()
     {
-        return $this->query !== '' ? '?' . $this->query : '';
+        return $this->query !== '' ? '?'.$this->query : '';
     }
 
 
@@ -175,7 +175,7 @@ 
      */
     public function fragment()
     {
-        return $this->fragment !== '' ? '#' . $this->fragment : '';
+        return $this->fragment !== '' ? '#'.$this->fragment : '';
     }
 
 
@@ -196,7 +196,7 @@ 
      */
     public function getFullUrl()
     {
-        return $this->scheme() . $this->host() . $this->path() . $this->queryString() . $this->fragment();
+        return $this->scheme().$this->host().$this->path().$this->queryString().$this->fragment();
     }
 
 

espresso.php

Indentation +80 added lines, -80 removed lines

@@ -38,103 +38,103 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.10.12.rc.006');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.10.12.rc.006');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }