diff options
| -rw-r--r-- | lib/private/helper.php | 12 | ||||
| -rw-r--r-- | tests/lib/helper.php | 42 |
2 files changed, 0 insertions, 54 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 72282362fe6..92ae25de4cc 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -70,18 +70,6 @@ class OC_Helper { } /** - * Makes an $url absolute - * @param string $url the url - * @return string the absolute url - * @deprecated Use \OC::$server->getURLGenerator()->getAbsoluteURL($url) - * - * Returns a absolute url to the given app and file. - */ - public static function makeURLAbsolute($url) { - return OC::$server->getURLGenerator()->getAbsoluteURL($url); - } - - /** * Creates an url for remote use * @param string $service id * @return string the url diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 51f7342f456..794502e5e21 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -245,48 +245,6 @@ class Test_Helper extends \Test\TestCase { /** * @small - * test absolute URL construction - * @dataProvider provideDocRootURLs - */ - function testMakeAbsoluteURLDocRoot($url, $expectedResult) { - \OC::$WEBROOT = ''; - $result = \OC_Helper::makeURLAbsolute($url); - - $this->assertEquals($expectedResult, $result); - } - - /** - * @small - * test absolute URL construction - * @dataProvider provideSubDirURLs - */ - function testMakeAbsoluteURLSubDir($url, $expectedResult) { - \OC::$WEBROOT = '/owncloud'; - $result = \OC_Helper::makeURLAbsolute($url); - - $this->assertEquals($expectedResult, $result); - } - - public function provideDocRootURLs() { - return array( - array('index.php', 'http://localhost/index.php'), - array('/index.php', 'http://localhost/index.php'), - array('/apps/index.php', 'http://localhost/apps/index.php'), - array('apps/index.php', 'http://localhost/apps/index.php'), - ); - } - - public function provideSubDirURLs() { - return array( - array('index.php', 'http://localhost/owncloud/index.php'), - array('/index.php', 'http://localhost/owncloud/index.php'), - array('/apps/index.php', 'http://localhost/owncloud/apps/index.php'), - array('apps/index.php', 'http://localhost/owncloud/apps/index.php'), - ); - } - - /** - * @small * test linkToAbsolute URL construction * @dataProvider provideDocRootAppAbsoluteUrlParts */ |