upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

refactor lib/private/Notification

Browse source 
Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>
This commit is contained in:
Hamid Dehnavi 2023-07-05 21:25:05 +03:30 committed by Côme Chilliet
parent 7ac903106f
commit 0ac1480be2
3 changed files with 46 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/Notification/Action.php
View file

@ -28,22 +28,22 @@ use OCP\Notification\IAction;
class Action implements IAction {
/** @var string */
protected $label;
protected string $label;
/** @var string */
protected $labelParsed;
protected string $labelParsed;
/** @var string */
protected $link;
protected string $link;
/** @var string */
protected $requestType;
protected string $requestType;
/** @var string */
protected $icon;
protected string $icon;
/** @var bool */
protected $primary;
protected bool $primary;
public function __construct() {
$this->label = '';

45
lib/private/Notification/Manager.php
View file

@ -43,48 +43,35 @@ use Psr\Container\ContainerExceptionInterface;
use Psr\Log\LoggerInterface;
class Manager implements IManager {
/** @var IValidator */
protected $validator;
/** @var IUserManager */
private $userManager;
/** @var ICache */
protected $cache;
/** @var IRegistry */
protected $subscription;
/** @var LoggerInterface */
protected $logger;
/** @var Coordinator */
private $coordinator;
protected ICache $cache;
/** @var IApp[] */
protected $apps;
protected array $apps;
/** @var string[] */
protected $appClasses;
protected array $appClasses;
/** @var INotifier[] */
protected $notifiers;
protected array $notifiers;
/** @var string[] */
protected $notifierClasses;
protected array $notifierClasses;
/** @var bool */
protected $preparingPushNotification;
protected bool $preparingPushNotification;
/** @var bool */
protected $deferPushing;
protected bool $deferPushing;
/** @var bool */
private $parsedRegistrationContext;
private bool $parsedRegistrationContext;
public function __construct(IValidator $validator,
IUserManager $userManager,
public function __construct(
protected IValidator $validator,
private IUserManager $userManager,
ICacheFactory $cacheFactory,
IRegistry $subscription,
LoggerInterface $logger,
Coordinator $coordinator) {
$this->validator = $validator;
$this->userManager = $userManager;
protected IRegistry $subscription,
protected LoggerInterface $logger,
private Coordinator $coordinator,
) {
$this->cache = $cacheFactory->createDistributed('notifications');
$this->subscription = $subscription;
$this->logger = $logger;
$this->coordinator = $coordinator;
$this->apps = [];
$this->notifiers = [];
@ -111,7 +98,7 @@ class Manager implements IManager {
* @deprecated 17.0.0 use registerNotifierService instead.
* @since 8.2.0 - Parameter $info was added in 9.0.0
*/
public function registerNotifier(\Closure $service, \Closure $info) {
public function registerNotifier(\Closure $service, \Closure $info): void {
$infoData = $info();
$exception = new \InvalidArgumentException(
'Notifier ' . $infoData['name'] . ' (id: ' . $infoData['id'] . ') is not considered because it is using the old way to register.'

49
lib/private/Notification/Notification.php
View file

@ -32,74 +32,73 @@ use OCP\RichObjectStrings\InvalidObjectExeption;
use OCP\RichObjectStrings\IValidator;
class Notification implements INotification {
/** @var IValidator */
protected $richValidator;
/** @var string */
protected $app;
protected string $app;
/** @var string */
protected $user;
protected string $user;
/** @var \DateTime */
protected $dateTime;
protected \DateTime $dateTime;
/** @var string */
protected $objectType;
protected string $objectType;
/** @var string */
protected $objectId;
protected string $objectId;
/** @var string */
protected $subject;
protected string $subject;
/** @var array */
protected $subjectParameters;
protected array $subjectParameters;
/** @var string */
protected $subjectParsed;
protected string $subjectParsed;
/** @var string */
protected $subjectRich;
protected string $subjectRich;
/** @var array */
protected $subjectRichParameters;
protected array $subjectRichParameters;
/** @var string */
protected $message;
protected string $message;
/** @var array */
protected $messageParameters;
protected array $messageParameters;
/** @var string */
protected $messageParsed;
protected string $messageParsed;
/** @var string */
protected $messageRich;
protected string $messageRich;
/** @var array */
protected $messageRichParameters;
protected array $messageRichParameters;
/** @var string */
protected $link;
protected string $link;
/** @var string */
protected $icon;
protected string $icon;
/** @var array */
protected $actions;
protected array $actions;
/** @var array */
protected $actionsParsed;
protected array $actionsParsed;
/** @var bool */
protected $hasPrimaryAction;
protected bool $hasPrimaryAction;
/** @var bool */
protected $hasPrimaryParsedAction;
protected bool $hasPrimaryParsedAction;
public function __construct(IValidator $richValidator) {
$this->richValidator = $richValidator;
public function __construct(
protected IValidator $richValidator,
) {
$this->app = '';
$this->user = '';
$this->dateTime = new \DateTime();