Merge pull request #1177 from nextcloud/enh/noid/update-dependencies

Update dependencies

Author: julien-nc

.github/workflows/integration.yml

@@ -101,7 +101,10 @@ jobs:
 
       - name: Set up PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
+        # remove psalm because it requires php >= 8.2 and we want to test with 8.1
+        run: |
+          composer uninstall --dev psalm/phar
+          composer i
 
       - name: Set up Nextcloud
         run: |

.github/workflows/lint.yml

@@ -50,7 +50,10 @@ jobs:
         coverage: none
 
     - name: Install dependencies
-      run: composer i
+      # remove psalm because it requires php >= 8.2 and we want to test with 8.0
+      run: |
+        composer uninstall --dev psalm/phar phpunit/phpunit
+        composer i
 
     - name: Run coding standards check
       run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

.github/workflows/phpunit.yml

@@ -21,32 +21,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.0', '8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3']
         databases: ['mysql']
         server-versions: ['stable29', 'stable30', 'stable31', 'master']
-        exclude:
-          - php-versions: 8.0
-            server-versions: master
-          - php-versions: 8.0
-            server-versions: stable31
-          - php-versions: 8.0
-            server-versions: stable30
         include:
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: stable29
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: stable30
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: stable31
           - php-versions: 8.4
             databases: mysql
             server-versions: stable31
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: master
           - php-versions: 8.4
             databases: mysql
             server-versions: master
@@ -100,7 +81,10 @@ jobs:
 
       - name: Set up PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
+        # remove psalm because it requires php >= 8.2 and we want to test with 8.1
+        run: |
+          composer uninstall --dev psalm/phar
+          composer i
 
       - name: Set up Nextcloud
         run: |

composer.json

@@ -36,9 +36,9 @@
   "require-dev": {
     "nextcloud/coding-standard": "^1.0.0",
     "symfony/event-dispatcher": "^4",
-    "phpunit/phpunit": "^9.5",
     "nextcloud/ocp": "dev-stable28",
-    "psalm/phar": "6.7.x"
+    "psalm/phar": "^6",
+    "phpunit/phpunit": "^10"
   },
   "extra": {
     "mozart": {