Fix unit tests

Author: malberts

tests/phpunit/Unit/CarouselGalleryTest.php

@@ -82,17 +82,17 @@ public function galleryDataProvider() {
 					'fade'  => '',
 				],
 				[
-					0 => '<div class="carousel slide carousel-fade firefly" style="float:space" id="youcanttakethesky" data-ride="carousel">' . PHP_EOL
+					0 => '<div class="carousel slide carousel-fade firefly" style="float:space" id="youcanttakethesky" data-bs-ride="carousel">' . PHP_EOL
 						. '<ol class="carousel-indicators">' . PHP_EOL
-						. "\t". '<li data-target="#youcanttakethesky" data-slide-to="0" class="active"></li>' . PHP_EOL
-						. "\t". '<li data-target="#youcanttakethesky" data-slide-to="1"></li>' . PHP_EOL
-						. "\t". '<li data-target="#youcanttakethesky" data-slide-to="2"></li>' . PHP_EOL
+						. "\t". '<li data-bs-target="#youcanttakethesky" data-bs-slide-to="0" class="active"></li>' . PHP_EOL
+						. "\t". '<li data-bs-target="#youcanttakethesky" data-bs-slide-to="1"></li>' . PHP_EOL
+						. "\t". '<li data-bs-target="#youcanttakethesky" data-bs-slide-to="2"></li>' . PHP_EOL
 						. '</ol>' . PHP_EOL
 						. '<div class="carousel-inner">' . PHP_EOL
 						. "\t". '<div class="carousel-item active">[[File:Mal.jpg|Malcolm Reynolds|alt=(alt) Malcolm Reynolds|class=img-fluid]]</div>' . PHP_EOL
 						. "\t". '<div class="carousel-item">[[File:Wash.jpg|Hoban Washburne|link=/List_of_best_Pilots_in_the_Verse|class=img-fluid]]</div>' . PHP_EOL
 						. "\t". '<div class="carousel-item">[[File:MirandaSecretFiles.pdf|(c) by Hands of Blue|page=13|float=none|class=img-fluid]]</div>' . PHP_EOL
-						. '</div><a class="carousel-control-prev" href="#youcanttakethesky" role="button" data-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#youcanttakethesky" role="button" data-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
+						. '</div><a class="carousel-control-prev" href="#youcanttakethesky" role="button" data-bs-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#youcanttakethesky" role="button" data-bs-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
 					'isHTML' => true,
 					'noparse' => true,
 				],
@@ -104,15 +104,15 @@ public function galleryDataProvider() {
 				],
 				[],
 				[
-					0 => '<div class="carousel slide" id="bsc_carousel_0" data-ride="carousel">' . PHP_EOL
+					0 => '<div class="carousel slide" id="bsc_carousel_0" data-bs-ride="carousel">' . PHP_EOL
 						. '<ol class="carousel-indicators">' . PHP_EOL
-						. "\t". '<li data-target="#bsc_carousel_0" data-slide-to="0" class="active"></li>' . PHP_EOL
-						. "\t". '<li data-target="#bsc_carousel_0" data-slide-to="1"></li>' . PHP_EOL
+						. "\t". '<li data-bs-target="#bsc_carousel_0" data-bs-slide-to="0" class="active"></li>' . PHP_EOL
+						. "\t". '<li data-bs-target="#bsc_carousel_0" data-bs-slide-to="1"></li>' . PHP_EOL
 						. '</ol>' . PHP_EOL
 						. '<div class="carousel-inner">' . PHP_EOL
 						. "\t". '<div class="carousel-item active">[[File:Mal.jpg|Malcolm Reynolds|alt=(alt) Malcolm Reynolds|class=img-fluid]]</div>' . PHP_EOL
 						. "\t". '<div class="carousel-item">[[File:Wash.jpg|Hoban Washburne|link=/List_of_best_Pilots_in_the_Verse|class=img-fluid]]</div>' . PHP_EOL
-						. '</div><a class="carousel-control-prev" href="#bsc_carousel_0" role="button" data-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_0" role="button" data-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
+						. '</div><a class="carousel-control-prev" href="#bsc_carousel_0" role="button" data-bs-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_0" role="button" data-bs-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
 					'isHTML' => true,
 					'noparse' => true,
 				],

tests/phpunit/Unit/Components/CollapseTest.php

