X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fresourceloader%2FResourceLoaderImageModuleTest.php;h=0015486bb69b130db81386caadea41a1f9894214;hb=6b3e5511fb848890f174690885e748b90389c0b8;hp=3877288a421e84dee69fe742164f7ae57c079041;hpb=bf9c2b0cb30cbe994f3a1859cf46224dd52039e1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
index 3877288a42..3f5704d6f4 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
@@ -1,37 +1,39 @@
 <?php
 
+use Wikimedia\TestingAccessWrapper;
+
 /**
  * @group ResourceLoader
  */
 class ResourceLoaderImageModuleTest extends ResourceLoaderTestCase {
 
 	public static $commonImageData = [
-		'add' => 'add.gif',
-		'remove' => [
-			'file' => 'remove.svg',
+		'abc' => 'abc.gif',
+		'def' => [
+			'file' => 'def.svg',
 			'variants' => [ 'destructive' ],
 		],
-		'next' => [
+		'ghi' => [
 			'file' => [
-				'ltr' => 'next.svg',
-				'rtl' => 'prev.svg'
+				'ltr' => 'ghi.svg',
+				'rtl' => 'jkl.svg'
 			],
 		],
-		'help' => [
+		'mno' => [
 			'file' => [
-				'ltr' => 'help-ltr.svg',
-				'rtl' => 'help-rtl.svg',
+				'ltr' => 'mno-ltr.svg',
+				'rtl' => 'mno-rtl.svg',
 				'lang' => [
-					'he' => 'help-ltr.svg',
+					'he' => 'mno-ltr.svg',
 				]
 			],
 		],
-		'bold' => [
+		'pqr' => [
 			'file' => [
-				'default' => 'bold-a.svg',
+				'default' => 'pqr-a.svg',
 				'lang' => [
-					'en' => 'bold-b.svg',
-					'ar,de' => 'bold-f.svg',
+					'en' => 'pqr-b.svg',
+					'ar,de' => 'pqr-f.svg',
 				]
 			],
 		]
@@ -57,85 +59,85 @@ class ResourceLoaderImageModuleTest extends ResourceLoaderTestCase {
 		return [
 			[
 				[
-					'class' => 'ResourceLoaderImageModule',
+					'class' => ResourceLoaderImageModule::class,
 					'prefix' => 'oo-ui-icon',
 					'variants' => self::$commonImageVariants,
 					'images' => self::$commonImageData,
 				],
-				'.oo-ui-icon-add {
+				'.oo-ui-icon-abc {
 	...
 }
-.oo-ui-icon-add-invert {
+.oo-ui-icon-abc-invert {
 	...
 }
-.oo-ui-icon-remove {
+.oo-ui-icon-def {
 	...
 }
-.oo-ui-icon-remove-invert {
+.oo-ui-icon-def-invert {
 	...
 }
-.oo-ui-icon-remove-destructive {
+.oo-ui-icon-def-destructive {
 	...
 }
-.oo-ui-icon-next {
+.oo-ui-icon-ghi {
 	...
 }
-.oo-ui-icon-next-invert {
+.oo-ui-icon-ghi-invert {
 	...
 }
-.oo-ui-icon-help {
+.oo-ui-icon-mno {
 	...
 }
-.oo-ui-icon-help-invert {
+.oo-ui-icon-mno-invert {
 	...
 }
-.oo-ui-icon-bold {
+.oo-ui-icon-pqr {
 	...
 }
-.oo-ui-icon-bold-invert {
+.oo-ui-icon-pqr-invert {
 	...
 }',
 			],
 			[
 				[
-					'class' => 'ResourceLoaderImageModule',
+					'class' => ResourceLoaderImageModule::class,
 					'selectorWithoutVariant' => '.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
 					'selectorWithVariant' =>
 						'.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before',
 					'variants' => self::$commonImageVariants,
 					'images' => self::$commonImageData,
 				],
-				'.mw-ui-icon-add:after, .mw-ui-icon-add:before {
+				'.mw-ui-icon-abc:after, .mw-ui-icon-abc:before {
 	...
 }
-.mw-ui-icon-add-invert:after, .mw-ui-icon-add-invert:before {
+.mw-ui-icon-abc-invert:after, .mw-ui-icon-abc-invert:before {
 	...
 }
-.mw-ui-icon-remove:after, .mw-ui-icon-remove:before {
+.mw-ui-icon-def:after, .mw-ui-icon-def:before {
 	...
 }
-.mw-ui-icon-remove-invert:after, .mw-ui-icon-remove-invert:before {
+.mw-ui-icon-def-invert:after, .mw-ui-icon-def-invert:before {
 	...
 }
-.mw-ui-icon-remove-destructive:after, .mw-ui-icon-remove-destructive:before {
+.mw-ui-icon-def-destructive:after, .mw-ui-icon-def-destructive:before {
 	...
 }
-.mw-ui-icon-next:after, .mw-ui-icon-next:before {
+.mw-ui-icon-ghi:after, .mw-ui-icon-ghi:before {
 	...
 }
-.mw-ui-icon-next-invert:after, .mw-ui-icon-next-invert:before {
+.mw-ui-icon-ghi-invert:after, .mw-ui-icon-ghi-invert:before {
 	...
 }
-.mw-ui-icon-help:after, .mw-ui-icon-help:before {
+.mw-ui-icon-mno:after, .mw-ui-icon-mno:before {
 	...
 }
-.mw-ui-icon-help-invert:after, .mw-ui-icon-help-invert:before {
+.mw-ui-icon-mno-invert:after, .mw-ui-icon-mno-invert:before {
 	...
 }
-.mw-ui-icon-bold:after, .mw-ui-icon-bold:before {
+.mw-ui-icon-pqr:after, .mw-ui-icon-pqr:before {
 	...
 }
-.mw-ui-icon-bold-invert:after, .mw-ui-icon-bold-invert:before {
+.mw-ui-icon-pqr-invert:after, .mw-ui-icon-pqr-invert:before {
 	...
 }',
 			],
@@ -205,7 +207,6 @@ class ResourceLoaderImageModuleTest extends ResourceLoaderTestCase {
 <<<TEXT
 background-image: url(rasterized.png);
 	background-image: linear-gradient(transparent, transparent), url(original.svg);
-	background-image: -o-linear-gradient(transparent, transparent), url(rasterized.png);
 TEXT
 			],
 			[
@@ -213,7 +214,6 @@ TEXT
 <<<TEXT
 background-image: url(rasterized.png);
 	background-image: linear-gradient(transparent, transparent), url(data:image/svg+xml);
-	background-image: -o-linear-gradient(transparent, transparent), url(rasterized.png);
 TEXT
 			],
 
@@ -239,7 +239,7 @@ TEXT
 	}
 
 	private function getImageMock( ResourceLoaderContext $context, $dataUriReturnValue ) {
-		$image = $this->getMockBuilder( 'ResourceLoaderImage' )
+		$image = $this->getMockBuilder( ResourceLoaderImage::class )
 			->disableOriginalConstructor()
 			->getMock();
 		$image->method( 'getDataUri' )