Merge pull request phpbb#6922 from marc1706/ticket/17602

[ticket/17602] Clean up avatar code and fix some misc test issues

Author: marc1706

phpBB/includes/acp/acp_users.php

@@ -1897,11 +1897,6 @@ function main($id, $mode)
 
 									if ($request->is_ajax())
 									{
-										/** @var \phpbb\avatar\helper $avatar_helper */
-										$avatar_helper = $phpbb_container->get('avatar.helper');
-
-										$avatar = $avatar_helper->get_user_avatar($user->data, 'USER_AVATAR', true);
-
 										$json_response = new \phpbb\json_response;
 										$json_response->send([
 											'success' => true,

phpBB/includes/ucp/ucp_profile.php

@@ -665,11 +665,6 @@ function main($id, $mode)
 
 									if ($request->is_ajax())
 									{
-										/** @var \phpbb\avatar\helper $avatar_helper */
-										$avatar_helper = $phpbb_container->get('avatar.helper');
-
-										$avatar = $avatar_helper->get_user_avatar($user->data, 'USER_AVATAR', true);
-
 										$json_response = new \phpbb\json_response;
 										$json_response->send(array(
 											'success' => true,

phpBB/phpbb/template/twig/extension/avatar.php

@@ -73,13 +73,19 @@ public function get_avatar(environment $environment, array $row): string
 	{
 		try
 		{
+			// Quickly return if required data is missing
+			if (!isset($row['src'], $row['width'], $row['height'], $row['title']))
+			{
+				return '';
+			}
+
 			return $environment->render('macros/avatar.twig', [
-				'SRC'		=> $row['lazy'] ? $this->avatar_helper->get_no_avatar_source() : $row['src'],
-				'DATA_SRC'	=> $row['lazy'] ? $row['src'] : '',
+				'SRC'		=> !empty($row['lazy']) ? $this->avatar_helper->get_no_avatar_source() : $row['src'],
+				'DATA_SRC'	=> !empty($row['lazy']) ? $row['src'] : '',
 				'WIDTH'		=> $row['width'],
 				'HEIGHT'	=> $row['height'],
 				'TITLE'		=> $row['title'],
-				'LAZY'		=> $row['lazy'],
+				'LAZY'		=> $row['lazy'] ?? false,
 			]);
 		}
 		catch (Error $e)

tests/functional/manifest_test.php

@@ -18,7 +18,7 @@ class phpbb_functional_manifest_test extends phpbb_functional_test_case
 {
 	public function test_manifest()
 	{
-		$url_path = preg_replace('#^(/.+)/$#', '$1', parse_url(self::$root_url, PHP_URL_PATH));
+		$url_path = preg_replace('#^(/.+)/$#', '$1/', parse_url(self::$root_url, PHP_URL_PATH));
 
 		$expected = [
 			'name'			=> 'yourdomain.com',

tests/functional/viewonline_test.php

@@ -57,7 +57,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'members/online');
+		$crawler = self::request('GET', 'app.php/members/online');
 		// Make sure posting reply page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('REPLYING_MESSAGE', $this->get_forum_name_by_topic_id(1)), $crawler->text());
@@ -72,7 +72,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'members/online');
+		$crawler = self::request('GET', 'app.php/members/online');
 		// Make sure posting message page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text());
@@ -88,7 +88,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'members/online');
+		$crawler = self::request('GET', 'app.php/members/online');
 		// Make sure posting message page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text());
@@ -102,7 +102,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'members/online');
+		$crawler = self::request('GET', 'app.php/members/online');
 		// Make sure reading topic page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('READING_TOPIC', $this->get_forum_name_by_topic_id(1)), $crawler->text());
@@ -116,7 +116,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'members/online');
+		$crawler = self::request('GET', 'app.php/members/online');
 		// Make sure reading forum page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('READING_FORUM', $this->get_forum_name_by_forum_id(2)), $crawler->text());

tests/session/check_ban_test.php

@@ -75,7 +75,7 @@ protected function setUp(): void
 		// the mock cache object does not hit the database as is needed
 		// for this test.
 		$cache = new \phpbb\cache\service(
-			new \phpbb\cache\driver\file(),
+			new \phpbb\cache\driver\dummy(),
 			$config,
 			$this->db,
 			$phpbb_dispatcher,

tests/wrapper/gmgetdate_test.php

@@ -13,15 +13,15 @@
 
 class phpbb_wrapper_gmgetdate_test extends phpbb_test_case
 {
-	public static function phpbb_gmgetdate_data()
+	public static function phpbb_gmgetdate_data(): array
 	{
-		return array(
-			array(''),
-			array('UTC'),
-			array('Europe/Berlin'),
-			array('America/Los_Angeles'),
-			array('Antarctica/South_Pole'),
-		);
+		return [
+			[''],
+			['UTC'],
+			['Europe/Berlin'],
+			['America/Los_Angeles'],
+			['Pacific/Auckland'],
+		];
 	}
 
 	/**