From a1b8e5981c248a78d43c9ab8f80ca92b3a2d365d Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Wed, 23 Dec 2020 20:03:08 +0100
Subject: [PATCH] Add ext-zip as platform dependency

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 .github/workflows/lint.yml                  | 2 ++
 .github/workflows/oci.yml                   | 2 +-
 .github/workflows/psalm-security.yml        | 1 +
 .github/workflows/static-code-analysis.yml  | 2 ++
 .github/workflows/update-psalm-baseline.yml | 1 +
 composer.json                               | 5 +++--
 composer.lock                               | 5 +++--
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b4037759b3c0b..8fdd29480005e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,6 +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
         coverage: none
     - name: Lint
       run: composer run lint
@@ -29,6 +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
         coverage: none
         tools: cs2pr
     - name: Install dependencies
diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
index 31614b8f38f09..04d1dfdbab7cd 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: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, oci8
+          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
           tools: phpunit:8.5.2
           coverage: none
 
diff --git a/.github/workflows/psalm-security.yml b/.github/workflows/psalm-security.yml
index 0e19cda2d33cf..99f90681feb3c 100644
--- a/.github/workflows/psalm-security.yml
+++ b/.github/workflows/psalm-security.yml
@@ -19,6 +19,7 @@ jobs:
         uses: docker://vimeo/psalm-github-actions
         with:
           security_analysis: true
+          composer_ignore_platform_reqs: false
           report_file: results.sarif
       - name: Upload Security Analysis results to GitHub
         uses: github/codeql-action/upload-sarif@v1
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index 4057adbe8d76c..fb415b585ec44 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -17,6 +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
                 coverage: none
             - name: Composer install
               run: composer i
@@ -42,6 +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
                 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 ac0bc907aff15..c9ca2e85a6c0e 100644
--- a/.github/workflows/update-psalm-baseline.yml
+++ b/.github/workflows/update-psalm-baseline.yml
@@ -19,6 +19,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
           coverage: none
       - name: Composer install
         run: composer i
diff --git a/composer.json b/composer.json
index 405aaca088b3f..51762b840984f 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,9 @@
         "ext-libxml": "*",
         "ext-pdo": "*",
         "ext-simplexml": "*",
-        "ext-xmlreader": "*"
-	},
+        "ext-xmlreader": "*",
+        "ext-zip": "*"
+    },
     "require-dev": {
         "nextcloud/coding-standard": "^0.5.0",
         "vimeo/psalm": "^4.0"
diff --git a/composer.lock b/composer.lock
index ef23a831f7fde..88c8b05fe0ca9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4970547e139d7ea77cd8b6d38c729084",
+    "content-hash": "9e703ab133e8363e26a67dbd639a297c",
     "packages": [],
     "packages-dev": [
         {
@@ -3032,7 +3032,8 @@
         "ext-libxml": "*",
         "ext-pdo": "*",
         "ext-simplexml": "*",
-        "ext-xmlreader": "*"
+        "ext-xmlreader": "*",
+        "ext-zip": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.0.0"