Skip to content

Commit 7375a1b

Browse files
committed
[stable22] Remove iconv from dependencies and tests
which is not used anymore since: #29470 Signed-off-by: MichaIng <[email protected]>
1 parent ab74892 commit 7375a1b

File tree

7 files changed

+8
-13
lines changed

7 files changed

+8
-13
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: shivammathur/setup-php@master
1616
with:
1717
php-version: ${{ matrix.php-versions }}
18-
extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
18+
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
1919
coverage: none
2020
- name: Lint
2121
run: composer run lint
@@ -30,7 +30,7 @@ jobs:
3030
uses: shivammathur/setup-php@master
3131
with:
3232
php-version: 7.4
33-
extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
33+
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
3434
coverage: none
3535
tools: cs2pr
3636
- name: Install dependencies

.github/workflows/oci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: shivammathur/setup-php@v2
4242
with:
4343
php-version: ${{ matrix.php-versions }}
44-
extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
44+
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
4545
tools: phpunit:8.5.2
4646
coverage: none
4747

.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/static-code-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: shivammathur/setup-php@master
1818
with:
1919
php-version: 7.4
20-
extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
20+
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
2121
coverage: none
2222
- name: Composer install
2323
run: composer i
@@ -43,7 +43,7 @@ jobs:
4343
uses: shivammathur/setup-php@master
4444
with:
4545
php-version: 7.4
46-
extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
46+
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
4747
coverage: none
4848
- name: Composer install
4949
run: composer i

.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
@@ -65,10 +65,6 @@ protected function initialize() {
6565
$prettyVersion = $curlVersion['version'];
6666
break;
6767

68-
case 'iconv':
69-
$prettyVersion = ICONV_VERSION;
70-
break;
71-
7268
case 'intl':
7369
$name = 'ICU';
7470
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
@@ -836,7 +836,6 @@ public static function checkServer(\OC\SystemConfig $config) {
836836
'json_encode' => 'JSON',
837837
'gd_info' => 'GD',
838838
'gzencode' => 'zlib',
839-
'iconv' => 'iconv',
840839
'simplexml_load_string' => 'SimpleXML',
841840
'hash' => 'HASH Message Digest Framework',
842841
'curl_init' => 'cURL',

0 commit comments

Comments
 (0)