diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-01-07 10:46:42 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-07 10:46:42 +0300 |
commit | 42f195bde99e667321c3a5b23b1817e052a769d7 (patch) | |
tree | 90f78f8af290365d14f3103a681918be916e13c9 | |
parent | adf01ab089dec4cfcd6eea64b5a74c3b28e6e171 (diff) | |
parent | 7375a1b747c3b09f71996609969601bfbfdcd423 (diff) |
Merge pull request #30515 from nextcloud/backport/29958/stable22
[stable22] Remove iconv from dependencies and tests
-rw-r--r-- | .github/workflows/lint.yml | 4 | ||||
-rw-r--r-- | .github/workflows/oci.yml | 2 | ||||
-rw-r--r-- | .github/workflows/s3-external.yml | 4 | ||||
-rw-r--r-- | .github/workflows/static-code-analysis.yml | 4 | ||||
-rw-r--r-- | .github/workflows/update-psalm-baseline.yml | 2 | ||||
-rw-r--r-- | lib/private/App/PlatformRepository.php | 4 | ||||
-rw-r--r-- | lib/private/legacy/OC_Util.php | 1 |
7 files changed, 8 insertions, 13 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8fdd2948000..3533e188932 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 04d1dfdbab7..7c653d10d06 100644 --- 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: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip + extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip tools: phpunit:8.5.2 coverage: none diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml index 497de81ae2f..dedab6b0c16 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 0a2df0d71f9..31ee0f89fa2 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 b5b38cd888b..9fdaeffe22c 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 ed8e550ca77..94fac5260e1 100644 --- 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 49d24efdfb9..d351b0daa76 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -836,7 +836,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', |