X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderImageModule.php;h=9b50d80f6990f1e4cb0d3128ca49fccb091a5b0c;hb=6aed4cefdc4ac02672fc5c0ebe64c089354d5050;hp=b711cbd17f8ff0fc4aeb3f79eccdad8ededc2d3f;hpb=56d45558b102349f3480a46819669407aa3be2d6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index b711cbd17f..9b50d80f69 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -28,6 +28,7 @@
  */
 class ResourceLoaderImageModule extends ResourceLoaderModule {
 
+	/** @var array|null */
 	protected $definition = null;
 
 	/**
@@ -38,10 +39,18 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 
 	protected $origin = self::ORIGIN_CORE_SITEWIDE;
 
+	/** @var ResourceLoaderImage[]|null */
+	protected $imageObjects = null;
+	/** @var array */
 	protected $images = [];
+	/** @var string|null */
 	protected $defaultColor = null;
 	protected $useDataURI = true;
+	/** @var array|null */
+	protected $globalVariants = null;
+	/** @var array */
 	protected $variants = [];
+	/** @var string|null */
 	protected $prefix = null;
 	protected $selectorWithoutVariant = '.{prefix}-{name}';
 	protected $selectorWithVariant = '.{prefix}-{name}-{variant}';
@@ -175,9 +184,9 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 						$option = [ 'default' => $option ];
 					}
 					foreach ( $option as $skin => $data ) {
-						if ( !is_array( $option ) ) {
+						if ( !is_array( $data ) ) {
 							throw new InvalidArgumentException(
-								"Invalid list error. '$option' given, array expected."
+								"Invalid list error. '$data' given, array expected."
 							);
 						}
 					}
@@ -211,7 +220,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 
 	/**
 	 * Get CSS selector templates used by this module.
-	 * @return string
+	 * @return string[]
 	 */
 	public function getSelectors() {
 		$this->loadFromDefinition();
@@ -240,7 +249,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 	 */
 	public function getImages( ResourceLoaderContext $context ) {
 		$skin = $context->getSkin();
-		if ( !isset( $this->imageObjects ) ) {
+		if ( $this->imageObjects === null ) {
 			$this->loadFromDefinition();
 			$this->imageObjects = [];
 		}
@@ -288,7 +297,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 	 */
 	public function getGlobalVariants( ResourceLoaderContext $context ) {
 		$skin = $context->getSkin();
-		if ( !isset( $this->globalVariants ) ) {
+		if ( $this->globalVariants === null ) {
 			$this->loadFromDefinition();
 			$this->globalVariants = [];
 		}
@@ -419,7 +428,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 			'selectorWithVariant',
 		] as $member ) {
 			$options[$member] = $this->{$member};
-		};
+		}
 
 		$summary[] = [
 			'options' => $options,