Update core to PHP 7.4 standard

- Typed properties
- Port to LoggerInterface

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

1 files changed, 8 insertions, 12 deletions

diff --git a/core/Controller/CollaborationResourcesController.php b/core/Controller/CollaborationResourcesController.php
index 114423e1a2f..659ff32baee 100644
--- a/core/Controller/CollaborationResourcesController.php
+++ b/core/Controller/CollaborationResourcesController.php
@@ -36,25 +36,21 @@ use OCP\Collaboration\Resources\ICollection;
 use OCP\Collaboration\Resources\IManager;
 use OCP\Collaboration\Resources\IResource;
 use OCP\Collaboration\Resources\ResourceException;
-use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
 
 class CollaborationResourcesController extends OCSController {
-
-	/** @var IManager */
-	private $manager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ILogger */
-	private $logger;
+	private IManager $manager;
+	private IUserSession $userSession;
+	private LoggerInterface $logger;
 
 	public function __construct(
 		string $appName,
 		IRequest $request,
 		IManager $manager,
 		IUserSession $userSession,
-		ILogger $logger
+		LoggerInterface $logger
 	) {
 		parent::__construct($appName, $request);
 
@@ -240,7 +236,7 @@ class CollaborationResourcesController extends OCSController {
 		} catch (CollectionException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		} catch (Exception $e) {
-			$this->logger->logException($e);
+			$this->logger->critical($e->getMessage(), ['exception' => $e, 'app' => 'core']);
 			return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -253,7 +249,7 @@ class CollaborationResourcesController extends OCSController {
 				$result[] = $this->prepareCollection($collection);
 			} catch (CollectionException $e) {
 			} catch (Exception $e) {
-				$this->logger->logException($e);
+				$this->logger->critical($e->getMessage(), ['exception' => $e, 'app' => 'core']);
 			}
 		}
 
@@ -280,7 +276,7 @@ class CollaborationResourcesController extends OCSController {
 				$result[] = $this->prepareResource($resource);
 			} catch (ResourceException $e) {
 			} catch (Exception $e) {
-				$this->logger->logException($e);
+				$this->logger->critical($e->getMessage(), ['exception' => $e, 'app' => 'core']);
 			}
 		}