X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fphpunit%2FResourceLoaderTestCase.php;h=18a49f60bd0593f2ad3f4840563fd89219a39ebd;hb=fc49836960d7d263b2f7da36f74fb3173c20e8aa;hp=1863929cd245dd139dde64e40e1365fc3aa6aafe;hpb=04fdc78370dbc042116488d6826e19bf3910273b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/ResourceLoaderTestCase.php b/tests/phpunit/ResourceLoaderTestCase.php
index 1863929cd2..18a49f60bd 100644
--- a/tests/phpunit/ResourceLoaderTestCase.php
+++ b/tests/phpunit/ResourceLoaderTestCase.php
@@ -1,5 +1,8 @@
 <?php
 
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+
 abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
 	/**
 	 * @param string $lang
@@ -8,16 +11,16 @@ abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
 	 */
 	protected function getResourceLoaderContext( $lang = 'en', $dir = 'ltr' ) {
 		$resourceLoader = new ResourceLoader();
-		$request = new FauxRequest( array(
+		$request = new FauxRequest( [
 				'lang' => $lang,
 				'modules' => 'startup',
 				'only' => 'scripts',
 				'skin' => 'vector',
 				'target' => 'phpunit',
-		) );
+		] );
 		$ctx = $this->getMockBuilder( 'ResourceLoaderContext' )
-			->setConstructorArgs( array( $resourceLoader, $request ) )
-			->setMethods( array( 'getDirection' ) )
+			->setConstructorArgs( [ $resourceLoader, $request ] )
+			->setMethods( [ 'getDirection' ] )
 			->getMock();
 		$ctx->expects( $this->any() )->method( 'getDirection' )->will(
 			$this->returnValue( $dir )
@@ -26,7 +29,7 @@ abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
 	}
 
 	public static function getSettings() {
-		return array(
+		return [
 			// For ResourceLoader::inDebugMode since it doesn't have context
 			'ResourceLoaderDebug' => true,
 
@@ -34,14 +37,14 @@ abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
 			'CacheEpoch' => '20140101000000',
 
 			// For ResourceLoader::__construct()
-			'ResourceLoaderSources' => array(),
+			'ResourceLoaderSources' => [],
 
 			// For wfScript()
 			'ScriptPath' => '/w',
 			'ScriptExtension' => '.php',
 			'Script' => '/w/index.php',
 			'LoadScript' => '/w/load.php',
-		);
+		];
 	}
 
 	protected function setUp() {
@@ -49,7 +52,7 @@ abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
 
 		ResourceLoader::clearCache();
 
-		$globals = array();
+		$globals = [];
 		foreach ( self::getSettings() as $key => $value ) {
 			$globals['wg' . $key] = $value;
 		}
@@ -60,17 +63,20 @@ abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
 /* Stubs */
 
 class ResourceLoaderTestModule extends ResourceLoaderModule {
-	protected $messages = array();
-	protected $dependencies = array();
+	protected $messages = [];
+	protected $dependencies = [];
 	protected $group = null;
 	protected $source = 'local';
+	protected $position = 'bottom';
 	protected $script = '';
 	protected $styles = '';
 	protected $skipFunction = null;
 	protected $isRaw = false;
-	protected $targets = array( 'phpunit' );
+	protected $isKnownEmpty = false;
+	protected $type = ResourceLoaderModule::LOAD_GENERAL;
+	protected $targets = [ 'phpunit' ];
 
-	public function __construct( $options = array() ) {
+	public function __construct( $options = [] ) {
 		foreach ( $options as $key => $value ) {
 			$this->$key = $value;
 		}
@@ -81,7 +87,7 @@ class ResourceLoaderTestModule extends ResourceLoaderModule {
 	}
 
 	public function getStyles( ResourceLoaderContext $context ) {
-		return array( '' => $this->styles );
+		return [ '' => $this->styles ];
 	}
 
 	public function getMessages() {
@@ -99,6 +105,13 @@ class ResourceLoaderTestModule extends ResourceLoaderModule {
 	public function getSource() {
 		return $this->source;
 	}
+	public function getPosition() {
+		return $this->position;
+	}
+
+	public function getType() {
+		return $this->type;
+	}
 
 	public function getSkipFunction() {
 		return $this->skipFunction;
@@ -107,6 +120,9 @@ class ResourceLoaderTestModule extends ResourceLoaderModule {
 	public function isRaw() {
 		return $this->isRaw;
 	}
+	public function isKnownEmpty( ResourceLoaderContext $context ) {
+		return $this->isKnownEmpty;
+	}
 
 	public function enableModuleContentVersion() {
 		return true;
@@ -115,3 +131,13 @@ class ResourceLoaderTestModule extends ResourceLoaderModule {
 
 class ResourceLoaderFileModuleTestModule extends ResourceLoaderFileModule {
 }
+
+class EmptyResourceLoader extends ResourceLoader {
+	// TODO: This won't be needed once ResourceLoader is empty by default
+	// and default registrations are done from ServiceWiring instead.
+	public function __construct( Config $config = null, LoggerInterface $logger = null ) {
+		$this->setLogger( $logger ?: new NullLogger() );
+		$this->config = $config ?: ConfigFactory::getDefaultInstance()->makeConfig( 'main' );
+		$this->setMessageBlobStore( new MessageBlobStore( $this, $this->getLogger() ) );
+	}
+}