From 5756d4dd9bba4f448cd896739584b78291ef78d5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 27 Dec 2022 16:22:34 +0100
Subject: [PATCH] [ticket/16955] Clean up avatar classes

PHPBB3-16955
---
 phpBB/phpbb/avatar/driver/driver_interface.php | 2 +-
 phpBB/phpbb/avatar/driver/upload.php           | 2 +-
 phpBB/phpbb/avatar/manager.php                 | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/phpbb/avatar/driver/driver_interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php
index 7d6c2cff8a..223f49be20 100644
--- a/phpBB/phpbb/avatar/driver/driver_interface.php
+++ b/phpBB/phpbb/avatar/driver/driver_interface.php
@@ -95,7 +95,7 @@ interface driver_interface
 	*        an array that will be passed to vsprintf() with the language key in
 	*        the first array key.
 	*
-	* @return array Array containing the avatar data as follows:
+	* @return array|false Array containing the avatar data as follows or false if processing failed:
 	*        ['avatar'], ['avatar_width'], ['avatar_height']
 	*/
 	public function process_form($request, $template, $user, $row, &$error);
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 433ff7b026..82d1a7fce2 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -284,6 +284,6 @@ class upload extends \phpbb\avatar\driver\driver
 	*/
 	protected function can_upload()
 	{
-		return $this->php_ini->getBool('file_uploads');
+		return (bool) $this->php_ini->getBool('file_uploads');
 	}
 }
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index 3d85964f5b..5de3caab10 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -29,7 +29,7 @@ class manager
 
 	/**
 	* Array that contains a list of enabled drivers
-	* @var array|bool
+	* @var array|false
 	*/
 	protected static $enabled_drivers = false;
 
@@ -87,7 +87,7 @@ class manager
 	* @param string $avatar_type Avatar type; by default an avatar's service container name
 	* @param bool $load_enabled Load only enabled avatars
 	*
-	* @return object Avatar driver object
+	* @return object|null Avatar driver object
 	*/
 	public function get_driver($avatar_type, $load_enabled = true)
 	{
@@ -181,7 +181,7 @@ class manager
 			$this->load_enabled_drivers();
 		}
 
-		return self::$enabled_drivers;
+		return self::$enabled_drivers ?: [];
 	}
 
 	/**
@@ -254,7 +254,7 @@ class manager
 	{
 		$config_name = $driver->get_config_name();
 
-		return $this->config["allow_avatar_{$config_name}"];
+		return (bool) $this->config["allow_avatar_{$config_name}"];
 	}
 
 	/**