nextcloud / server

lib/public/ILogger.php

Indentation +135 added lines, -135 removed lines

@@ -42,149 +42,149 @@
  * @deprecated 20.0.0 use the PSR-3 logger \Psr\Log\LoggerInterface
  */
 interface ILogger {
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const DEBUG=0;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const INFO=1;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const WARN=2;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const ERROR=3;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const FATAL=4;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const DEBUG=0;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const INFO=1;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const WARN=2;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const ERROR=3;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const FATAL=4;
 
-	/**
-	 * System is unusable.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::emergency
-	 */
-	public function emergency(string $message, array $context = []);
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::emergency
+     */
+    public function emergency(string $message, array $context = []);
 
-	/**
-	 * Action must be taken immediately.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::alert
-	 */
-	public function alert(string $message, array $context = []);
+    /**
+     * Action must be taken immediately.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::alert
+     */
+    public function alert(string $message, array $context = []);
 
-	/**
-	 * Critical conditions.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::critical
-	 */
-	public function critical(string $message, array $context = []);
+    /**
+     * Critical conditions.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::critical
+     */
+    public function critical(string $message, array $context = []);
 
-	/**
-	 * Runtime errors that do not require immediate action but should typically
-	 * be logged and monitored.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::error
-	 */
-	public function error(string $message, array $context = []);
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::error
+     */
+    public function error(string $message, array $context = []);
 
-	/**
-	 * Exceptional occurrences that are not errors.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::warning
-	 */
-	public function warning(string $message, array $context = []);
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::warning
+     */
+    public function warning(string $message, array $context = []);
 
-	/**
-	 * Normal but significant events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::notice
-	 */
-	public function notice(string $message, array $context = []);
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::notice
+     */
+    public function notice(string $message, array $context = []);
 
-	/**
-	 * Interesting events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::info
-	 */
-	public function info(string $message, array $context = []);
+    /**
+     * Interesting events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::info
+     */
+    public function info(string $message, array $context = []);
 
-	/**
-	 * Detailed debug information.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::debug
-	 */
-	public function debug(string $message, array $context = []);
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::debug
+     */
+    public function debug(string $message, array $context = []);
 
-	/**
-	 * Logs with an arbitrary level.
-	 *
-	 * @param int $level
-	 * @param string $message
-	 * @param array $context
-	 * @return mixed
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::log
-	 */
-	public function log(int $level, string $message, array $context = []);
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param int $level
+     * @param string $message
+     * @param array $context
+     * @return mixed
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::log
+     */
+    public function log(int $level, string $message, array $context = []);
 
-	/**
-	 * Logs an exception very detailed
-	 * An additional message can we written to the log by adding it to the
-	 * context.
-	 *
-	 * <code>
-	 * $logger->logException($ex, [
-	 *     'message' => 'Exception during background job execution'
-	 * ]);
-	 * </code>
-	 *
-	 * @param \Exception|\Throwable $exception
-	 * @param array $context
-	 * @return void
-	 * @since 8.2.0
-	 * @deprecated 20.0.0 use the `exception` entry in the context of any method in \Psr\Log\LoggerInterface
-	 */
-	public function logException(\Throwable $exception, array $context = []);
+    /**
+     * Logs an exception very detailed
+     * An additional message can we written to the log by adding it to the
+     * context.
+     *
+     * <code>
+     * $logger->logException($ex, [
+     *     'message' => 'Exception during background job execution'
+     * ]);
+     * </code>
+     *
+     * @param \Exception|\Throwable $exception
+     * @param array $context
+     * @return void
+     * @since 8.2.0
+     * @deprecated 20.0.0 use the `exception` entry in the context of any method in \Psr\Log\LoggerInterface
+     */
+    public function logException(\Throwable $exception, array $context = []);
 }

Spacing +5 added lines, -5 removed lines

@@ -46,27 +46,27 @@
 	 * @since 14.0.0
 	 * @deprecated 20.0.0
 	 */
-	public const DEBUG=0;
+	public const DEBUG = 0;
 	/**
 	 * @since 14.0.0
 	 * @deprecated 20.0.0
 	 */
-	public const INFO=1;
+	public const INFO = 1;
 	/**
 	 * @since 14.0.0
 	 * @deprecated 20.0.0
 	 */
-	public const WARN=2;
+	public const WARN = 2;
 	/**
 	 * @since 14.0.0
 	 * @deprecated 20.0.0
 	 */
-	public const ERROR=3;
+	public const ERROR = 3;
 	/**
 	 * @since 14.0.0
 	 * @deprecated 20.0.0
 	 */
