Fix tests

Signed-off-by: Matt Friedman <maf675@gmail.com>

Author: iMattPro

tests/event/listener_test.php

@@ -389,18 +389,23 @@ public function test_validate_pwa_options($validate, $cfg_array, $expected_error
 		$this->config['icons_path'] = 'images/icons';
 		$config_name = key($cfg_array);
 		$config_definition = ['validate' => $validate];
-		$small_image = isset($cfg_array['pwa_icon_small']) ? explode('.', $cfg_array['pwa_icon_small']) : ['', ''];
-		$large_image = isset($cfg_array['pwa_icon_large']) ? explode('.', $cfg_array['pwa_icon_large']) : ['', ''];
+
+		$pwa_icon_small = isset($cfg_array['pwa_icon_small']) ? $cfg_array['pwa_icon_small'] : '';
+		$pwa_icon_large = isset($cfg_array['pwa_icon_large']) ? $cfg_array['pwa_icon_large'] : '';
+
+		[$small_image_name, $small_image_ext] = $pwa_icon_small ? explode('.', $pwa_icon_small, 2) : ['', ''];
+		[$large_image_name, $large_image_ext] = $pwa_icon_large ? explode('.', $pwa_icon_large, 2) : ['', ''];
+
 		$error = [];
 
 		$this->set_listener();
 
-		$this->imagesize->expects(!empty($cfg_array['pwa_icon_small']) || !empty($cfg_array['pwa_icon_large']) ? self::once() : self::never())
+		$this->imagesize->expects($pwa_icon_small && $pwa_icon_large ? self::once() : self::never())
 			->method('getImageSize')
 			->willReturnMap([
 				[$this->root_path . $this->config['icons_path'] . '/', '', false],
-				[$this->root_path . $this->config['icons_path'] . '/' . $cfg_array['pwa_icon_small'], '', ['width' => (int) $small_image[0], 'height' => (int) $small_image[0], 'type' => $small_image[1] === 'png' ? IMAGETYPE_PNG : IMAGETYPE_UNKNOWN]],
-				[$this->root_path . $this->config['icons_path'] . '/' . $cfg_array['pwa_icon_large'], '', ['width' => (int) $large_image[0], 'height' => (int) $large_image[0], 'type' => $large_image[1] === 'png' ? IMAGETYPE_PNG : IMAGETYPE_UNKNOWN]],
+				[$this->root_path . $this->config['icons_path'] . '/' . $pwa_icon_small, '', ['width' => (int) $small_image_name, 'height' => (int) $small_image_name, 'type' => $small_image_ext === 'png' ? IMAGETYPE_PNG : IMAGETYPE_UNKNOWN]],
+				[$this->root_path . $this->config['icons_path'] . '/' . $pwa_icon_large, '', ['width' => (int) $large_image_name, 'height' => (int) $large_image_name, 'type' => $large_image_ext === 'png' ? IMAGETYPE_PNG : IMAGETYPE_UNKNOWN]],
 			]);
 
 		$dispatcher = new \phpbb\event\dispatcher();