Use composer requirements for psalm action and upgrade to nextcloud/ocp

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

.github/workflows/psalm.yml

@@ -11,14 +11,10 @@ jobs:
   static-psalm-analysis:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        ocp-version: [ 'dev-master' ]
-
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
 
       - name: Set up php
         uses: shivammathur/setup-php@v2
@@ -29,8 +25,5 @@ jobs:
       - name: Install dependencies
         run: composer i
 
-      - name: Install dependencies
-        run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-
       - name: Run coding standards check
         run: composer run psalm

composer.json

@@ -18,7 +18,7 @@
 		"nextcloud/coding-standard": "1.0",
 		"phpunit/phpunit": "^9",
 		"vimeo/psalm": "^4.22",
-		"christophwurst/nextcloud": "dev-master",
-		"sabre/dav": "^4.2.1"
+		"sabre/dav": "^4.2.1",
+		"nextcloud/ocp": "dev-stable25"
 	}
-}
+}

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": "4d0113007b74306863b8e1a336b48edc",
+    "content-hash": "22b98c2b6a7958eeb5d98c1135aa761d",
     "packages": [],
     "packages-dev": [
         {
@@ -1105,6 +1105,48 @@
             },
             "time": "2021-11-10T08:44:10+00:00"
         },
+        {
+            "name": "nextcloud/ocp",
+            "version": "dev-stable25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nextcloud-deps/ocp.git",
+                "reference": "f79ac43d0422211b35542856338d808bc94a116b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f79ac43d0422211b35542856338d808bc94a116b",
+                "reference": "f79ac43d0422211b35542856338d808bc94a116b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ~8.0 || ~8.1",
+                "psr/container": "^1.1.1",
+                "psr/event-dispatcher": "^1.0",
+                "psr/log": "^1.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "26.0.0-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "AGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Christoph Wurst",
+                    "email": "christoph@winzerhof-wurst.at"
+                }
+            ],
+            "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
+            "support": {
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable25"
+            },
+            "time": "2022-09-22T12:39:39+00:00"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.14.0",
@@ -5167,7 +5209,8 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "christophwurst/nextcloud": 20
+        "christophwurst/nextcloud": 20,
+        "nextcloud/ocp": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,