Merge pull request #2477 from nextcloud/migrate-master-christophwurst…

…-package

Migrate to nextcloud/OCP package in master

.github/workflows/psalm.yml

@@ -0,0 +1,35 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Static analysis
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+      - stable*
+
+jobs:
+  static-analysis:
+    runs-on: ubuntu-latest
+
+    name: Nextcloud
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: none
+
+      - name: Install dependencies
+        run: composer i
+
+      - name: Run coding standards check
+        run: composer run psalm

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

@@ -3,23 +3,23 @@
 # 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:
   schedule:
-    - cron: "5 4 * * 0"
+    - cron: "5 2 * * 0"
 
 jobs:
-  update-christophwurst-nextcloud:
+  update-nextcloud-ocp:
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       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

@@ -2,19 +2,19 @@
 	"name": "nextcloud/richdocuments",
 	"type": "project",
 	"minimum-stability": "dev",
-	"prefer-stable" : true,
+	"prefer-stable": true,
 	"config": {
 		"platform": {
 			"php": "7.4"
 		}
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
-		"christophwurst/nextcloud": "dev-master",
 		"jakub-onderka/php-parallel-lint": "^1.0.0",
 		"psalm/phar": "^4.7",
 		"friendsofphp/php-cs-fixer": "^3.8",
-		"nextcloud/coding-standard": "^1.0"
+		"nextcloud/coding-standard": "^1.0",
+		"nextcloud/ocp": "dev-master"
 	},
 	"license": "AGPLv3",
 	"authors": [
@@ -29,5 +29,10 @@
 		"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix"
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"OCP\\": "vendor/nextcloud/ocp/OCP"
+		}
 	}
 }