Merge pull request #14208 from jeabakker/features

chore(core): scrutinizer issues

engine/classes/Elgg/Email/DelayedQueue/CronHandler.php

@@ -18,7 +18,7 @@ class CronHandler {
 	 * @return void
 	 */
 	public function __invoke(\Elgg\Event $event): void {
-		$time = $event->getParam('time');
+		$time = (int) $event->getParam('time');
 		$interval = $event->getType();
 
 		_elgg_services()->delayedEmailService->processQueuedNotifications($interval, $time);

engine/classes/Elgg/EventsService.php

@@ -108,17 +108,16 @@ public function trigger(string $name, string $type, $object = null, array $optio
 	/**
 	 * Triggers a event that is allowed to return a mixed result
 	 *
-	 * @param string $name    The name of the event
-	 * @param string $type    The type of the event
-	 * @param mixed  $params  Supplied params for the event
-	 * @param mixed  $value   The value of the event, this can be altered by registered callbacks
-	 * @param array  $options (internal) options for triggering the event
+	 * @param string $name   The name of the event
+	 * @param string $type   The type of the event
+	 * @param mixed  $params Supplied params for the event
+	 * @param mixed  $value  The value of the event, this can be altered by registered callbacks
 	 *
 	 * @return mixed
 	 *
 	 * @see elgg_trigger_event_results()
 	 */
-	public function triggerResults(string $name, string $type, array $params = [], $value = null, array $options = []) {
+	public function triggerResults(string $name, string $type, array $params = [], $value = null) {
 		// This starts as a string, but if a handler type-hints an object we convert it on-demand inside
 		// \Elgg\HandlersService::call and keep it alive during all handler calls. We do this because
 		// creating objects for every triggering is expensive.
@@ -240,7 +239,7 @@ public function triggerResultsSequence(string $name, string $type, array $params
 			return false;
 		}
 
-		$result = $this->triggerResults($name, $type, $params, $value, $options);
+		$result = $this->triggerResults($name, $type, $params, $value);
 		if ($result === false) {
 			return false;
 		}

engine/classes/Elgg/Views/MinifyHandler.php

@@ -17,7 +17,7 @@ class MinifyHandler {
 	 * @return string|null View content minified (if css/js type)
 	 */
 	public function __invoke(\Elgg\Event $event) {
-		if (preg_match('~[\.-]min\.~', $event->getParam('view'))) {
+		if (preg_match('~[\.-]min\.~', (string) $event->getParam('view'))) {
 			// bypass minification
 			return;
 		}

engine/lib/events.php

@@ -171,7 +171,7 @@ function elgg_trigger_after_event(string $event, string $type, $object = null):
  *
  * @see elgg_trigger_event()
  */
-function elgg_trigger_deprecated_event(string $event, string $type, $object = null, string $message = null, string $version = null) {
+function elgg_trigger_deprecated_event(string $event, string $type, $object = null, string $message = '', string $version = '') {
 	return _elgg_services()->events->triggerDeprecated($event, $type, $object, $message, $version);
 }
 
@@ -189,6 +189,6 @@ function elgg_trigger_deprecated_event(string $event, string $type, $object = nu
  *
  * @since 5.0
  */
-function elgg_trigger_deprecated_event_results(string $event, string $type, $params = null, $returnvalue = null, string $message = null, string $version = null) {
-	return _elgg_services()->events->triggerDeprecated($event, $type, $params, $returnvalue, $message, $version);
+function elgg_trigger_deprecated_event_results(string $event, string $type, $params = null, $returnvalue = null, string $message = '', string $version = '') {
+	return _elgg_services()->events->triggerDeprecatedResults($event, $type, $params, $returnvalue, $message, $version);
 }

mod/developers/classes/Elgg/Developers/HandlerLogger.php

@@ -30,13 +30,12 @@ public static function trackEvent(\Elgg\Event $event) : void {
 	/**
 	 * Track the actual event / plugin hook
 	 *
-	 * @param string $name   name of the event / hook
-	 * @param string $type   type of the event / hook
-	 * @param mixed  $source source event / hook
+	 * @param string $name name of the event / hook
+	 * @param string $type type of the event / hook
 	 *
 	 * @return void
 	 */
-	protected static function track(string $name, string $type, $source) : void {
+	protected static function track(string $name, string $type) : void {
 		// filter out some very common events
 		$filter = [
 			'classes',
@@ -63,7 +62,10 @@ protected static function track(string $name, string $type, $source) : void {
 		$trigger_functions = [
 			'elgg_trigger_event',
 			'elgg_trigger_event_results',
+			'elgg_trigger_after_event',
+			'elgg_trigger_before_event',
 			'triggerResults',
+			'triggerResultsSequence',
 			'triggerSequence',
 			'triggerBefore',
 			'triggerAfter',

mod/developers/lib/functions.php

@@ -35,7 +35,7 @@ function developers_wrap_views(\Elgg\Event $event) {
 		'page/elements/html',
 	];
 
-	$view = $event->getParam('view');
+	$view = (string) $event->getParam('view');
 	if (in_array($view, $excluded_views)) {
 		return;
 	}

mod/discussions/classes/Elgg/Discussions/Notifications.php

@@ -14,13 +14,13 @@ class Notifications {
 	/**
 	 * Prepare a notification message about a new comment on a discussion
 	 *
-	 * @param \Elgg\Event $event 'prepare', 'notification:create:object:comment'
+	 * @param \Elgg\Event $elgg_event 'prepare', 'notification:create:object:comment'
 	 *
 	 * @return void|\Elgg\Notifications\Notification
 	 */
-	public static function prepareCommentOnDiscussionNotification(\Elgg\Event $event) {
+	public static function prepareCommentOnDiscussionNotification(\Elgg\Event $elgg_event) {
 
-		$event = $event->getParam('event');
+		$event = $elgg_event->getParam('event');
 		if (!$event instanceof \Elgg\Notifications\NotificationEvent) {
 			return;
 		}
@@ -35,11 +35,11 @@ public static function prepareCommentOnDiscussionNotification(\Elgg\Event $event
 			return;
 		}
 
-		$language = $event->getParam('language');
+		$language = $elgg_event->getParam('language');
 
 		$poster = $comment->getOwnerEntity();
 
-		$notification = $event->getValue();
+		$notification = $elgg_event->getValue();
 		$notification->subject = elgg_echo('discussion:comment:notify:subject', [$discussion->getDisplayName()], $language);
 		$notification->summary = elgg_echo('discussion:comment:notify:summary', [$discussion->getDisplayName()], $language);
 		$notification->body = elgg_echo('discussion:comment:notify:body', [
@@ -56,13 +56,13 @@ public static function prepareCommentOnDiscussionNotification(\Elgg\Event $event
 	/**
 	 * Add group members to the comment subscriber on a discussion
 	 *
-	 * @param \Elgg\Event $event 'get', 'subscriptions'
+	 * @param \Elgg\Event $elgg_event 'get', 'subscriptions'
 	 *
 	 * @return void|array
 	 */
-	public static function addGroupSubscribersToCommentOnDiscussionSubscriptions(\Elgg\Event $event) {
+	public static function addGroupSubscribersToCommentOnDiscussionSubscriptions(\Elgg\Event $elgg_event) {
 
-		$event = $event->getParam('event');
+		$event = $elgg_event->getParam('event');
 		if (!$event instanceof \Elgg\Notifications\SubscriptionNotificationEvent) {
 			return;
 		}
@@ -90,7 +90,7 @@ public static function addGroupSubscribersToCommentOnDiscussionSubscriptions(\El
 			return;
 		}
 
-		$subscriptions = $event->getValue();
+		$subscriptions = $elgg_event->getValue();
 
 		// get subscribers on the group (using the discussion create preference for detailed subscriptions)
 		$methods = elgg_get_notification_methods();

mod/invitefriends/classes/Elgg/InviteFriends/Users.php

@@ -28,7 +28,7 @@ public static function addFriendsOnRegister(\Elgg\Event $event) {
 			return;
 		}
 
-		if (!elgg_validate_invite_code($friend_user->username, $event->getParam('invitecode'))) {
+		if (!elgg_validate_invite_code($friend_user->username, (string) $event->getParam('invitecode'))) {
 			return;
 		}
 

mod/site_notifications/classes/Elgg/SiteNotifications/Notifications.php

@@ -13,15 +13,15 @@ class Notifications {
 	/**
 	 * Create a site notification
 	 *
-	 * @param \Elgg\Event $event 'send', 'notification:site'
+	 * @param \Elgg\Event $elgg_event 'send', 'notification:site'
 	 *
 	 * @return void|true
 	 */
-	public static function createSiteNotifications(\Elgg\Event $event) {
+	public static function createSiteNotifications(\Elgg\Event $elgg_event) {
 		/* @var $notification \Elgg\Notifications\Notification */
-		$notification = $event->getParam('notification');
+		$notification = $elgg_event->getParam('notification');
 		/* @var $event \Elgg\Notifications\NotificationEvent */
-		$event = $event->getParam('event');
+		$event = $elgg_event->getParam('event');
 
 		$note = elgg_call(ELGG_IGNORE_ACCESS | ELGG_DISABLE_SYSTEM_LOG, function() use ($notification, $event) {
 			return \SiteNotification::factory($notification, $event);

views/default/widgets/elgg_blog/content.php

@@ -11,6 +11,7 @@
 	$data = $response->getBody()->getContents();
 	$blogs = @json_decode($data);
 } catch (\Exception $e) {
+	// catch any issue and ignore it until later
 }
 
 if (empty($blogs) || !is_array($blogs)) {