[stable23] 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/ftp.yml b/.github/workflows/ftp.yml
index 87e66badd77ee3d34ef4d820c3a479e2149bf323..aa9fe3aad79136175662379a78b3a6379884bc77 100644 (file)
--- a/.github/workflows/ftp.yml
+++ b/.github/workflows/ftp.yml
@@ -44,7 +44,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/lint.yml b/.github/workflows/lint.yml
index db6f9bbf40cbe2ad9d22d7ca560a4845e7b24dcf..c59914eb9da4f1cc476ce7e238becd6a4afeb058 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
       uses: shivammathur/setup-php@master
       with:
         php-version: ${{ matrix.php-versions }}
-        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: Lint
       run: composer run lint
@@ -30,7 +30,7 @@ jobs:
       uses: shivammathur/setup-php@master
       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
         tools: cs2pr
     - name: Install dependencies

diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
index 382ba4dafec2afbaae0ff5cf5bf7c8b08d514ac2..b30960bdba23acc62fcc171612f06f6b056605df 100644 (file)
--- a/.github/workflows/oci.yml
+++ b/.github/workflows/oci.yml
@@ -40,7 +40,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
           tools: phpunit:9
           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/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index 0a2df0d71f9ae75743a0469921a93079c9aa4dde..31ee0f89fa20346edf42928b1352609b6017b64a 100644 (file)
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -17,7 +17,7 @@ jobs:
               uses: shivammathur/setup-php@master
               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
               run: composer i
@@ -43,7 +43,7 @@ jobs:
               uses: shivammathur/setup-php@master
               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
               run: composer i

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 ed8e550ca775916e35f0deafd2080bbc9e42fa42..94fac5260e1555d8b8cffd7c6dd6e74b71f65b09 100644 (file)
--- 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 078e3cf9a03f22a76e281c0b18771af1c63377a6..1730539d6fd4e1a19d86409fb64c75a5374848f1 100644 (file)
--- 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',