Move OC_Helper code to OCP\Util for linkToRemote

diff --git a/lib/private/helper.php b/lib/private/helper.php
index efbc6bda1dbd3bcf2d27007508be170f510635b0..bd69c13de507bcaf73ed6d127e4a65e13a870c29 100644 (file)
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -53,32 +53,6 @@ use Symfony\Component\Process\ExecutableFinder;
 class OC_Helper {
        private static $templateManager;
 
-       /**
-        * Creates an url for remote use
-        * @param string $service id
-        * @return string the url
-        *
-        * Returns a url to the given service.
-        */
-       public static function linkToRemoteBase($service) {
-               return OC::$server->getURLGenerator()->linkTo('', 'remote.php') . '/' . $service;
-       }
-
-       /**
-        * Creates an absolute url for remote use
-        * @param string $service id
-        * @param bool $add_slash
-        * @return string the url
-        *
-        * Returns a absolute url to the given service.
-        */
-       public static function linkToRemote($service, $add_slash = true) {
-               return OC::$server->getURLGenerator()->getAbsoluteURL(
-                       self::linkToRemoteBase($service)
-                               . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '')
-               );
-       }
-
        /**
         * Creates an absolute url for public use
         * @param string $service id

diff --git a/lib/public/util.php b/lib/public/util.php
index 6f5016fa4a12a57710d36e71ac8e5bca52193ca7..a9fe0e47de6e8e2a53c058ccb71d6079fa7b8dce 100644 (file)
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -282,7 +282,11 @@ class Util {
         * @since 4.0.0
         */
        public static function linkToRemote( $service ) {
-               return(\OC_Helper::linkToRemote( $service ));
+               $urlGenerator = \OC::$server->getURLGenerator();
+               $remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
+               return $urlGenerator->getAbsoluteURL(
+                       $remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
+               );
        }
 
        /**

diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 22737f170d83787f230c0b60274260662ccf2a3e..468d32bc37ae8c2bc22bed95b025d41019d75f49 100644 (file)
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -243,38 +243,6 @@ class Test_Helper extends \Test\TestCase {
 
        // Url generator methods
 
-       /**
-        * @small
-        * test linkToRemoteBase URL construction
-        */
-       public function testLinkToRemoteBase() {
-               \OC::$WEBROOT = '';
-               $result = \OC_Helper::linkToRemoteBase('webdav');
-               $this->assertEquals('/remote.php/webdav', $result);
-
-               \OC::$WEBROOT = '/owncloud';
-               $result = \OC_Helper::linkToRemoteBase('webdav');
-               $this->assertEquals('/owncloud/remote.php/webdav', $result);
-       }
-
-       /**
-        * @small
-        * test linkToRemote URL construction
-        */
-       public function testLinkToRemote() {
-               \OC::$WEBROOT = '';
-               $result = \OC_Helper::linkToRemote('webdav');
-               $this->assertEquals('http://localhost/remote.php/webdav/', $result);
-               $result = \OC_Helper::linkToRemote('webdav', false);
-               $this->assertEquals('http://localhost/remote.php/webdav', $result);
-
-               \OC::$WEBROOT = '/owncloud';
-               $result = \OC_Helper::linkToRemote('webdav');
-               $this->assertEquals('http://localhost/owncloud/remote.php/webdav/', $result);
-               $result = \OC_Helper::linkToRemote('webdav', false);
-               $this->assertEquals('http://localhost/owncloud/remote.php/webdav', $result);
-       }
-
        /**
         * @small
         * test linkToPublic URL construction