/**
* Get the contents of a list of CSS files.
*
- * This is considered a private method. Exposed for internal use by WebInstallerOutput.
- *
- * @private
+ * @internal This is considered a private method. Exposed for internal use by WebInstallerOutput.
* @param array $styles Map of media type to file paths to read, remap, and concatenate
* @param bool $flip
- * @param ResourceLoaderContext|null $context
+ * @param ResourceLoaderContext $context
* @return array List of concatenated and remapped CSS data from $styles,
* keyed by media type
* @throws MWException
- * @since 1.27 Calling this method without a ResourceLoaderContext instance
- * is deprecated.
*/
- public function readStyleFiles( array $styles, $flip, $context = null ) {
- if ( $context === null ) {
- wfDeprecated( __METHOD__ . ' without a ResourceLoader context', '1.27' );
- $context = ResourceLoaderContext::newDummyContext();
- }
-
- if ( empty( $styles ) ) {
+ public function readStyleFiles( array $styles, $flip, $context ) {
+ if ( !$styles ) {
return [];
}
foreach ( $styles as $media => $files ) {
<?php
use MediaWiki\MediaWikiServices;
+use Wikimedia\TestingAccessWrapper;
/**
* Sanity checks for making sure registered resources are sane.
/**
* Get all resource files from modules that are an instance of
* ResourceLoaderFileModule (or one of its subclasses).
- *
- * Since the raw data is stored in protected properties, we have to
- * overrride this through ReflectionObject methods.
*/
public static function provideResourceFiles() {
$data = self::getAllModules();
continue;
}
- $reflectedModule = new ReflectionObject( $module );
+ $moduleProxy = TestingAccessWrapper::newFromObject( $module );
$files = [];
foreach ( $filePathProps['lists'] as $propName ) {
- $property = $reflectedModule->getProperty( $propName );
- $property->setAccessible( true );
- $list = $property->getValue( $module );
+ $list = $moduleProxy->$propName;
foreach ( $list as $key => $value ) {
// 'scripts' are numeral arrays.
// 'styles' can be numeral or associative.
}
foreach ( $filePathProps['nested-lists'] as $propName ) {
- $property = $reflectedModule->getProperty( $propName );
- $property->setAccessible( true );
- $lists = $property->getValue( $module );
+ $lists = $moduleProxy->$propName;
foreach ( $lists as $list ) {
foreach ( $list as $key => $value ) {
// We need the same filter as for 'lists',
}
}
- // Get method for resolving the paths to full paths
- $method = $reflectedModule->getMethod( 'getLocalPath' );
- $method->setAccessible( true );
-
// Populate cases
foreach ( $files as $file ) {
$cases[] = [
- $method->invoke( $module, $file ),
+ $moduleProxy->getLocalPath( $file ),
$moduleName,
( $file instanceof ResourceLoaderFilePath ? $file->getPath() : $file ),
];
}
// To populate missingLocalFileRefs. Not sure how sane this is inside this test...
- $module->readStyleFiles(
+ $moduleProxy->readStyleFiles(
$module->getStyleFiles( $data['context'] ),
$module->getFlip( $data['context'] ),
$data['context']
);
- $property = $reflectedModule->getProperty( 'missingLocalFileRefs' );
- $property->setAccessible( true );
- $missingLocalFileRefs = $property->getValue( $module );
+ $missingLocalFileRefs = $moduleProxy->missingLocalFileRefs;
foreach ( $missingLocalFileRefs as $file ) {
$cases[] = [