* @file
*/
+use MediaWiki\Shell\Shell;
+
/**
* Class encapsulating an image used in a ResourceLoaderImageModule.
*
'jpg' => 'image/jpg',
];
+ /** @var string */
+ private $name;
+ /** @var string */
+ private $module;
+ /** @var string|array */
+ private $descriptor;
+ /** @var string */
+ private $basePath;
+ /** @var array */
+ private $variants;
+ /** @var string|null */
+ private $defaultColor;
+ /** @var string */
+ private $extension;
+
/**
* @param string $name Image name
* @param string $module Module name
}
// Remove 'deprecated' key
if ( is_array( $this->descriptor ) ) {
- unset( $this->descriptor[ 'deprecated' ] );
+ unset( $this->descriptor['deprecated'] );
}
// Ensure that all files have common extension.
if ( strpos( $wgSVGConverter, 'rsvg' ) === 0 ) {
$command = 'rsvg-convert';
if ( $wgSVGConverterPath ) {
- $command = wfEscapeShellArg( "$wgSVGConverterPath/" ) . $command;
+ $command = Shell::escape( "$wgSVGConverterPath/" ) . $command;
}
$process = proc_open(