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

Merge pull request #11685 from nextcloud/deprecation/noid/oc_helper_linkToPublic 

Deprecate unused, private OC_Helper::linkToPublic
This commit is contained in:
Morris Jobke 2018-10-09 09:40:40 +02:00 committed by GitHub
parent 43ed8bb91a db345e4c6d
commit 28f3fe2b72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/legacy/helper.php
View File

@ -51,23 +51,6 @@ use Symfony\Component\Process\ExecutableFinder;
class OC_Helper { class OC_Helper {
private static $templateManager; private static $templateManager;
/**
* Creates an absolute url for public use
* @param string $service id
* @param bool $add_slash
* @return string the url
*
* Returns a absolute url to the given service.
*/
public static function linkToPublic($service, $add_slash = false) {
if ($service === 'files') {
$url = OC::$server->getURLGenerator()->getAbsoluteURL('/s');
} else {
$url = OC::$server->getURLGenerator()->getAbsoluteURL(OC::$server->getURLGenerator()->linkTo('', 'public.php').'?service='.$service);
}
return $url . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
}
/** /**
* Make a human file size * Make a human file size
* @param int $bytes file size in bytes * @param int $bytes file size in bytes

7
lib/public/Util.php
View File

@ -230,9 +230,14 @@ class Util {
* @param string $service id * @param string $service id
* @return string the url * @return string the url
* @since 4.5.0 * @since 4.5.0
* @deprecated 15.0.0 - use OCP\IURLGenerator
*/ */
public static function linkToPublic($service) { public static function linkToPublic($service) {
return \OC_Helper::linkToPublic($service); $urlGenerator = \OC::$server->getURLGenerator();
if ($service === 'files') {
return $urlGenerator->getAbsoluteURL('/s');
}
return $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'public.php').'?service='.$service);
} }
/** /**

38
tests/lib/LegacyHelperTest.php
View File

@ -222,44 +222,6 @@ class LegacyHelperTest extends \Test\TestCase {
); );
} }
// Url generator methods
/**
* @small
* test linkToPublic URL construction
*/
public function testLinkToPublic() {
\OC::$WEBROOT = '';
$result = \OC_Helper::linkToPublic('files');
$this->assertEquals('http://localhost/s', $result);
$result = \OC_Helper::linkToPublic('files', false);
$this->assertEquals('http://localhost/s', $result);
$result = \OC_Helper::linkToPublic('files', true);
$this->assertEquals('http://localhost/s/', $result);
$result = \OC_Helper::linkToPublic('other');
$this->assertEquals('http://localhost/public.php?service=other', $result);
$result = \OC_Helper::linkToPublic('other', false);
$this->assertEquals('http://localhost/public.php?service=other', $result);
$result = \OC_Helper::linkToPublic('other', true);
$this->assertEquals('http://localhost/public.php?service=other/', $result);
\OC::$WEBROOT = '/owncloud';
$result = \OC_Helper::linkToPublic('files');
$this->assertEquals('http://localhost/owncloud/s', $result);
$result = \OC_Helper::linkToPublic('files', false);
$this->assertEquals('http://localhost/owncloud/s', $result);
$result = \OC_Helper::linkToPublic('files', true);
$this->assertEquals('http://localhost/owncloud/s/', $result);
$result = \OC_Helper::linkToPublic('other');
$this->assertEquals('http://localhost/owncloud/public.php?service=other', $result);
$result = \OC_Helper::linkToPublic('other', false);
$this->assertEquals('http://localhost/owncloud/public.php?service=other', $result);
$result = \OC_Helper::linkToPublic('other', true);
$this->assertEquals('http://localhost/owncloud/public.php?service=other/', $result);
}
/** /**
* Tests recursive folder deletion with rmdirr() * Tests recursive folder deletion with rmdirr()
*/ */