From 022d0058cac4ea5aa611d2b9c7898ae8cb89cc6e Mon Sep 17 00:00:00 2001 From: MichaIng Date: Mon, 20 Dec 2021 13:36:54 +0100 Subject: [PATCH] [stable23] Remove iconv from dependencies and tests which is not used anymore since: https://github.com/nextcloud/server/pull/29470 Signed-off-by: MichaIng --- .github/workflows/ftp.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/oci.yml | 2 +- .github/workflows/s3-external.yml | 4 ++-- .github/workflows/static-code-analysis.yml | 4 ++-- .github/workflows/update-psalm-baseline.yml | 2 +- lib/private/App/PlatformRepository.php | 4 ---- lib/private/legacy/OC_Util.php | 1 - 8 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ftp.yml b/.github/workflows/ftp.yml index 87e66badd77ee..aa9fe3aad7913 100644 --- 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 db6f9bbf40cbe..c59914eb9da4f 100644 --- 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 382ba4dafec2a..b30960bdba23a 100644 --- 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 497de81ae2f79..dedab6b0c16fb 100644 --- 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 0a2df0d71f9ae..31ee0f89fa203 100644 --- 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 b5b38cd888b1c..9fdaeffe22c72 100644 --- 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 ed8e550ca7759..94fac5260e155 100644 --- a/lib/private/App/PlatformRepository.php +++ b/lib/private/App/PlatformRepository.php @@ -65,10 +65,6 @@ protected function initialize() { $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 078e3cf9a03f2..1730539d6fd4e 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -837,7 +837,6 @@ public static function checkServer(\OC\SystemConfig $config) { 'json_encode' => 'JSON', 'gd_info' => 'GD', 'gzencode' => 'zlib', - 'iconv' => 'iconv', 'simplexml_load_string' => 'SimpleXML', 'hash' => 'HASH Message Digest Framework', 'curl_init' => 'cURL',