-	public const FATAL=4;
+	public const FATAL = 4;
 
 	/**
 	 * System is unusable.

lib/private/AppFramework/Logger.php

Indentation +91 added lines, -91 removed lines

@@ -33,95 +33,95 @@
  */
 class Logger implements ILogger {
 
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string */
-	private $appName;
-
-	/**
-	 * @deprecated
-	 */
-	public function __construct(ILogger $logger, string $appName) {
-		$this->logger = $logger;
-		$this->appName = $appName;
-	}
-
-	private function extendContext(array $context): array {
-		if (!isset($context['app'])) {
-			$context['app'] = $this->appName;
-		}
-
-		return $context;
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function emergency(string $message, array $context = []) {
-		$this->logger->emergency($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function alert(string $message, array $context = []) {
-		$this->logger->alert($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function critical(string $message, array $context = []) {
-		$this->logger->critical($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function error(string $message, array $context = []) {
-		$this->logger->emergency($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function warning(string $message, array $context = []) {
-		$this->logger->warning($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function notice(string $message, array $context = []) {
-		$this->logger->notice($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function info(string $message, array $context = []) {
-		$this->logger->info($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function debug(string $message, array $context = []) {
-		$this->logger->debug($message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function log(int $level, string $message, array $context = []) {
-		$this->logger->log($level, $message, $this->extendContext($context));
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function logException(\Throwable $exception, array $context = []) {
-		$this->logger->logException($exception, $this->extendContext($context));
-	}
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string */
+    private $appName;
+
+    /**
+     * @deprecated
+     */
+    public function __construct(ILogger $logger, string $appName) {
+        $this->logger = $logger;
+        $this->appName = $appName;
+    }
+
+    private function extendContext(array $context): array {
+        if (!isset($context['app'])) {
+            $context['app'] = $this->appName;
+        }
+
+        return $context;
+    }
+
+    /**
+     * @deprecated
+     */
+    public function emergency(string $message, array $context = []) {
+        $this->logger->emergency($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function alert(string $message, array $context = []) {
+        $this->logger->alert($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function critical(string $message, array $context = []) {
+        $this->logger->critical($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function error(string $message, array $context = []) {
+        $this->logger->emergency($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function warning(string $message, array $context = []) {
+        $this->logger->warning($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function notice(string $message, array $context = []) {
+        $this->logger->notice($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function info(string $message, array $context = []) {
+        $this->logger->info($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function debug(string $message, array $context = []) {
+        $this->logger->debug($message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function log(int $level, string $message, array $context = []) {
+        $this->logger->log($level, $message, $this->extendContext($context));
+    }
+
+    /**
+     * @deprecated
+     */
+    public function logException(\Throwable $exception, array $context = []) {
+        $this->logger->logException($exception, $this->extendContext($context));
+    }
 }

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

Indentation +126 added lines, -126 removed lines

@@ -42,130 +42,130 @@
 
 class ContactInteractionListener implements IEventListener {
 
-	/** @var RecentContactMapper */
-	private $mapper;
-
-	/** @var CardSearchDao */
-	private $cardSearchDao;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(RecentContactMapper $mapper,
-								CardSearchDao $cardSearchDao,
-								IUserManager $userManager,
-								ITimeFactory $timeFactory,
-								IL10N $l10nFactory,
-								LoggerInterface $logger) {
-		$this->mapper = $mapper;
-		$this->cardSearchDao = $cardSearchDao;
-		$this->userManager = $userManager;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l10nFactory;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof ContactInteractedWithEvent)) {
-			return;
-		}
-
-		if ($event->getUid() === null && $event->getEmail() === null && $event->getFederatedCloudId() === null) {
-			$this->logger->warning("Contact interaction event has no user identifier set");
-			return;
-		}
-
-		$existing = $this->mapper->findMatch(
-			$event->getActor(),
-			$event->getUid(),
-			$event->getEmail(),
-			$event->getFederatedCloudId()
-		);
-		if (!empty($existing)) {
-			$now = $this->timeFactory->getTime();
-			foreach ($existing as $c) {
-				$c->setLastContact($now);
-				$this->mapper->update($c);
-			}
-
-			return;
-		}
-
-		$contact = new RecentContact();
-		$contact->setActorUid($event->getActor()->getUID());
-		if ($event->getUid() !== null) {
-			$contact->setUid($event->getUid());
-		}
-		if ($event->getEmail() !== null) {
-			$contact->setEmail($event->getEmail());
-		}
-		if ($event->getFederatedCloudId() !== null) {
-			$contact->setFederatedCloudId($event->getFederatedCloudId());
-		}
-		$contact->setLastContact($this->timeFactory->getTime());
-
-		$copy = $this->cardSearchDao->findExisting(
-			$event->getActor(),
-			$event->getUid(),
-			$event->getEmail(),
-			$event->getFederatedCloudId()
-		);
-		if ($copy !== null) {
-			try {
-				$parsed = Reader::read($copy, Reader::OPTION_FORGIVING);
-				$parsed->CATEGORIES = $this->l10n->t('Recently contacted');
-				$contact->setCard($parsed->serialize());
-			} catch (Throwable $e) {
-				$this->logger->warning(
-					'Could not parse card to add recent category: ' . $e->getMessage(),
-					[
-						'exception' => $e,
-					]);
-				$contact->setCard($copy);
-			}
-		} else {
-			$contact->setCard($this->generateCard($contact));
-		}
-		$this->mapper->insert($contact);
-	}
-
-	private function getDisplayName(?string $uid): ?string {
-		if ($uid === null) {
-			return null;
-		}
-		if (($user = $this->userManager->get($uid)) === null) {
-			return null;
-		}
-
-		return $user->getDisplayName();
-	}
-
-	private function generateCard(RecentContact $contact): string {
-		$props = [
-			'URI' => UUIDUtil::getUUID(),
-			'FN' => $this->getDisplayName($contact->getUid()) ?? $contact->getEmail() ?? $contact->getFederatedCloudId(),
-			'CATEGORIES' => $this->l10n->t('Recently contacted'),
-		];
-
-		if ($contact->getUid() !== null) {
-			$props['X-NEXTCLOUD-UID'] = $contact->getUid();
-		}
-		if ($contact->getEmail() !== null) {
-			$props['EMAIL'] = $contact->getEmail();
-		}
-		if ($contact->getFederatedCloudId() !== null) {
-			$props['CLOUD'] = $contact->getFederatedCloudId();
-		}
-
-		return (new VCard($props))->serialize();
-	}
+    /** @var RecentContactMapper */
+    private $mapper;
+
+    /** @var CardSearchDao */
+    private $cardSearchDao;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    public function __construct(RecentContactMapper $mapper,
+                                CardSearchDao $cardSearchDao,
+                                IUserManager $userManager,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10nFactory,
+                                LoggerInterface $logger) {
+        $this->mapper = $mapper;
+        $this->cardSearchDao = $cardSearchDao;
+        $this->userManager = $userManager;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l10nFactory;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof ContactInteractedWithEvent)) {
+            return;
+        }
+
+        if ($event->getUid() === null && $event->getEmail() === null && $event->getFederatedCloudId() === null) {
+            $this->logger->warning("Contact interaction event has no user identifier set");
+            return;
+        }
+
+        $existing = $this->mapper->findMatch(
+            $event->getActor(),
+            $event->getUid(),
+            $event->getEmail(),
+            $event->getFederatedCloudId()
+        );
+        if (!empty($existing)) {
+            $now = $this->timeFactory->getTime();
+            foreach ($existing as $c) {
+                $c->setLastContact($now);
+                $this->mapper->update($c);
+            }
+
+            return;
+        }
+
+        $contact = new RecentContact();
+        $contact->setActorUid($event->getActor()->getUID());
+        if ($event->getUid() !== null) {
+            $contact->setUid($event->getUid());
+        }
+        if ($event->getEmail() !== null) {
+            $contact->setEmail($event->getEmail());
+        }
+        if ($event->getFederatedCloudId() !== null) {
+            $contact->setFederatedCloudId($event->getFederatedCloudId());
+        }
+        $contact->setLastContact($this->timeFactory->getTime());
+
+        $copy = $this->cardSearchDao->findExisting(
+            $event->getActor(),
+            $event->getUid(),
+            $event->getEmail(),
+            $event->getFederatedCloudId()
+        );
+        if ($copy !== null) {
+            try {
+                $parsed = Reader::read($copy, Reader::OPTION_FORGIVING);
+                $parsed->CATEGORIES = $this->l10n->t('Recently contacted');
+                $contact->setCard($parsed->serialize());
+            } catch (Throwable $e) {
+                $this->logger->warning(
+                    'Could not parse card to add recent category: ' . $e->getMessage(),
+                    [
+                        'exception' => $e,
+                    ]);
+                $contact->setCard($copy);
+            }
+        } else {
+            $contact->setCard($this->generateCard($contact));
+        }
+        $this->mapper->insert($contact);
+    }
+
+    private function getDisplayName(?string $uid): ?string {
+        if ($uid === null) {
+            return null;
+        }
+        if (($user = $this->userManager->get($uid)) === null) {
+            return null;
+        }
+
+        return $user->getDisplayName();
+    }
+
+    private function generateCard(RecentContact $contact): string {
+        $props = [
+            'URI' => UUIDUtil::getUUID(),
+            'FN' => $this->getDisplayName($contact->getUid()) ?? $contact->getEmail() ?? $contact->getFederatedCloudId(),
+            'CATEGORIES' => $this->l10n->t('Recently contacted'),
+        ];
+
+        if ($contact->getUid() !== null) {
+            $props['X-NEXTCLOUD-UID'] = $contact->getUid();
+        }
+        if ($contact->getEmail() !== null) {
+            $props['EMAIL'] = $contact->getEmail();
+        }
+        if ($contact->getFederatedCloudId() !== null) {
+            $props['CLOUD'] = $contact->getFederatedCloudId();
+        }
+
+        return (new VCard($props))->serialize();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 				$contact->setCard($parsed->serialize());
 			} catch (Throwable $e) {
 				$this->logger->warning(
-					'Could not parse card to add recent category: ' . $e->getMessage(),
+					'Could not parse card to add recent category: '.$e->getMessage(),
 					[
 						'exception' => $e,
 					]);