From c7c227be6f3e61dda3b09b843ce2fc6e4dbff66f Mon Sep 17 00:00:00 2001
From: Paul Schreiber <paul.schreiber@espn.com>
Date: Thu, 8 Mar 2018 12:34:21 -0500
Subject: [PATCH] remove AMP_WP_Utils class and tests

---
 includes/class-amp-autoloader.php     |  1 -
 includes/utils/class-amp-wp-utils.php | 61 ---------------------------
 tests/test-amp-wp-utils.php           | 47 ---------------------
 3 files changed, 109 deletions(-)
 delete mode 100644 includes/utils/class-amp-wp-utils.php
 delete mode 100644 tests/test-amp-wp-utils.php

diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index 3ec923b7bde..0533b2dd96b 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -86,7 +86,6 @@ class AMP_Autoloader {
 		'AMP_Image_Dimension_Extractor'               => 'includes/utils/class-amp-image-dimension-extractor',
 		'AMP_Validation_Utils'                        => 'includes/utils/class-amp-validation-utils',
 		'AMP_String_Utils'                            => 'includes/utils/class-amp-string-utils',
-		'AMP_WP_Utils'                                => 'includes/utils/class-amp-wp-utils',
 		'AMP_Widget_Archives'                         => 'includes/widgets/class-amp-widget-archives',
 		'AMP_Widget_Categories'                       => 'includes/widgets/class-amp-widget-categories',
 		'AMP_Widget_Media_Video'                      => 'includes/widgets/class-amp-widget-media-video',
diff --git a/includes/utils/class-amp-wp-utils.php b/includes/utils/class-amp-wp-utils.php
deleted file mode 100644
index bacb72458af..00000000000
--- a/includes/utils/class-amp-wp-utils.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-class AMP_WP_Utils {
-	/**
-	 * wp_parse_url in < WordPress 4.7 does not respect the component arg, so we're adding this helper so we can use it.
-	 *
-	 * This can be removed once 4.8 is out and we bump up our min supported WP version.
-	 */
-	public static function parse_url( $url, $component = -1 ) {
-		$parsed = wp_parse_url( $url, $component );
-
-		// Because < 4.7 always returned a full array regardless of component
-		if ( -1 !== $component && is_array( $parsed ) ) {
-			return self::_get_component_from_parsed_url_array( $parsed, $component );
-		}
-
-		return $parsed;
-	}
-
-	/**
-	 * Included for 4.6 back-compat
-	 *
-	 * Copied from https://developer.wordpress.org/reference/functions/_get_component_from_parsed_url_array/
-	 */
-	protected static function _get_component_from_parsed_url_array( $url_parts, $component = -1 ) {
-		if ( -1 === $component ) {
-			return $url_parts;
-		}
-
-		$key = self::_wp_translate_php_url_constant_to_key( $component );
-		if ( false !== $key && is_array( $url_parts ) && isset( $url_parts[ $key ] ) ) {
-			return $url_parts[ $key ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Included for 4.6 back-compat
-	 *
-	 * Copied from https://developer.wordpress.org/reference/functions/_wp_translate_php_url_constant_to_key/
-	 */
-	protected static function _wp_translate_php_url_constant_to_key( $constant ) {
-		$translation = array(
-			PHP_URL_SCHEME   => 'scheme',
-			PHP_URL_HOST     => 'host',
-			PHP_URL_PORT     => 'port',
-			PHP_URL_USER     => 'user',
-			PHP_URL_PASS     => 'pass',
-			PHP_URL_PATH     => 'path',
-			PHP_URL_QUERY    => 'query',
-			PHP_URL_FRAGMENT => 'fragment',
-		);
-
-		if ( isset( $translation[ $constant ] ) ) {
-			return $translation[ $constant ];
-		}
-
-		return false;
-	}
-}
diff --git a/tests/test-amp-wp-utils.php b/tests/test-amp-wp-utils.php
deleted file mode 100644
index 43f3b3a572e..00000000000
--- a/tests/test-amp-wp-utils.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-class AMP_WP_Utils__Parse_Url__Test extends WP_UnitTestCase {
-	function get_test_data() {
-		return array(
-			'valid__no_component' => array(
-				'https://example.com/path',
-				array(
-					'scheme' => 'https',
-					'host' => 'example.com',
-					'path' => '/path',
-				),
-				-1,
-			),
-
-			'valid__with_component' => array(
-				'https://example.com/path',
-				'example.com',
-				PHP_URL_HOST,
-			),
-
-			'valid__schemaless__no_component' => array(
-				'//example.com/path',
-				array(
-					'host' => 'example.com',
-					'path' => '/path',
-				),
-				-1,
-			),
-
-			'valid__schemaless__with_component' => array(
-				'//example.com/path',
-				'example.com',
-				PHP_URL_HOST,
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider get_test_data
-	 */
-	function test__method( $url, $expected, $component ) {
-		$actual = AMP_WP_Utils::parse_url( $url, $component );
-
-		$this->assertEquals( $expected, $actual );
-	}
-}