fix(psalm): require-dev sabre/dav and use \OCP\Server

* replace `\OC::$server` with public \OCP\Server::get() * add sabre/dav to require-dev Signed-off-by: Max <[email protected]>
nextcloud · Dec 2, 2024 · 5297788 · 5297788
1 parent 87c41f4
commit 5297788
Show file tree

Hide file tree

Showing 1,730 changed files with 193,846 additions and 957 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,8 @@
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.8",
 		"phpunit/phpunit": "^9.5",
-		"roave/security-advisories": "dev-latest"
+		"roave/security-advisories": "dev-latest",
+		"sabre/dav": "^4.1"
 	},
 	"scripts": {
 		"bin": "echo 'bin not installed'",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Dav/CheckPlugin.php b/lib/Dav/CheckPlugin.php
@@ -51,7 +51,7 @@ public function initialize(Server $server) {
 	 */
 	public function checkToS(RequestInterface $request, ResponseInterface $response) {
 		// we instantiate the checker here to make sure sabre auth backend was triggered
-		$checker = \OC::$server->get(Checker::class);
+		$checker = \OCP\Server::get(Checker::class);
 		if (!$checker->currentUserHasSigned()) {
 			throw new Forbidden($checker->getForbiddenMessage());
 		}

diff --git a/vendor-bin/openapi-extractor/composer.lock b/vendor-bin/openapi-extractor/composer.lock
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitf0bdd5b9b70328ede264941d59e950bb::getLoader();
+return ComposerAutoloaderInitTermsOfService::getLoader();
diff --git a/vendor/bamarni/composer-bin-plugin/.github/workflows/phpstan.yml b/vendor/bamarni/composer-bin-plugin/.github/workflows/phpstan.yml
@@ -0,0 +1,35 @@
+name: "Static analysis"
+
+on:
+    push:
+        branches:
+            - "main"
+            - "master"
+    pull_request: null
+
+jobs:
+    static-analysis:
+        runs-on: "ubuntu-latest"
+        name: "PHPStan on PHP ${{ matrix.php }}"
+        strategy:
+            fail-fast: false
+            matrix:
+                php:
+                    - "8.1"
+        steps:
+            -   name: "Check out repository code"
+                uses: "actions/checkout@v2"
+
+            -   name: "Setup PHP"
+                uses: "shivammathur/setup-php@v2"
+                with:
+                    php-version: "${{ matrix.php }}"
+                    tools: "composer"
+
+            -   name: "Install Composer dependencies"
+                uses: "ramsey/composer-install@v2"
+                with:
+                    dependency-versions: "highest"
+
+            -   name: "Perform static analysis"
+                run: "make phpstan"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInitf0bdd5b9b70328ede264941d59e950bb::getLoader();
		return ComposerAutoloaderInitTermsOfService::getLoader();