aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMichaIng <micha@dietpi.com>2021-11-30 13:07:02 +0100
committerGitHub <noreply@github.com>2021-11-30 13:07:02 +0100
commitd16d4d3459c87fe56569ca820a76bf4f44c9683b (patch)
treea68e1b04093559555732695b64dfd420e419a861 /lib/private
parenta85b735ccb33f1266122027247d6fb2207708201 (diff)
parent0d749b7e9a67c0c4f160a59c55521c76ff04be01 (diff)
downloadnextcloud-server-d16d4d3459c87fe56569ca820a76bf4f44c9683b.tar.gz
nextcloud-server-d16d4d3459c87fe56569ca820a76bf4f44c9683b.zip
Merge pull request #29958 from nextcloud/fix/translit-php8/deps-and-tests
Remove iconv from dependencies and tests
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/App/PlatformRepository.php4
-rw-r--r--lib/private/legacy/OC_Util.php1
2 files changed, 0 insertions, 5 deletions
diff --git a/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php
index ed8e550ca77..94fac5260e1 100644
--- a/lib/private/App/PlatformRepository.php
+++ b/lib/private/App/PlatformRepository.php
@@ -65,10 +65,6 @@ class PlatformRepository {
$prettyVersion = $curlVersion['version'];
break;
- case 'iconv':
- $prettyVersion = ICONV_VERSION;
- break;
-
case 'intl':
$name = 'ICU';
if (defined('INTL_ICU_VERSION')) {
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
index 078e3cf9a03..1730539d6fd 100644
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -837,7 +837,6 @@ class OC_Util {
'json_encode' => 'JSON',
'gd_info' => 'GD',
'gzencode' => 'zlib',
- 'iconv' => 'iconv',
'simplexml_load_string' => 'SimpleXML',
'hash' => 'HASH Message Digest Framework',
'curl_init' => 'cURL',