chore: 7.4 fixes

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Jan 15, 2025 · 2457ab4 · 2457ab4
1 parent acee329
commit 2457ab4
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 17 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -19,5 +19,6 @@
 	->notPath('src')
 	->notPath('tests/configs')
 	->notPath('vendor')
+	->notPath('vendor-bin')
 	->in(__DIR__);
 return $config;
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
 	"scripts": {
 		"cs:fix": "php-cs-fixer fix",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
-		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './tests/*' -print0 | xargs -0 -n1 php -l",
+		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './vendor-bin/*' -not -path './tests/*' -print0 | xargs -0 -n1 php -l",
 		"psalm": "psalm",
 		"test:unit": "phpunit -c tests/phpunit.xml --fail-on-warning",
 		"post-install-cmd": [

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -59,7 +59,7 @@ public function attachHooks(
 		IEventDispatcher $eventDispatcher,
 		Listener $listener,
 		IManager $activityManager,
-		\OCP\Notification\IManager $notificationManager,
+		\OCP\Notification\IManager $notificationManager
 	): void {
 		$eventDispatcher->addServiceListener(AddContentSecurityPolicyEvent::class, CSPListener::class);
 

diff --git a/lib/Command/Log.php b/lib/Command/Log.php
@@ -18,9 +18,7 @@
 class Log extends Command {
 	private $queue;
 
-	public function __construct(
-		IQueue $queue,
-	) {
+	public function __construct(IQueue $queue) {
 		parent::__construct();
 		$this->queue = $queue;
 	}

diff --git a/lib/Command/Metrics.php b/lib/Command/Metrics.php
@@ -17,9 +17,7 @@
 class Metrics extends Command {
 	private $queue;
 
-	public function __construct(
-		IQueue $queue,
-	) {
+	public function __construct(IQueue $queue) {
 		parent::__construct();
 		$this->queue = $queue;
 	}

diff --git a/lib/Command/Reset.php b/lib/Command/Reset.php
@@ -16,9 +16,7 @@
 class Reset extends Command {
 	private $queue;
 
-	public function __construct(
-		IQueue $queue,
-	) {
+	public function __construct(IQueue $queue) {
 		parent::__construct();
 		$this->queue = $queue;
 	}

diff --git a/lib/Command/SelfTest.php b/lib/Command/SelfTest.php
@@ -19,7 +19,7 @@ class SelfTest extends Command {
 
 	public function __construct(
 		\OCA\NotifyPush\SelfTest $test,
-		IConfig $config,
+		IConfig $config
 	) {
 		parent::__construct();
 		$this->test = $test;

diff --git a/lib/Command/Setup.php b/lib/Command/Setup.php
@@ -23,7 +23,7 @@ class Setup extends Command {
 	public function __construct(
 		\OCA\NotifyPush\SelfTest $test,
 		IConfig $config,
-		SetupWizard $setupWizard,
+		SetupWizard $setupWizard
 	) {
 		parent::__construct();
 		$this->test = $test;

diff --git a/lib/Controller/AuthController.php b/lib/Controller/AuthController.php
@@ -24,7 +24,7 @@ public function __construct(
 		IRequest $request,
 		IQueue $queue,
 		ISecureRandom $random,
-		IUserSession $userSession,
+		IUserSession $userSession
 	) {
 		parent::__construct('notify_push', $request);
 		$this->queue = $queue;

diff --git a/lib/Controller/TestController.php b/lib/Controller/TestController.php
@@ -27,7 +27,7 @@ public function __construct(
 		IRequest $request,
 		IConfig $config,
 		IQueue $queue,
-		IAppManager $appManager,
+		IAppManager $appManager
 	) {
 		parent::__construct('notify_push', $request);
 		$this->config = $config;

diff --git a/lib/SelfTest.php b/lib/SelfTest.php
@@ -33,7 +33,7 @@ public function __construct(
 		IConfig $config,
 		IQueue $queue,
 		IDBConnection $connection,
-		IAppManager $appManager,
+		IAppManager $appManager
 	) {
 		$this->client = $clientService->newClient();
 		$this->cookie = rand(1, (int)pow(2, 30));

diff --git a/lib/SetupWizard.php b/lib/SetupWizard.php
@@ -27,7 +27,7 @@ public function __construct(
 		SelfTest $test,
 		IClientService $clientService,
 		IConfig $config,
-		BinaryFinder $binaryFinder,
+		BinaryFinder $binaryFinder
 	) {
 		$this->queue = $queue;
 		$this->test = $test;