Migrate to nextcloud/OCP package in master

Signed-off-by: Joas Schilling <coding@schilljs.com>

.github/workflows/psalm.yml

@@ -5,20 +5,17 @@ on:
   push:
     branches:
       - master
+      - main
       - stable*
 
 jobs:
-  static-psalm-analysis:
+  static-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 +26,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

.github/workflows/update-nextcloud-ocp.yml

@@ -3,7 +3,7 @@
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 
-name: Update christophwurst/nextcloud
+name: Update nextcloud/ocp
 
 on:
   workflow_dispatch:
@@ -11,7 +11,7 @@ on:
     - cron: "5 4 * * 0"
 
 jobs:
-  update-christophwurst-nextcloud:
+  update-nextcloud-ocp:
     runs-on: ubuntu-latest
 
     strategy:
@@ -19,7 +19,7 @@ jobs:
       matrix:
         branches: ["master", "stable25", "stable24", "stable23"]
 
-    name: update-christophwurst-nextcloud-${{ matrix.branches }}
+    name: update-nextcloud-ocp-${{ matrix.branches }}
 
     steps:
       - uses: actions/checkout@v3
@@ -37,8 +37,8 @@ jobs:
       - name: Composer install
         run: composer install
 
-      - name: Composer update christophwurst/nextcloud
-        run: composer require --dev christophwurst/nextcloud:dev-${{ matrix.branches }}
+      - name: Composer update nextcloud/ocp
+        run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
         continue-on-error: true
 
       - name: Reset checkout dirs
@@ -56,10 +56,10 @@ jobs:
           committer: GitHub <noreply@github.com>
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true
-          branch: automated/noid/${{ matrix.branches }}-update-christophwurst-nextcloud
-          title: "[${{ matrix.branches }}] Update christophwurst/nextcloud dependency"
+          branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp
+          title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency"
           body: |
-            Auto-generated update of [christophwurst/nextcloud](https://github.com/ChristophWurst/nextcloud_composer/) dependency
+            Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
           labels: |
             dependencies
             3. to review

composer.json

@@ -6,7 +6,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"OCP\\": "vendor/christophwurst/nextcloud/OCP"
+			"OCP\\": "vendor/nextcloud/ocp/OCP"
 		}
 	},
 	"config": {
@@ -42,7 +42,7 @@
 		"test": "cd tests/php/ && phpunit -c phpunit.xml"
 	},
 	"require-dev": {
-		"christophwurst/nextcloud": "dev-master",
+		"nextcloud/ocp": "dev-master",
 		"roave/security-advisories": "dev-latest"
 	},
 	"require": {

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": "f7336054efaa2c0b48dee7a11d99f644",
+    "content-hash": "d4912fe23802cd529cc22d3dc3829261",
     "packages": [
         {
             "name": "bamarni/composer-bin-plugin",
@@ -128,17 +128,17 @@
     ],
     "packages-dev": [
         {
-            "name": "christophwurst/nextcloud",
+            "name": "nextcloud/ocp",
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "f5ba6d163e242b7971adc3a7544075ac0a57f0fd"
+                "url": "https://github.com/nextcloud-deps/ocp.git",
+                "reference": "35711a5c821cc9589d58efa0ded87ae948ab71ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/f5ba6d163e242b7971adc3a7544075ac0a57f0fd",
-                "reference": "f5ba6d163e242b7971adc3a7544075ac0a57f0fd",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/35711a5c821cc9589d58efa0ded87ae948ab71ed",
+                "reference": "35711a5c821cc9589d58efa0ded87ae948ab71ed",
                 "shasum": ""
             },
             "require": {
@@ -166,11 +166,9 @@
             ],
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
             "support": {
-                "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
-                "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/master"
             },
-            "abandoned": "nextcloud/ocp",
-            "time": "2022-09-22T12:30:27+00:00"
+            "time": "2022-09-22T12:49:25+00:00"
         },
         {
             "name": "psr/container",
@@ -839,7 +837,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "christophwurst/nextcloud": 20,
+        "nextcloud/ocp": 20,
         "roave/security-advisories": 20
     },
     "prefer-stable": false,