[stable22] Remove iconv from dependencies and tests

which is not used anymore since: https://github.com/nextcloud/server/pull/29470

Signed-off-by: MichaIng <micha@dietpi.com>

diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
index 31614b8f38f0990cca8b78be8739435522548b75..2f2ee8f570cf26b5b28cfff88dc0f75d87cb979c 100644 (file)
--- a/.github/workflows/oci.yml
+++ b/.github/workflows/oci.yml
@@ -41,7 +41,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, oci8
+          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, oci8
           tools: phpunit:8.5.2
           coverage: none
 

diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml
index 497de81ae2f79edebbee5e0ef80523e956a19eb5..dedab6b0c16fbdde752121313befc0f4b58e9492 100644 (file)
--- a/.github/workflows/s3-external.yml
+++ b/.github/workflows/s3-external.yml
@@ -45,7 +45,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
 
       - name: Set up Nextcloud
         run: |
@@ -94,7 +94,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
 
       - name: Set up Nextcloud
         run: |

diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
index b5b38cd888b1c634cc708ea93efd673ddc29f02e..9fdaeffe22c72f454febbd4f0a48b1d9c5e16cae 100644 (file)
--- a/.github/workflows/update-psalm-baseline.yml
+++ b/.github/workflows/update-psalm-baseline.yml
@@ -18,7 +18,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
 
       - name: Composer install

diff --git a/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php
index 816470e1202788fff322d639e0b75751e14da996..5dd312582d61a3dda61bb109648554932521883f 100644 (file)
--- a/lib/private/App/PlatformRepository.php
+++ b/lib/private/App/PlatformRepository.php
@@ -67,10 +67,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 64a1083805d629832b57f126a49494fe62022d9f..9cf30bb508df333f5c53f6df10ee8db6d6d292eb 100644 (file)
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -854,7 +854,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',