From 3c767e3fda0374f9a2d3f6778f00798e71564c4d Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Fri, 27 Mar 2020 16:08:24 -0400
Subject: [PATCH] Remove these newly added methods for now to focus and
 evaluate a little later (WireFileTools)

---
 wire/core/WireFileTools.php | 100 ------------------------------------
 1 file changed, 100 deletions(-)

diff --git a/wire/core/WireFileTools.php b/wire/core/WireFileTools.php
index ab4054bc..9fdbf809 100644
--- a/wire/core/WireFileTools.php
+++ b/wire/core/WireFileTools.php
@@ -1344,104 +1344,4 @@ class WireFileTools extends Wire {
 		return $this->unixDirName(getcwd());
 	}
 
-	/**
-	 * Convert local/server disk path to URL
-	 * 
-	 * @param string $path Server disk path to dir or file that maps somewhere within web document root
-	 * @param bool $http Return full URL with scheme and hostname? (default=false)
-	 * @return string
-	 * @throws WireException If given path outside document root
-	 * @since 3.0.154
-	 * 
-	 * 
-	 */
-	public function pathToUrl($path, $http = false) {
-		
-		$config = $this->wire('config'); /** @var Config $config */
-		$rootPath = $config->paths->root;
-		$rootUrl = $config->urls->root;
-		$trailer = rtrim($path, '/\\') !== $path ? '/' : '';
-		$path = $this->unixFileName($path);
-		$validPath = true;
-		
-		if(!$trailer && is_dir($path)) $trailer = '/';
-		
-		if($rootUrl !== '/') {
-			// make root path exclude installation root subdirectory
-			$rootPath = substr($rootPath, 0, -1 * strlen($rootUrl)) . '/';
-		}
-		
-		if(strpos($path, $rootPath) !== 0) {
-			// check if a document root path alias is in use
-			if(isset($_SERVER['DOCUMENT_ROOT'])) {
-				$rootPath = $this->unixDirName($_SERVER['DOCUMENT_ROOT']);
-				$validPath = strpos($path, $rootPath) === 0;
-			} else {
-				$validPath = false;
-			}
-		}
-		
-		if(!$validPath) {
-			throw new WireException('Path must be somewhere within web document root');
-		}
-
-		$url = substr($path, strlen($rootPath) - 1) . $trailer;
-		
-		if($http) {
-			$url = ($config->https ? 'https://' : 'http://') . $config->httpHost . $url;
-		}
-	
-		return $url;
-	}
-
-	/**
-	 * Convert URL to local/server disk path 
-	 * 
-	 * When site is running within a subdirectory like /pw/, a leading slash in given `$url` refers to
-	 * document root, while no leading slash in $url refers to PW installation root. If site is not
-	 * running from a subdirectory, then it makes no difference as the result would be the same. 
-	 * 
-	 * @param string $url 
-	 * @return string
-	 * @throws WireException If given invalid URL or URL with non-local hostname
-	 * @since 3.0.154
-	 * 
-	 */
-	public function urlToPath($url) {
-	
-		$config = $this->wire('config'); /** @var Config $config */
-		$rootPath = $config->paths->root;
-		$rootUrl = $config->urls->root;
-		
-		if(strpos($url, '://') || strpos($url, '//') === 0) {
-			// URL has scheme and hostname, validate that it is local and convert to “/url”
-			$a = parse_url($url); 
-			if($a === false || empty($a['host']) || !isset($a['path'])) {
-				throw new WireException('Cannot convert invalid URL to path');
-			}
-			if(!in_array($a['host'], $config->httpHosts)) {
-				throw new WireException('External URL cannot convert to local path');
-			}
-			$url = $a['path'];	
-		}
-		
-		if($rootUrl === '/') {
-			// site is running from root of hostname, so this is easy
-			$path = $rootPath . ltrim($url, '/');
-			
-		} else if(strpos($url, '/') === 0) {
-			// site in subdirectory and url begins with slash, so use path from document root
-			$path = substr($rootPath, 0, -1 * strlen($rootUrl)) . $url;
-			
-		} else {
-			// site in subdirectory, no leading slash, so relative to PW’s rootPath
-			$path = $rootPath . $url;
-		}
-
-		// ensure directories end with a trailing slash
-		if(substr($path, -1) !== '/' && is_dir($path)) $path .= '/';
-		
-		return $path;
-	}
-
 }
\ No newline at end of file