Merge pull request #240 from nextcloud/fix-failed-update-nextcloud-oc…

…p-main fix: failed to update nextcloud/ocp package on branch main
nextcloud · Oct 25, 2024 · 4c3b8f6 · 4c3b8f6
2 parents 849474c + 88797ad
commit 4c3b8f6
Show file tree

Hide file tree

Showing 9 changed files with 163 additions and 142 deletions.
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
 		"nextcloud/ocp": "dev-master",
 		"phpunit/phpunit": "^9",
 		"psalm/phar": "^5.2",
+		"psr/log": "^3.0.2",
 		"roave/security-advisories": "dev-latest",
 		"sabre/dav": "^4.3"
 	},

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Controller/JWTController.php b/lib/Controller/JWTController.php
@@ -24,10 +24,10 @@
  */
 final class JWTController extends Controller {
 	public function __construct(
-		IRequest                               $request,
-		private GetFileServiceFactory          $getFileServiceFactory,
-		private JWTService                     $jwtService,
-		private ExceptionService               $exceptionService,
+		IRequest $request,
+		private GetFileServiceFactory $getFileServiceFactory,
+		private JWTService $jwtService,
+		private ExceptionService $exceptionService,
 		private AuthenticateUserServiceFactory $authenticateUserServiceFactory,
 	) {
 		parent::__construct('whiteboard', $request);

diff --git a/lib/Service/Authentication/AuthenticatePublicSharingUserService.php b/lib/Service/Authentication/AuthenticatePublicSharingUserService.php
@@ -18,7 +18,7 @@
 final class AuthenticatePublicSharingUserService implements AuthenticateUserService {
 	public function __construct(
 		private ShareManager $shareManager,
-		private ?string      $publicSharingToken = null,
+		private ?string $publicSharingToken = null,
 	) {
 	}
 

diff --git a/lib/Service/Authentication/GetPublicSharingUserFromIdService.php b/lib/Service/Authentication/GetPublicSharingUserFromIdService.php
@@ -19,7 +19,7 @@
 final class GetPublicSharingUserFromIdService implements GetUserFromIdService {
 	public function __construct(
 		private ShareManager $shareManager,
-		private string       $userId,
+		private string $userId,
 	) {
 	}
 

diff --git a/lib/Service/Authentication/GetSessionUserFromIdService.php b/lib/Service/Authentication/GetSessionUserFromIdService.php
@@ -19,7 +19,7 @@ final class GetSessionUserFromIdService implements GetUserFromIdService {
 	public function __construct(
 		private IUserManager $userManager,
 		private IUserSession $userSession,
-		private string       $userId,
+		private string $userId,
 	) {
 	}
 

diff --git a/lib/Service/File/GetFileFromIdService.php b/lib/Service/File/GetFileFromIdService.php
@@ -28,8 +28,8 @@ final class GetFileFromIdService implements GetFileService {
 
 	public function __construct(
 		private IRootFolder $rootFolder,
-		private string      $userId,
-		private int         $fileId,
+		private string $userId,
+		private int $fileId,
 	) {
 	}
 

diff --git a/lib/Service/File/GetFileFromPublicSharingTokenService.php b/lib/Service/File/GetFileFromPublicSharingTokenService.php
@@ -27,8 +27,8 @@ final class GetFileFromPublicSharingTokenService implements GetFileService {
 
 	public function __construct(
 		private ShareManager $shareManager,
-		private string       $publicSharingToken,
-		private int          $fileId,
+		private string $publicSharingToken,
+		private int $fileId,
 	) {
 	}
 

diff --git a/lib/Service/File/GetFileServiceFactory.php b/lib/Service/File/GetFileServiceFactory.php
@@ -23,7 +23,7 @@
  */
 final class GetFileServiceFactory {
 	public function __construct(
-		private IRootFolder  $rootFolder,
+		private IRootFolder $rootFolder,
 		private ShareManager $shareManager,
 	) {
 	}