diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-03-12 16:33:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-12 16:33:46 +0100 |
commit | 432e529827a10d038385ee994814b78b5141cf3c (patch) | |
tree | be410cffd4f50b84a60805bcd940f89b4cae2b46 /lib/private | |
parent | 324ce5a993daf5e907bc7dec6ce364daf6a754aa (diff) | |
parent | f5c5c5181f66e15ff3ccc30fa32e84e20a863182 (diff) | |
download | nextcloud-server-432e529827a10d038385ee994814b78b5141cf3c.tar.gz nextcloud-server-432e529827a10d038385ee994814b78b5141cf3c.zip |
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper
Remove unused and deprecated class and interface AppHelper
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/App/CodeChecker/DeprecationCheck.php | 1 | ||||
-rw-r--r-- | lib/private/AppHelper.php | 48 | ||||
-rw-r--r-- | lib/private/Server.php | 10 |
3 files changed, 0 insertions, 59 deletions
diff --git a/lib/private/App/CodeChecker/DeprecationCheck.php b/lib/private/App/CodeChecker/DeprecationCheck.php index 722697f3313..3e843e4f91a 100644 --- a/lib/private/App/CodeChecker/DeprecationCheck.php +++ b/lib/private/App/CodeChecker/DeprecationCheck.php @@ -40,7 +40,6 @@ class DeprecationCheck extends AbstractCheck { 'OCP\Contacts' => '8.1.0', 'OCP\DB' => '8.1.0', - 'OCP\IHelper' => '8.1.0', 'OCP\JSON' => '8.1.0', 'OCP\Response' => '8.1.0', 'OCP\AppFramework\IApi' => '8.0.0', diff --git a/lib/private/AppHelper.php b/lib/private/AppHelper.php deleted file mode 100644 index c99cf4a8304..00000000000 --- a/lib/private/AppHelper.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Bart Visscher <bartv@thisnet.nl> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Morris Jobke <hey@morrisjobke.de> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OC; - -/** - * Class AppHelper - * @deprecated 8.1.0 - */ -class AppHelper implements \OCP\IHelper { - /** - * Gets the content of an URL by using CURL or a fallback if it is not - * installed - * @param string $url the url that should be fetched - * @return string the content of the webpage - * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService - */ - public function getUrlContent($url) { - try { - $client = \OC::$server->getHTTPClientService()->newClient(); - $response = $client->get($url); - return $response->getBody(); - } catch (\Exception $e) { - return false; - } - } -} diff --git a/lib/private/Server.php b/lib/private/Server.php index e0bd21b0358..af739c91b02 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -470,9 +470,6 @@ class Server extends ServerContainer implements IServerContainer { }); $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class); - $this->registerService('AppHelper', function ($c) { - return new \OC\AppHelper(); - }); $this->registerAlias('AppFetcher', AppFetcher::class); $this->registerAlias('CategoryFetcher', CategoryFetcher::class); @@ -1459,13 +1456,6 @@ class Server extends ServerContainer implements IServerContainer { } /** - * @return \OCP\IHelper - */ - public function getHelper() { - return $this->query('AppHelper'); - } - - /** * @return AppFetcher */ public function getAppFetcher() { |