Move strip protocol up.

Author: dereuromark

src/Utility/Utility.php

@@ -215,6 +215,26 @@ public static function cleanUrl($url, $headerRedirect = false) {
 		return $url;
 	}
 
+	/**
+	 * Remove http:// or other protocols from the link
+	 *
+	 * @param string $url
+	 * @param array $protocols Defaults to http and https. Pass empty array for all.
+	 * @return string strippedUrl
+	 */
+	public static function stripProtocol($url, $protocols = ['http', 'https']) {
+		$pieces = parse_url($url);
+		// Already stripped?
+		if (empty($pieces['scheme'])) {
+			return $url;
+		}
+		if ($protocols && !in_array($pieces['scheme'], $protocols)) {
+			return $url;
+		}
+
+		return mb_substr($url, mb_strlen($pieces['scheme']) + 3);
+	}
+
 	/**
 	 * A more robust wrapper around for file_exists() which easily
 	 * fails to return true for existent remote files.

src/View/Helper/TextHelper.php

@@ -6,6 +6,7 @@
 use Cake\View\Helper\TextHelper as CakeTextHelper;
 use Cake\View\View;
 use Tools\Utility\Number;
+use Tools\Utility\Utility;
 
 if (!defined('CHAR_HELLIP')) {
 	define('CHAR_HELLIP', '…'); # � (horizontal ellipsis = three dot leader)
@@ -60,7 +61,7 @@ public function minimizeUrl($url, $max = null, array $options = []) {
 			return $url;
 		}
 		// http:// etc has not to be displayed, so
-		$url = $this->stripProtocol($url);
+		$url = Utility::stripProtocol($url);
 		// cut the parameters
 		if (mb_strpos($url, '/') !== false) {
 			$url = strtok($url, '/');
@@ -81,21 +82,6 @@ public function minimizeUrl($url, $max = null, array $options = []) {
 		return $front . $placeholder . $end;
 	}
 
-	/**
-	 * Remove http:// or other protocols from the link
-	 *
-	 * @param string $url
-	 * @return string strippedUrl
-	 */
-	public function stripProtocol($url) {
-		$pieces = parse_url($url);
-		// Already stripped?
-		if (empty($pieces['scheme'])) {
-			return $url;
-		}
-		return mb_substr($url, mb_strlen($pieces['scheme']) + 3); # +3 <=> :// # can only be 4 with "file" (file:///)...
-	}
-
 	/**
 	 * Transforming int values into ordinal numbers (1st, 3rd, ...).
 	 * When using HTML, you can use <sup>, as well.

tests/TestCase/Utility/UtilityTest.php

@@ -283,6 +283,23 @@ public function testCleanUrl() {
 		$this->assertSame('http://www.spiegel.de', $res);
 	}
 
+	/**
+	 * @return void
+	 */
+	public function testStripUrl() {
+		$urls = [
+			'http://www.cakephp.org/bla/bla' => 'www.cakephp.org/bla/bla',
+			'www.cakephp.org' => 'www.cakephp.org',
+			'https://spiegel.de' => 'spiegel.de',
+			'ftp://xyz' => 'ftp://xyz',
+		];
+
+		foreach ($urls as $url => $expected) {
+			$is = Utility::stripProtocol($url);
+			$this->assertEquals($expected, $is, $url);
+		}
+	}
+
 	/**
 	 * @covers ::trimDeep
 	 * @return void

tests/TestCase/View/Helper/TextHelperTest.php

@@ -73,23 +73,6 @@ public function testAutoLinkEmailsWithHtmlOrDangerousStrings() {
 		$this->assertEquals($expected, $result);
 	}
 
-	/**
-	 * TextExtHelperTest::testStripProtocol()
-	 *
-	 * @return void
-	 */
-	public function testStripProtocol() {
-		$urls = [
-			'http://www.cakephp.org/bla/bla' => 'www.cakephp.org/bla/bla',
-			'www.cakephp.org' => 'www.cakephp.org'
-		];
-
-		foreach ($urls as $url => $expected) {
-			$is = $this->Text->stripProtocol($url);
-			$this->assertEquals($expected, $is);
-		}
-	}
-
 	/**
 	 * TextExtHelperTest::testAutoLinkUrls()
 	 *