Skip to content

Commit fc8eadf

Browse files
MichaIngbackportbot[bot]
authored andcommitted
[stable22] Remove iconv from dependencies and tests
which is not used anymore since: #29470 Signed-off-by: MichaIng <micha@dietpi.com>
1 parent 064f261 commit fc8eadf

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

.github/workflows/s3-external.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
php-version: ${{ matrix.php-versions }}
4747
tools: phpunit
48-
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
48+
extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
4949

5050
- name: Set up Nextcloud
5151
run: |
@@ -94,7 +94,7 @@ jobs:
9494
with:
9595
php-version: ${{ matrix.php-versions }}
9696
tools: phpunit
97-
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
97+
extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
9898

9999
- name: Set up Nextcloud
100100
run: |

.github/workflows/update-psalm-baseline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: shivammathur/setup-php@v2
1919
with:
2020
php-version: 7.4
21-
extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
21+
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
2222
coverage: none
2323

2424
- name: Composer install

lib/private/App/PlatformRepository.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ protected function initialize() {
6767
$prettyVersion = $curlVersion['version'];
6868
break;
6969

70-
case 'iconv':
71-
$prettyVersion = ICONV_VERSION;
72-
break;
73-
7470
case 'intl':
7571
$name = 'ICU';
7672
if (defined('INTL_ICU_VERSION')) {

lib/private/legacy/OC_Util.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,6 @@ public static function checkServer(\OC\SystemConfig $config) {
854854
'json_encode' => 'JSON',
855855
'gd_info' => 'GD',
856856
'gzencode' => 'zlib',
857-
'iconv' => 'iconv',
858857
'simplexml_load_string' => 'SimpleXML',
859858
'hash' => 'HASH Message Digest Framework',
860859
'curl_init' => 'cURL',

0 commit comments

Comments
 (0)