Merge branch 'master' into dev/4.0

Author: iMattPro

controller/wizard.php

@@ -23,9 +23,6 @@
  */
 class wizard
 {
-	/** @var string The default BBvideo site */
-	public const BBVIDEO_DEFAULT = 'youtube';
-
 	/** @var cache_driver */
 	protected cache_driver $cache;
 
@@ -83,7 +80,7 @@ public function bbcode_wizard(string $mode): Response
 			$sites = $this->get_bbvideo_sites();
 			$this->template->assign_vars([
 				'ABBC3_BBVIDEO_SITES'	=> $sites,
-				'ABBC3_BBVIDEO_DEFAULT'	=> array_key_exists(self::BBVIDEO_DEFAULT, $sites) ? self::BBVIDEO_DEFAULT : key($sites),
+				'ABBC3_BBVIDEO_DEFAULT'	=> array_key_exists('youtube', $sites) ? 'youtube' : key($sites),
 			]);
 		}
 

tests/controller/wizard_test.php

@@ -98,7 +98,7 @@ public function test_bbcode_wizard($mode, $ajax, $status_code, $page_content)
 			->method('assign_vars')
 			->with([
 				'ABBC3_BBVIDEO_SITES'   => [],
-				'ABBC3_BBVIDEO_DEFAULT' => wizard::BBVIDEO_DEFAULT,
+				'ABBC3_BBVIDEO_DEFAULT' => null,
 			]);
 
 		$response = $this->controller->bbcode_wizard($mode);
@@ -126,7 +126,7 @@ public function test_bbvideo_sites_cached()
 			->method('assign_vars')
 			->with([
 				'ABBC3_BBVIDEO_SITES'   => $cached_data,
-				'ABBC3_BBVIDEO_DEFAULT' => wizard::BBVIDEO_DEFAULT,
+				'ABBC3_BBVIDEO_DEFAULT' => 'youtube',
 			]);
 
 		$response = $this->controller->bbcode_wizard('bbvideo');