Merge pull request #10249 from nextcloud/build/noid/run-tests-for-sta…

…ble30

[stable4.0] build: run tests against stable30

.github/workflows/psalm-matrix.yml

@@ -21,7 +21,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-master' ]
+        ocp-version: [ 'dev-stable30' ]
 
     name: static-psalm-analysis ${{ matrix.ocp-version }}
     steps:

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1', '8.2', '8.3']
-        nextcloud-versions: ['master']
+        nextcloud-versions: ['stable30']
     name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
     steps:
     - name: Set up Nextcloud env
@@ -57,16 +57,16 @@ jobs:
       strategy:
           matrix:
               php-versions: ['8.3']
-              nextcloud-versions: ['master']
+              nextcloud-versions: ['stable30']
               db: ['sqlite', 'mysql', 'pgsql']
               cache: ['nocache']
               include:
                 - php-versions: 8.1
-                  nextcloud-versions: master
+                  nextcloud-versions: stable30
                   db: 'sqlite'
                   cache: 'redis'
                 - php-versions: 8.2
-                  nextcloud-versions: master
+                  nextcloud-versions: stable30
                   db: 'mysql'
                   cache: 'redis'
       name: ${{ matrix.nextcloud-versions }} w/ php${{ matrix.php-versions }}-${{ matrix.db }}-${{ matrix.cache }} integration tests
@@ -145,7 +145,7 @@ jobs:
             if: ${{ matrix.php-versions == '8.2' }}
             run: sed -i 's/max-version="8.1"/max-version="8.2"/' nextcloud/apps/mail/appinfo/info.xml
           - name: Install Mail
-            run: php -f nextcloud/occ app:enable -f mail
+            run: php -f nextcloud/occ app:enable mail
           - name: Configure Nextcloud for testing
             run: |
                 php -f nextcloud/occ config:system:set debug --type bool --value true

composer.json

@@ -38,13 +38,15 @@
 		"nextcloud/kitinerary-flatpak": "^1.0",
 		"nextcloud/kitinerary-sys": "^1.0.1",
 		"phpmailer/dkimvalidator": "^0.3.0",
-		"psr/log": "^1",
 		"rubix/ml": "2.5.0",
 		"sabberworm/php-css-parser": "^8.6.0",
 		"youthweb/urllinker": "^2.0"
 	},
 	"require-dev": {
+		"fig/log-test": "^1.1",
+		"nextcloud/ocp": "dev-stable30",
 		"psalm/phar": "^5.25.0",
+		"psr/log": "^2.0.0",
 		"roave/security-advisories": "dev-master"
 	},
 	"autoload": {