Merge pull request #14604 from jeabakker/features

chore(core): scrutinizer issues
Elgg · Apr 18, 2024 · 2b18495 · 2b18495
2 parents 932b9c3 + 94ba070
commit 2b18495
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 20 deletions.
diff --git a/docs/guides/errors.rst b/docs/guides/errors.rst
@@ -18,6 +18,6 @@ You can add custom handlers (see Monolog_ documentation for a full list of handl
 			'admin@example.com',
 			'Critical error',
 			'no-reply@mysite.com',
-			\Monolog\Logger::CRITICAL
+			\Monolog\Level::Critical
 		)
 	);
diff --git a/engine/classes/Elgg/Cli/ErrorFormatter.php b/engine/classes/Elgg/Cli/ErrorFormatter.php
@@ -3,7 +3,7 @@
 namespace Elgg\Cli;
 
 use Elgg\Logger\ElggLogFormatter;
-use Monolog\Logger;
+use Monolog\Level;
 use Monolog\LogRecord;
 use Symfony\Component\Console\Helper\FormatterHelper;
 
@@ -23,14 +23,14 @@ public function format(LogRecord $record): string {
 		$formatter = new FormatterHelper();
 
 		switch ($record->level->value) {
-			case Logger::EMERGENCY:
-			case Logger::CRITICAL:
-			case Logger::ALERT:
-			case Logger::ERROR:
+			case Level::Emergency:
+			case Level::Critical:
+			case Level::Alert:
+			case Level::Error:
 				$style = 'error';
 				break;
 
-			case Logger::WARNING:
+			case Level::Warning:
 				$style = 'comment';
 				break;
 

diff --git a/engine/classes/Elgg/Cli/ErrorHandler.php b/engine/classes/Elgg/Cli/ErrorHandler.php
@@ -4,6 +4,7 @@
 
 use Elgg\Logger;
 use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Level;
 use Monolog\LogRecord;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,10 +20,10 @@ class ErrorHandler extends AbstractProcessingHandler {
 
 	const VERBOSITY_LEVEL_MAP = [
 		OutputInterface::VERBOSITY_QUIET => Logger::OFF,
-		OutputInterface::VERBOSITY_NORMAL => Logger::WARNING,
-		OutputInterface::VERBOSITY_VERBOSE => Logger::NOTICE,
-		OutputInterface::VERBOSITY_VERY_VERBOSE => Logger::INFO,
-		OutputInterface::VERBOSITY_DEBUG => Logger::DEBUG,
+		OutputInterface::VERBOSITY_NORMAL => Level::Warning,
+		OutputInterface::VERBOSITY_VERBOSE => Level::Notice,
+		OutputInterface::VERBOSITY_VERY_VERBOSE => Level::Info,
+		OutputInterface::VERBOSITY_DEBUG => Level::Debug,
 	];
 
 	/**
@@ -61,7 +62,7 @@ public function __construct(
 	 * {@inheritdoc}
 	 */
 	public function write(LogRecord $record): void {
-		$stream = $record->level->value >= Logger::ERROR ? $this->stderr : $this->stdout;
+		$stream = $record->level->value >= Level::Error ? $this->stderr : $this->stdout;
 
 		$stream->write($record->formatted, true);
 

diff --git a/engine/classes/Elgg/Database.php b/engine/classes/Elgg/Database.php
@@ -258,7 +258,7 @@ public function insertData(QueryBuilder $query): int {
 	 *
 	 * @return bool|int
 	 */
-	public function updateData(QueryBuilder $query, bool $get_num_rows = false) {
+	public function updateData(QueryBuilder $query, bool $get_num_rows = false): bool|int {
 		$params = $query->getParameters();
 		$sql = $query->getSQL();
 
@@ -271,7 +271,7 @@ public function updateData(QueryBuilder $query, bool $get_num_rows = false) {
 			return true;
 		}
 
-		return ($result instanceof Result) ? $result->rowCount() : $result;
+		return ($result instanceof Result) ? (int) $result->rowCount() : $result;
 	}
 
 	/**
@@ -292,7 +292,7 @@ public function deleteData(QueryBuilder $query): int {
 		$this->query_cache->clear();
 
 		$result = $this->executeQuery($query);
-		return ($result instanceof Result) ? $result->rowCount() : $result;
+		return ($result instanceof Result) ? (int) $result->rowCount() : $result;
 	}
 
 	/**

diff --git a/engine/classes/Elgg/Database/QueryBuilder.php b/engine/classes/Elgg/Database/QueryBuilder.php
@@ -118,7 +118,7 @@ public function prefix(string $table): string {
 	 * @return string
 	 */
 	public function getTableName(): string {
-		return $this->table_name;
+		return (string) $this->table_name;
 	}
 
 	/**

diff --git a/engine/classes/Elgg/Di/InternalContainer.php b/engine/classes/Elgg/Di/InternalContainer.php
@@ -177,7 +177,7 @@ public function initConfig(Config $config): Config {
 	 * {@inheritDoc}
 	 */
 	public static function factory(array $options = []) {
-		$container = parent::factory($options);
+		$container = parent::factory();
 
 		if (isset($options['config'])) {
 			$config = $options['config'];

diff --git a/engine/classes/Elgg/Logger/BacktraceProcessor.php b/engine/classes/Elgg/Logger/BacktraceProcessor.php
@@ -3,6 +3,7 @@
 namespace Elgg\Logger;
 
 use Elgg\Logger;
+use Monolog\Level;
 use Monolog\LogRecord;
 
 /**
@@ -20,7 +21,7 @@ class BacktraceProcessor {
 	 * @param int $level           Logging level
 	 * @param int $backtrace_level Backtrance level (-1 for all)
 	 */
-	public function __construct($level = Logger::WARNING, $backtrace_level = -1) {
+	public function __construct($level = Level::Warning, $backtrace_level = -1) {
 		$this->level = Logger::toMonologLevel($level);
 		$this->backtrace_level = $backtrace_level;
 	}

diff --git a/mod/developers/classes/Elgg/Developers/Bootstrap.php b/mod/developers/classes/Elgg/Developers/Bootstrap.php
@@ -128,7 +128,7 @@ protected function processSettings(): void {
 			$handler = new \Monolog\Handler\RotatingFileHandler(
 				elgg_sanitize_path(elgg_get_data_path() . 'logs/html/errors.html', false),
 				elgg_extract('error_log_max_files', $settings, 60),
-				\Monolog\Logger::ERROR
+				\Monolog\Level::Error
 			);
 
 			$formatter = new \Elgg\Developers\ErrorLogHtmlFormatter();

diff --git a/mod/garbagecollector/classes/Elgg/GarbageCollector/GarbageCollector.php b/mod/garbagecollector/classes/Elgg/GarbageCollector/GarbageCollector.php
@@ -178,7 +178,7 @@ protected function tables(): array {
 	 */
 	protected function optimizeTable(string $table): int {
 		$result = $this->db->getConnection('write')->executeQuery("OPTIMIZE TABLE {$table}");
-		return $result->rowCount();
+		return (int) $result->rowCount();
 	}
 
 	/**