From 205c239eab1912d1a8650ae9ed926d28839ac1ec Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Thu, 17 Dec 2015 11:51:40 +0100
Subject: [PATCH] Remove deprecated OC_Helper::linkTo function

---
 lib/private/helper.php | 15 --------------
 tests/lib/helper.php   | 46 ------------------------------------------
 2 files changed, 61 deletions(-)

diff --git a/lib/private/helper.php b/lib/private/helper.php
index ed127a62f38..779a67a2340 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -66,21 +66,6 @@ class OC_Helper {
 		return OC::$server->getURLGenerator()->linkToRoute($route, $parameters);
 	}
 
-	/**
-	 * Creates an url
-	 * @param string $app app
-	 * @param string $file file
-	 * @param array $args array with param=>value, will be appended to the returned url
-	 *    The value of $args will be urlencoded
-	 * @return string the url
-	 * @deprecated Use \OC::$server->getURLGenerator()->linkTo($app, $file, $args)
-	 *
-	 * Returns a url to the given app and file.
-	 */
-	public static function linkTo( $app, $file, $args = array() ) {
-		return OC::$server->getURLGenerator()->linkTo($app, $file, $args);
-	}
-
 	/**
 	 * Creates an absolute url
 	 * @param string $app app
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index b7deb3fc13d..469ffecc773 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -294,52 +294,6 @@ class Test_Helper extends \Test\TestCase {
 		);
 	}
 
-	/**
-	 * @small
-	 * test linkTo URL construction
-	 * @dataProvider provideDocRootAppUrlParts
-	 */
-	public function testLinkToDocRoot($app, $file, $args, $expectedResult) {
-		\OC::$WEBROOT = '';
-		$result = \OC_Helper::linkTo($app, $file, $args);
-
-		$this->assertEquals($expectedResult, $result);
-	}
-
-	/**
-	 * @small
-	 * test linkTo URL construction in sub directory
-	 * @dataProvider provideSubDirAppUrlParts
-	 */
-	public function testLinkToSubDir($app, $file, $args, $expectedResult) {
-		\OC::$WEBROOT = '/owncloud';
-		$result = \OC_Helper::linkTo($app, $file, $args);
-
-		$this->assertEquals($expectedResult, $result);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideDocRootAppUrlParts() {
-		return array(
-			array('files', 'ajax/list.php', array(), '/index.php/apps/files/ajax/list.php'),
-			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
-			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php?trut=trat&dut=dat'),
-		);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideSubDirAppUrlParts() {
-		return array(
-			array('files', 'ajax/list.php', array(), '/owncloud/index.php/apps/files/ajax/list.php'),
-			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
-			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php?trut=trat&dut=dat'),
-		);
-	}
-
 	/**
 	 * @small
 	 * test linkToAbsolute URL construction
-- 
2.39.5