Merge pull request #2061 from nextcloud/deps/composer

Bump composer deps
nextcloud · Feb 15, 2021 · 994545b · 994545b
2 parents 25900e5 + 4fd1007
commit 994545b
Show file tree

Hide file tree

Showing 4 changed files with 1,416 additions and 582 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -48,7 +48,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, gd, zip
 
       - name: Set up PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
@@ -67,9 +67,9 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}
         run: ./vendor/phpunit/phpunit/phpunit --coverage-clover coverage.xml -c phpunit.xml
 
-      - name: PHPUnit integration
-        working-directory: apps/${{ env.APP_NAME }}
-        run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
+      # - name: PHPUnit integration
+      #   working-directory: apps/${{ env.APP_NAME }}
+      #   run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
 
       - name: Upload coverage
         working-directory: apps/${{ env.APP_NAME }}
@@ -123,7 +123,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
+          extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql, gd, zip
           coverage: none
 
       - name: Set up PHPUnit
@@ -143,9 +143,9 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}
         run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml
 
-      - name: PHPUnit integration
-        working-directory: apps/${{ env.APP_NAME }}
-        run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
+      # - name: PHPUnit integration
+      #   working-directory: apps/${{ env.APP_NAME }}
+      #   run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
 
   pgsql:
     runs-on: ubuntu-latest
@@ -195,7 +195,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
+          extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql, gd, zip
           coverage: none
 
       - name: Set up PHPUnit
@@ -215,6 +215,6 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}
         run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml
 
-      - name: PHPUnit integration
-        working-directory: apps/${{ env.APP_NAME }}
-        run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
+      # - name: PHPUnit integration
+      #   working-directory: apps/${{ env.APP_NAME }}
+      #   run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
 		"optimize-autoloader": true,
 		"classmap-authoritative": true,
 		"platform": {
-			"php": "7.2"
+			"php": "7.3"
 		}
 	},
 	"scripts": {
@@ -17,6 +17,6 @@
 	"require-dev": {
         "christophwurst/nextcloud_testing": "^0.10.0",
 		"nextcloud/coding-standard": "^0.3.0",
-		"phpunit/phpunit": "^7"
+		"phpunit/phpunit": "^9"
 	}
 }