Merge pull request #7961 from jdarwood007/lint

Sources/Actions/Admin/Find.php

@@ -20,10 +20,10 @@
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
+use SMF\PackageManager\XmlArray;
 use SMF\User;
 use SMF\Utils;
 use SMF\WebFetch\WebFetchApi;
-use SMF\PackageManager\XmlArray;
 
 /**
  * Provides the search functionality inside the admin control panel.

Sources/Cache/APIs/Apcu.php

@@ -54,7 +54,7 @@ public function connect(): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getData(string $key, int|null $ttl = null): mixed
+	public function getData(string $key, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
@@ -66,7 +66,7 @@ public function getData(string $key, int|null $ttl = null): mixed
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 

Sources/Cache/APIs/FileBased.php

@@ -75,7 +75,7 @@ public function connect(): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getData(string $key, int|null $ttl = null): mixed
+	public function getData(string $key, ?int $ttl = null): mixed
 	{
 		$file = sprintf(
 			'%s/data_%s.cache',
@@ -98,7 +98,7 @@ public function getData(string $key, int|null $ttl = null): mixed
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed
 	{
 		$file = sprintf(
 			'%s/data_%s.cache',
@@ -109,8 +109,9 @@ public function putData(string $key, mixed $value, int|null $ttl = null): mixed
 
 		if ($value === null) {
 			@unlink($file);
+
 			return true;
-		} else {
+		}
 			$cache_data = json_encode(
 				[
 					'expiration' => time() + $ttl,
@@ -128,7 +129,7 @@ public function putData(string $key, mixed $value, int|null $ttl = null): mixed
 			}
 
 			return true;
-		}
+
 	}
 
 	/**
@@ -198,7 +199,7 @@ public function cacheSettings(array &$config_vars): void
 	 * @param string $dir A valid path
 	 * @return bool If this was successful or not.
 	 */