@@ -69,27 +69,27 @@ public function placeMeArgumentsProvider() {
 			'simple'          => [
 				$this->input,
 				[],
-				'<a class="btn btn-primary" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-toggle="collapse">#bsc_collapse_NULL</a><div class="collapse" id="bsc_collapse_NULL">' . $this->input . '</div>',
+				'<a class="btn btn-primary" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-bs-toggle="collapse">#bsc_collapse_NULL</a><div class="collapse" id="bsc_collapse_NULL">' . $this->input . '</div>',
 			],
 			'color_unknown'   => [
 				$this->input,
 				[ 'color' => 'unknown' ],
-				'<a class="btn btn-primary" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-toggle="collapse">#bsc_collapse_NULL</a><div class="collapse" id="bsc_collapse_NULL">' . $this->input . '</div>',
+				'<a class="btn btn-primary" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-bs-toggle="collapse">#bsc_collapse_NULL</a><div class="collapse" id="bsc_collapse_NULL">' . $this->input . '</div>',
 			],
 			'button text'     => [
 				$this->input,
 				[ 'text' => 'BUTTON' ],
-				'<a class="btn btn-primary" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-toggle="collapse">BUTTON</a><div class="collapse" id="bsc_collapse_NULL">' . $this->input . '</div>',
+				'<a class="btn btn-primary" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-bs-toggle="collapse">BUTTON</a><div class="collapse" id="bsc_collapse_NULL">' . $this->input . '</div>',
 			],
 			'manual id'       => [
 				$this->input,
 				[ 'color' => 'success', 'id' => 'alliance' ],
-				'<a class="btn btn-success" role="button" id="bsc_button_NULL" href="#alliance" data-toggle="collapse">#alliance</a><div class="collapse" id="alliance">' . $this->input . '</div>',
+				'<a class="btn btn-success" role="button" id="bsc_button_NULL" href="#alliance" data-bs-toggle="collapse">#alliance</a><div class="collapse" id="alliance">' . $this->input . '</div>',
 			],
 			'style and class' => [
 				$this->input,
 				[ 'class' => 'dummy nice', 'style' => 'float:right;background-color:green' ],
-				'<a class="btn btn-primary dummy nice" style="float:right;background-color:green" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-toggle="collapse">#bsc_collapse_NULL</a><div class="collapse dummy nice" style="float:right;background-color:green" id="bsc_collapse_NULL">' . $this->input . '</div>',
+				'<a class="btn btn-primary dummy nice" style="float:right;background-color:green" role="button" id="bsc_button_NULL" href="#bsc_collapse_NULL" data-bs-toggle="collapse">#bsc_collapse_NULL</a><div class="collapse dummy nice" style="float:right;background-color:green" id="bsc_collapse_NULL">' . $this->input . '</div>',
 			],
 		];
 	}

tests/phpunit/Unit/Components/ModalTest.php

@@ -90,7 +90,7 @@ public function placeMeArgumentsProvider() {
 				$this->input,
 				[ 'text' => 'BUTTON' ],
 				'<button type="button" class="modal-trigger btn btn-secondary" data-bs-toggle="modal" data-bs-target="#bsc_modal_NULL">BUTTON</button>',
-				'<div class="modal fade" role="dialog" id="bsc_modal_NULL" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>'
+				'<div class="modal fade" role="dialog" id="bsc_modal_NULL" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div>'
 				. '<div class="modal-body">' . $this->input . '</div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-label="Close">Close</button></div></div></div></div>' . "\n",
 			],
 			'text missing'        => [
@@ -106,7 +106,7 @@ public function placeMeArgumentsProvider() {
 					'size' => 'none',
 				],
 				'<span class="modal-trigger" data-bs-toggle="modal" data-bs-target="#bsc_modal_NULL">before<img alt="Serenity" src="/images/a/aa/Serenity.png" width="160" height="42">after</span>',
-				'<div class="modal fade" role="dialog" id="bsc_modal_NULL" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>'
+				'<div class="modal fade" role="dialog" id="bsc_modal_NULL" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div>'
 				. '<div class="modal-body">' . $this->input . '</div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-label="Close">Close</button></div></div></div></div>' . "\n",
 			],
 			'all attributes'      => [
@@ -117,7 +117,7 @@ public function placeMeArgumentsProvider() {
 					'heading' => 'You can\'t take the sky from me!',
 				],
 				'<span class="modal-trigger" data-bs-toggle="modal" data-bs-target="#firefly0"><img alt="Serenity" src="/images/a/aa/Serenity.png" width="160" height="42"></span>',
-				'<div class="modal fade shiny" style="float:right;background-color:black" role="dialog" id="firefly0" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><span class="modal-title">You can\'t take the sky from me!</span><button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>'
+				'<div class="modal fade shiny" style="float:right;background-color:black" role="dialog" id="firefly0" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><span class="modal-title">You can\'t take the sky from me!</span><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div>'
 				. '<div class="modal-body">' . $this->input . '</div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-label="Close">Close</button></div></div></div></div>' . "\n",
 			],
 		];