Merge pull request #107 from nextcloud/nc25

Nextcloud 25 release

5 files changed, 88 insertions, 76 deletions

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/psalm.yml
index 99b18a1..0f8dece 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/psalm.yml
@@ -1,9 +1,20 @@
+# 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]
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+      - stable*
 
 jobs:
-  static-psalm-analysis:
+  static-analysis:
       runs-on: ubuntu-latest
       strategy:
           # do not stop on another job's failure
@@ -13,23 +24,27 @@ jobs:
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout
-            uses: actions/checkout@master
+            uses: actions/checkout@v3
+
           - name: Set up php
-            uses: shivammathur/setup-php@master
+            uses: shivammathur/setup-php@v2
             with:
                 php-version: 7.4
                 tools: composer:v1
                 coverage: none
+
           - name: Install dependencies
             run: composer i
+
           - name: Install dependencies
-            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} --ignore-platform-reqs
+            run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs
+
           - name: Run coding standards check
             run: composer run psalm
 
   summary:
     runs-on: ubuntu-latest
-    needs: static-psalm-analysis
+    needs: static-analysis
 
     if: always()
 
@@ -37,4 +52,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.static-psalm-analysis.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi
diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-nextcloud-ocp.yml
index e2e5f52..9306969 100644
--- a/.github/workflows/update-christophwurst-nextcloud.yml
+++ b/.github/workflows/update-nextcloud-ocp.yml
@@ -3,23 +3,24 @@
 # 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", "stable24", "stable23", "stable22"]
+        branches: ["master"]
+        ocp-version: stable23
 
-    name: update-christophwurst-nextcloud-${{ matrix.branches }}
+    name: update-nextcloud-ocp-${{ matrix.branches }}
 
     steps:
       - uses: actions/checkout@v3
@@ -37,8 +38,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.ocp-version }}
         continue-on-error: true
 
       - name: Reset checkout dirs
@@ -56,10 +57,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
diff --git a/composer.json b/composer.json
index 9e11134..f746e5f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,25 +1,26 @@
 {
 	"autoload-dev": {
 		"psr-4": {
-			"OCP\\": "vendor/christophwurst/nextcloud/OCP",
-			"OCA\\Notifications\\": "lib/"
+			"OCP\\": "vendor/nextcloud/ocp/OCP",
+			"OCA\\FilesDownloadActivity\\": "lib/"
 		}
 	},
-	"name": "nextcloud/notifications",
-	"description": "notifications",
+	"name": "nextcloud/files_downloadactivity",
+	"description": "Creates activities for downloads of files that were shared with other users or a group",
 	"license": "AGPL",
 	"require-dev": {
 		"nextcloud/coding-standard": "^1.0.0",
-		"christophwurst/nextcloud": "dev-stable22",
-		"vimeo/psalm": "^4.22.0",
-		"phpunit/phpunit": "^9.5"
+		"nextcloud/ocp": "dev-stable23",
+		"phpunit/phpunit": "^9.5",
+		"vimeo/psalm": "^4.22.0"
 	},
 	"config": {
-		"optimize-autoloader": true,
 		"classmap-authoritative": true,
+		"optimize-autoloader": true,
 		"platform": {
 			"php": "7.3"
-		}
+		},
+		"sort-packages": true
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
diff --git a/composer.lock b/composer.lock
index 9f3cb0e..f9a0548 100644
--- a/composer.lock
+++ b/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": "2820b332cf9be813f1f2aaa01782dfad",
+    "content-hash": "27ba8667e7c60877a9f3c85d77eb4389",
     "packages": [],
     "packages-dev": [
         {
@@ -174,49 +174,6 @@
             "time": "2021-03-30T17:13:30+00:00"
         },
         {
-            "name": "christophwurst/nextcloud",
-            "version": "dev-stable22",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "bb417df98b148e26119e1814da14114575bb0521"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/bb417df98b148e26119e1814da14114575bb0521",
-                "reference": "bb417df98b148e26119e1814da14114575bb0521",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ~8.0.0",
-                "psr/container": "^1.0",
-                "psr/event-dispatcher": "^1.0",
-                "psr/log": "^1.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "23.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": {
-                "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
-                "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/stable22"
-            },
-            "time": "2022-02-22T09:43:07+00:00"
-        },
-        {
             "name": "composer/package-versions-deprecated",
             "version": "1.11.99.5",
             "source": {
@@ -1104,6 +1061,48 @@
             "time": "2021-11-10T08:44:10+00:00"
         },
         {
+            "name": "nextcloud/ocp",
+            "version": "dev-stable23",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nextcloud-deps/ocp.git",
+                "reference": "f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12",
+                "reference": "f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3 || ~8.0.0",
+                "psr/container": "^1.1.1",
+                "psr/event-dispatcher": "^1.0",
+                "psr/log": "^1.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "23.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/stable23"
+            },
+            "time": "2022-09-27T08:15:32+00:00"
+        },
+        {
             "name": "nikic/php-parser",
             "version": "v4.15.1",
             "source": {
@@ -4777,7 +4776,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "christophwurst/nextcloud": 20
+        "nextcloud/ocp": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index c70dc2c..daddf14 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.7.0@d4377c0baf3ffbf0b1ec6998e8d1be2a40971005">
+<files psalm-version="4.28.0@52e96bea381e6cb07a672aefec791a5817694a26">
   <file src="lib/Activity/Listener.php">
     <MissingDependency occurrences="3">
       <code>$this-&gt;rootFolder</code>
@@ -11,10 +11,6 @@
     </UndefinedClass>
   </file>
   <file src="lib/CurrentUser.php">
-    <InvalidCatch occurrences="1"/>
-    <MissingDependency occurrences="1">
-      <code>ShareNotFound</code>
-    </MissingDependency>
     <NoInterfaceProperties occurrences="1">
       <code>$this-&gt;request-&gt;server</code>
     </NoInterfaceProperties>