Merge pull request #14225 from jeabakker/features

chore(core): fix scrutinizer issues
Elgg · Nov 22, 2022 · e4e5ca1 · e4e5ca1
2 parents 43d3f96 + cfd5895
commit e4e5ca1
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 41 deletions.
diff --git a/engine/classes/Elgg/Database/EntityTable.php b/engine/classes/Elgg/Database/EntityTable.php
@@ -459,7 +459,7 @@ public function updateLastAction(\ElggEntity $entity, int $posted = null): int {
 	 * @throws UserFetchFailureException
 	 */
 	public function getUserForPermissionsCheck(int $guid = null): ?\ElggUser {
-		if (!$guid || $guid === $this->session_manager->getLoggedInUserGuid()) {
+		if (empty($guid) || $guid === $this->session_manager->getLoggedInUserGuid()) {
 			return $this->session_manager->getLoggedInUser();
 		}
 

diff --git a/engine/classes/Elgg/Database/Seeds/Groups.php b/engine/classes/Elgg/Database/Seeds/Groups.php
@@ -37,7 +37,6 @@ public function seed() {
 			if ($this->create) {
 				$group = $this->createGroup([
 					'access_id' => $this->getRandomGroupVisibility(),
-				], [
 					'content_access_mode' => $this->getRandomGroupContentAccessMode(),
 					'membership' => $this->getRandomGroupMembership(),
 				], [

diff --git a/engine/classes/Elgg/Database/Seeds/Users.php b/engine/classes/Elgg/Database/Seeds/Users.php
@@ -37,7 +37,7 @@ public function seed() {
 
 		while ($this->getCount() < $this->limit) {
 			if ($this->create) {
-				$user = $this->createUser([], [], [
+				$user = $this->createUser([], [
 					'profile_fields' => $profile_fields,
 				]);
 			} else {

diff --git a/engine/classes/Elgg/Filesystem/Filestore/DiskFilestore.php b/engine/classes/Elgg/Filesystem/Filestore/DiskFilestore.php
@@ -3,6 +3,7 @@
 namespace Elgg\Filesystem\Filestore;
 
 use Elgg\Exceptions\DomainException;
+use Elgg\Exceptions\Filesystem\IOException;
 use Elgg\Exceptions\InvalidArgumentException;
 use Elgg\Filesystem\Filestore;
 use Elgg\Project\Paths;

diff --git a/engine/classes/Elgg/Traits/Seeding.php b/engine/classes/Elgg/Traits/Seeding.php
@@ -534,7 +534,7 @@ function(QueryBuilder $qb, $main_alias) use ($exclude) {
 			foreach ($profile_fields_config as $field) {
 				$profile_fields[$field['name']] = $field['#type'];
 			}
-			return $this->createUser([], [
+			return $this->createUser([
 				'validated' => true,
 			], [
 				'profile_fields' => $profile_fields,
@@ -581,7 +581,6 @@ function(QueryBuilder $qb, $main_alias) use ($exclude) {
 
 			return $this->createGroup([
 				'access_id' => $this->getRandomGroupVisibility(),
-			], [
 				'content_access_mode' => $this->getRandomGroupContentAccessMode(),
 				'membership' => $this->getRandomGroupMembership(),
 			], [

diff --git a/engine/classes/ElggSession.php b/engine/classes/ElggSession.php
@@ -2,7 +2,7 @@
 
 use Elgg\Config;
 use Elgg\Database;
-use Elgg\Database\SessionHandler;
+use Elgg\Database\SessionHandler as ElggSessionHandler;
 use Elgg\Traits\Debug\Profilable;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -282,7 +282,7 @@ public static function fromDatabase(Config $config, Database $db) {
 			'cookie_lifetime' => $params['lifetime'],
 		];
 
-		$handler = new SessionHandler($db);
+		$handler = new ElggSessionHandler($db);
 		$storage = new NativeSessionStorage($options, $handler);
 		$session = new Session($storage);
 		return new self($session);

diff --git a/engine/lib/events.php b/engine/lib/events.php
@@ -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 = '', string $version = '') {
+function elgg_trigger_deprecated_event_results(string $event, string $type, array $params = [], $returnvalue = null, string $message = '', string $version = '') {
 	return _elgg_services()->events->triggerDeprecatedResults($event, $type, $params, $returnvalue, $message, $version);
 }
diff --git a/mod/blog/classes/Elgg/Blog/Seeder.php b/mod/blog/classes/Elgg/Blog/Seeder.php
@@ -22,18 +22,15 @@ class Seeder extends Seed {
 	public function seed() {
 		$this->advance($this->getCount());
 
-		$attributes = [
-			'subtype' => 'blog',
-		];
-
 		while ($this->getCount() < $this->limit) {
-			$metadata = [
+			$properties = [
+				'subtype' => 'blog',
 				'status' => $this->getRandomStatus(),
 				'comments_on' => $this->faker()->boolean() ? 'On' : 'Off',
 				'excerpt' => $this->faker()->sentence(),
 			];
 
-			$blog = $this->createObject($attributes, $metadata);
+			$blog = $this->createObject($properties);
 			if (!$blog) {
 				continue;
 			}

diff --git a/mod/bookmarks/classes/Elgg/Bookmarks/Seeder.php b/mod/bookmarks/classes/Elgg/Bookmarks/Seeder.php
@@ -17,16 +17,13 @@ class Seeder extends Seed {
 	public function seed() {
 		$this->advance($this->getCount());
 
-		$attributes = [
-			'subtype' => 'bookmarks',
-		];
-
 		while ($this->getCount() < $this->limit) {
-			$metadata = [
+			$properties = [
+				'subtype' => 'bookmarks',
 				'address' => $this->faker()->url,
 			];
 
-			$bookmark = $this->createObject($attributes, $metadata);
+			$bookmark = $this->createObject($properties);
 			if (!$bookmark) {
 				continue;
 			}

diff --git a/mod/developers/classes/Elgg/Developers/HandlerLogger.php b/mod/developers/classes/Elgg/Developers/HandlerLogger.php
@@ -24,7 +24,7 @@ public static function trackEvent(\Elgg\Event $event) : void {
 			return;
 		}
 
-		self::track($event->getName(), $event->getType(), $event);
+		self::track($event->getName(), $event->getType());
 	}
 
 	/**

diff --git a/mod/discussions/classes/Elgg/Discussions/Seeder.php b/mod/discussions/classes/Elgg/Discussions/Seeder.php
@@ -23,17 +23,14 @@ public function seed() {
 		$this->advance($this->getCount());
 
 		while ($this->getCount() < $this->limit) {
-			$metadata = [
-				'status' => $this->getRandomStatus(),
-				'excerpt' => $this->faker()->sentence(),
-			];
-
-			$attributes = [
+			$properties = [
 				'subtype' => 'discussion',
 				'container_guid' => $this->getRandomGroup()->guid,
+				'status' => $this->getRandomStatus(),
+				'excerpt' => $this->faker()->sentence(),
 			];
 
-			$discussion = $this->createObject($attributes, $metadata);
+			$discussion = $this->createObject($properties);
 			if (!$discussion) {
 				continue;
 			}

diff --git a/mod/pages/classes/Elgg/Pages/Seeder.php b/mod/pages/classes/Elgg/Pages/Seeder.php
@@ -18,15 +18,12 @@ public function seed() {
 		$this->advance($this->getCount());
 
 		$create_page = function () {
-			$metadata = [
-				'write_access_id' => ACCESS_LOGGED_IN,
-			];
-
-			$attributes = [
+			$properties = [
 				'subtype' => 'page',
+				'write_access_id' => ACCESS_LOGGED_IN,
 			];
 
-			$page = $this->createObject($attributes, $metadata);
+			$page = $this->createObject($properties);
 			if (!$page) {
 				return;
 			}

diff --git a/mod/site_notifications/classes/Elgg/SiteNotifications/Seeder.php b/mod/site_notifications/classes/Elgg/SiteNotifications/Seeder.php
@@ -19,18 +19,15 @@ class Seeder extends Seed {
 	public function seed() {
 		$this->advance($this->getCount());
 
-		$attributes = [
-			'subtype' => 'site_notification',
-			'access_id' => ACCESS_PRIVATE,
-		];
-
 		while ($this->getCount() < $this->limit) {
-			$metadata = [
+			$properties = [
+				'subtype' => 'site_notification',
+				'access_id' => ACCESS_PRIVATE,
 				'read' => $this->faker()->boolean(),
 				'summary' => $this->faker()->sentence(),
 			];
 
-			$notification = $this->createObject($attributes, $metadata);
+			$notification = $this->createObject($properties);
 			if (!$notification instanceof \SiteNotification) {
 				continue;
 			}