Merge pull request #2996 from nextcloud/enh/maintenance

code maintenance
nextcloud · Jul 22, 2023 · a475cd8 · a475cd8
2 parents 8a98ecb + 6d5d120
commit a475cd8
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 13 deletions.
diff --git a/lib/Event/BaseEvent.php b/lib/Event/BaseEvent.php
@@ -40,7 +40,7 @@ abstract class BaseEvent extends Event {
 	protected array $activitySubjectParams = [];
 	protected Poll $poll;
 	protected bool $log = true;
-	private IUserSession $userSession;
+	protected IUserSession $userSession;
 	protected UserService $userService;
 
 	public function __construct(

diff --git a/lib/Event/CommentAddEvent.php b/lib/Event/CommentAddEvent.php
@@ -26,7 +26,9 @@
 use OCA\Polls\Db\Comment;
 
 class CommentAddEvent extends CommentEvent {
-	public function __construct(Comment $comment) {
+	public function __construct(
+		protected Comment $comment
+	) {
 		parent::__construct($comment);
 		$this->activitySubject = self::ADD;
 	}

diff --git a/lib/Event/CommentDeleteEvent.php b/lib/Event/CommentDeleteEvent.php
@@ -26,7 +26,9 @@
 use OCA\Polls\Db\Comment;
 
 class CommentDeleteEvent extends CommentEvent {
-	public function __construct(Comment $comment) {
+	public function __construct(
+		protected Comment $comment
+	) {
 		parent::__construct($comment);
 		$this->log = false;
 		$this->activitySubject = self::DELETE;

diff --git a/lib/Event/CommentEvent.php b/lib/Event/CommentEvent.php
@@ -30,7 +30,7 @@ abstract class CommentEvent extends BaseEvent {
 	public const DELETE = 'comment_delete';
 
 	public function __construct(
-		private Comment $comment,
+		protected Comment $comment,
 	) {
 		parent::__construct($comment);
 		$this->activityObject = 'poll';

diff --git a/lib/Event/OptionConfirmedEvent.php b/lib/Event/OptionConfirmedEvent.php
@@ -27,7 +27,7 @@
 
 class OptionConfirmedEvent extends OptionEvent {
 	public function __construct(
-		Option $option
+		protected Option $option
 	) {
 		parent::__construct($option);
 		$this->activitySubject = self::CONFIRM;

diff --git a/lib/Event/OptionCreatedEvent.php b/lib/Event/OptionCreatedEvent.php
@@ -27,7 +27,7 @@
 
 class OptionCreatedEvent extends OptionEvent {
 	public function __construct(
-		Option $option
+		protected Option $option,
 	) {
 		parent::__construct($option);
 		$this->activitySubject = self::ADD;

diff --git a/lib/Event/OptionDeletedEvent.php b/lib/Event/OptionDeletedEvent.php
@@ -27,7 +27,7 @@
 
 class OptionDeletedEvent extends OptionEvent {
 	public function __construct(
-		Option $option
+		protected Option $option
 	) {
 		parent::__construct($option);
 		$this->activitySubject = self::DELETE;

diff --git a/lib/Event/OptionEvent.php b/lib/Event/OptionEvent.php
@@ -33,7 +33,7 @@ abstract class OptionEvent extends BaseEvent {
 	public const DELETE = 'option_delete';
 
 	public function __construct(
-		private Option $option
+		protected Option $option,
 	) {
 		parent::__construct($option);
 		$this->activityObject = 'poll';

diff --git a/lib/Event/OptionUnconfirmedEvent.php b/lib/Event/OptionUnconfirmedEvent.php
@@ -27,7 +27,7 @@
 
 class OptionUnconfirmedEvent extends OptionEvent {
 	public function __construct(
-		Option $option
+		protected Option $option
 	) {
 		parent::__construct($option);
 		$this->activitySubject = self::UNCONFIRM;

diff --git a/lib/Event/OptionUpdatedEvent.php b/lib/Event/OptionUpdatedEvent.php
@@ -27,7 +27,7 @@
 
 class OptionUpdatedEvent extends OptionEvent {
 	public function __construct(
-		Option $option
+		protected Option $option
 	) {
 		parent::__construct($option);
 		$this->activitySubject = self::UPDATE;

diff --git a/lib/Event/PollArchivedEvent.php b/lib/Event/PollArchivedEvent.php
@@ -28,7 +28,7 @@
 
 class PollArchivedEvent extends PollEvent {
 	public function __construct(
-		Poll $poll
+		protected Poll $poll
 	) {
 		parent::__construct($poll);
 		$this->activitySubject = self::DELETE;

diff --git a/lib/Event/PollCreatedEvent.php b/lib/Event/PollCreatedEvent.php
@@ -27,7 +27,7 @@
 
 class PollCreatedEvent extends PollEvent {
 	public function __construct(
-		Poll $poll
+		protected Poll $poll
 	) {
 		parent::__construct($poll);
 		$this->activitySubject = self::ADD;

diff --git a/lib/Event/PollDeletedEvent.php b/lib/Event/PollDeletedEvent.php
@@ -29,7 +29,7 @@
 
 class PollDeletedEvent extends PollEvent {
 	public function __construct(
-		Poll $poll
+		protected Poll $poll
 	) {
 		parent::__construct($poll);
 		$this->activitySubject = self::DELETE;