mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove deprecated OC_Helper::linkTo function

This commit is contained in:
Roeland Jago Douma 2015-12-17 11:51:40 +01:00
parent 19eeb23b91
commit 205c239eab
2 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/helper.php
View File

@ -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

46
tests/lib/helper.php
View File

@ -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