-	public function setCachedir(string $dir = null): void
+	public function setCachedir(?string $dir = null): void
 	{
 		// If its invalid, use SMF's.
 		if (is_null($dir) || !is_writable($dir)) {

Sources/Cache/APIs/MemcacheImplementation.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
- 
+
 namespace SMF\Cache\APIs;
 
 use Memcache;
@@ -124,7 +124,7 @@ public function connect(): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getData(string $key, int $ttl = null): mixed
+	public function getData(string $key, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
@@ -141,7 +141,7 @@ public function getData(string $key, int $ttl = null): mixed
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 

Sources/Cache/APIs/MemcachedImplementation.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
- 
+
 namespace SMF\Cache\APIs;
 
 use Memcached;
@@ -130,7 +130,7 @@ protected function addServers(): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getData(string $key, int|null $ttl = null): mixed
+	public function getData(string $key, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
@@ -147,7 +147,7 @@ public function getData(string $key, int|null $ttl = null): mixed
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 

Sources/Cache/APIs/Postgres.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
- 
+
 namespace SMF\Cache\APIs;
 
 use SMF\Cache\CacheApi;
@@ -137,7 +137,7 @@ public function isSupported(bool $test = false): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getData(string $key, int $ttl = null): mixed
+	public function getData(string $key, ?int $ttl = null): mixed
 	{
 		$result = pg_execute($this->db_connection, 'smf_cache_get_data', [$key, time()]);
 
@@ -153,7 +153,7 @@ public function getData(string $key, int $ttl = null): mixed
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed
 	{
 		$ttl = time() + (int) ($ttl !== null ? $ttl : $this->ttl);
 

Sources/Cache/APIs/Sqlite.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
- 
+
 namespace SMF\Cache\APIs;
 
 use SMF\Cache\CacheApi;
@@ -85,7 +85,7 @@ public function isSupported(bool $test = false): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getData(string $key, int $ttl = null): mixed
+	public function getData(string $key, ?int $ttl = null): mixed
 	{
 		$query = 'SELECT value FROM cache WHERE key = \'' . $this->cacheDB->escapeString($key) . '\' AND ttl >= ' . time() . ' LIMIT 1';
 		$result = $this->cacheDB->query($query);
@@ -102,7 +102,7 @@ public function getData(string $key, int $ttl = null): mixed
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed
 	{
 		$ttl = time() + (int) ($ttl !== null ? $ttl : $this->ttl);
 

Sources/Cache/APIs/Zend.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
- 
+
 namespace SMF\Cache\APIs;
 
 use SMF\Cache\CacheApi;
@@ -51,7 +51,7 @@ public function connect(): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getData(string $key, int $ttl = null): mixed
+	public function getData(string $key, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
@@ -70,7 +70,7 @@ public function getData(string $key, int $ttl = null): mixed
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 

Sources/Cache/CacheApi.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
- 
+
 namespace SMF\Cache;
 
 use SMF\BackwardCompatibility;

Sources/Cache/CacheApiInterface.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
- 
+
 namespace SMF\Cache;
 
 if (!defined('SMF')) {
@@ -45,7 +45,7 @@ public function connect(): bool;
 	 * @return mixed The result from the cache, if there is no data or it is invalid, we return null.
 	 * @todo Separate existence checking into its own method
 	 */
-	public function getData(string $key, int|null $ttl = null): mixed;
+	public function getData(string $key, ?int $ttl = null): mixed;
 
 	/**
 	 * Stores a value, regardless of whether or not the key already exists (in
@@ -58,7 +58,7 @@ public function getData(string $key, int|null $ttl = null): mixed;
 	 * @return mixed Whether or not we could save this to the cache.
 	 * @todo Separate deletion into its own method
 	 */
-	public function putData(string $key, mixed $value, int|null $ttl = null): mixed;
+	public function putData(string $key, mixed $value, ?int $ttl = null): mixed;
 
 	/**
 	 * Clean out the cache.

Sources/Db/APIs/MySQL.php

@@ -120,7 +120,7 @@ class MySQL extends DatabaseApi implements DatabaseApiInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function query(string $identifier, string $db_string, array $db_values = [], object $connection = null): object|bool
+	public function query(string $identifier, string $db_string, array $db_values = [], ?object $connection = null): object|bool
 	{
 		// Comments that are allowed in a query are preg_removed.
 		$allowed_comments_from = [
@@ -256,7 +256,7 @@ public function query(string $identifier, string $db_string, array $db_values =
 	/**
 	 * {@inheritDoc}
 	 */
-	public function quote(string $db_string, array $db_values, object $connection = null): string
+	public function quote(string $db_string, array $db_values, ?object $connection = null): string
 	{
 		// Only bother if there's something to replace.
 		if (strpos($db_string, '{') !== false) {
@@ -305,13 +305,14 @@ public function fetch_all(object $request): array
 	public function free_result(object $result): bool
 	{
 		mysqli_free_result($result);
+
 		return true;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function insert(string $method, string $table, array $columns, array $data, array $keys, int $returnmode = 0, object $connection = null): int|array|null
+	public function insert(string $method, string $table, array $columns, array $data, array $keys, int $returnmode = 0, ?object $connection = null): int|array|null
 	{
 		$connection = $connection ?? $this->connection;
 
@@ -508,7 +509,7 @@ public function insert(string $method, string $table, array $columns, array $dat
 	/**
 	 * {@inheritDoc}
 	 */
-	public function insert_id(string $table, string $field = null, object $connection = null): int
+	public function insert_id(string $table, ?string $field = null, ?object $connection = null): int
 	{
 		// MySQL doesn't need the table or field information.
 		return mysqli_insert_id($connection ?? $this->connection);
@@ -541,7 +542,7 @@ public function num_fields(object $result): int
 	/**
 	 * {@inheritDoc}
 	 */
-	public function escape_string(string $string, object $connection = null): string
+	public function escape_string(string $string, ?object $connection = null): string
 	{
 		return mysqli_real_escape_string($connection ?? $this->connection, $string);
 	}
@@ -557,23 +558,23 @@ public function unescape_string(string $string): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function server_info(object $connection = null): string
+	public function server_info(?object $connection = null): string
 	{
 		return mysqli_get_server_info($connection ?? $this->connection);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function affected_rows(object $connection = null): int
+	public function affected_rows(?object $connection = null): int
 	{
 		return mysqli_affected_rows($connection ?? $this->connection);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function transaction(string $type = 'commit', object $connection = null): bool
+	public function transaction(string $type = 'commit', ?object $connection = null): bool
 	{
 		$type = strtoupper($type);
 
@@ -603,7 +604,7 @@ public function error(object $connection): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function select(string $database, object $connection = null): bool
+	public function select(string $database, ?object $connection = null): bool
 	{
 		return mysqli_select_db($connection ?? $this->connection, $database);
 	}
@@ -639,7 +640,7 @@ public function is_resource(mixed $result): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function ping(object $connection = null): bool
+	public function ping(?object $connection = null): bool
 	{
 		return mysqli_ping($connection ?? $this->connection);
 	}
@@ -1152,7 +1153,7 @@ public function allow_persistent(): bool
 	/**
 	 * {@inheritDoc}
 	 */
-	public function search_query(string $identifier, string $db_string, array $db_values = [], object $connection = null): object|bool
+	public function search_query(string $identifier, string $db_string, array $db_values = [], ?object $connection = null): object|bool
 	{
 		return $this->query($identifier, $db_string, $db_values, $connection);
 	}
@@ -1197,7 +1198,7 @@ public function create_word_search(string $size): void
 	/**
 	 * {@inheritDoc}
 	 */
-	public function search_language(): string|null
+	public function search_language(): ?string
 	{
 		return null;
 	}
@@ -1340,7 +1341,7 @@ public function add_index(string $table_name, array $index_info, array $paramete
 	/**
 	 * {@inheritDoc}
 	 */
-	public function calculate_type(string $type_name, int $type_size = null, bool $reverse = false): array
+	public function calculate_type(string $type_name, ?int $type_size = null, bool $reverse = false): array
 	{
 		// MySQL is actually the generic baseline.
 
@@ -2274,7 +2275,7 @@ protected function replacement__callback(array $matches): string
 	 * @param int $line What line of $file the code which generated the error is on
 	 * @return void|array Returns an array with the file and line if $error_type is 'return'
 	 */
-	protected function error_backtrace(string $error_message, string $log_message = '', string|int|bool $error_type = false, string $file = null, int $line = null): array|null
+	protected function error_backtrace(string $error_message, string $log_message = '', string|int|bool $error_type = false, ?string $file = null, ?int $line = null): ?array
 	{
 		if (empty($log_message)) {
 			$log_message = $error_message;