fix(ci): update composer packages, fix psalm and ch-check after update

Signed-off-by: Andrey Borysenko <[email protected]>
cloud-py-api · Oct 21, 2024 · 82e047f · 82e047f
1 parent 7ce8732
commit 82e047f
Show file tree

Hide file tree

Showing 41 changed files with 2,056 additions and 3,738 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -81,8 +81,8 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-versions: ["7.4", "8.0", "8.1"]
-        server-versions: ['25']
+        php-versions: ["8.0", "8.1"]
+        server-versions: ['30']
     name: php-psalm-analysis
 
     steps:
@@ -128,25 +128,29 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}
         run: composer run psalm
 
-  # php-security-analysis:
-  #   runs-on: ubuntu-latest
-  #   name: security analysis
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         submodules: recursive
-
-  #     - name: Psalm
-  #       uses: docker://vimeo/psalm-github-actions:4.9.3
-  #       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@v2
-  #       with:
-  #         sarif_file: results.sarif
+  php-security-analysis:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      actions: read
+      security-events: write
+    name: security analysis
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Psalm
+        uses: docker://vimeo/psalm-github-actions:4.30.0
+        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@v2
+        with:
+          sarif_file: results.sarif
 
   js-eslint:
     runs-on: ubuntu-22.04

diff --git a/composer.json b/composer.json
@@ -18,10 +18,10 @@
 	"require-dev": {
 		"nextcloud/ocp": "dev-master",
 		"roave/security-advisories": "dev-master",
-		"psalm/phar": "^4.30.0",
+		"psalm/phar": "^5.15",
 		"phpunit/phpunit": "^9.5",
-		"nextcloud/coding-standard": "^1.0",
-		"friendsofphp/php-cs-fixer": "^3.13"
+		"nextcloud/coding-standard": "^1.1",
+		"friendsofphp/php-cs-fixer": "^3.16"
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
@@ -41,7 +41,17 @@
 		"optimize-autoloader": true,
 		"classmap-authoritative": true,
 		"platform": {
-			"php": "7.4"
+			"php": "8.1"
+		}
+	},
+	"autoload": {
+		"psr-4": {
+			"OCA\\MediaDC\\": "lib/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"OCP\\": "vendor/nextcloud/ocp/OCP"
 		}
 	}
 }