Skip to content

Make the extension compatible with MW 1.43 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FO-nTTaX merged 1 commit into from
Jun 17, 2025
Merged

Make the extension compatible with MW 1.43 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ResourceLoaderArticles",
"version": "2.4.0",
"version": "2.5.0",
"author": [
"[https://fo-nttax.de Alex Winkler]"
],
Expand All @@ -27,7 +27,11 @@
},
"HookHandlers": {
"Main": {
"class": "\\Liquipedia\\Extension\\ResourceLoaderArticles\\Hooks\\MainHookHandler"
"class": "\\Liquipedia\\Extension\\ResourceLoaderArticles\\Hooks\\MainHookHandler",
"services": [
"ContentHandlerFactory",
"RevisionLookup"
]
},
"Schema": {
"class": "\\Liquipedia\\Extension\\ResourceLoaderArticles\\Hooks\\SchemaHookHandler"
Expand Down
22 changes: 15 additions & 7 deletions src/Hooks/MainHookHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

namespace Liquipedia\Extension\ResourceLoaderArticles\Hooks;

use ContentHandler;
use Liquipedia\Extension\ResourceLoaderArticles\ResourceLoader\ResourceLoaderArticlesModule;
use MediaWiki\Content\ContentHandlerFactory;
use MediaWiki\Hook\BeforePageDisplayHook;
use MediaWiki\Hook\MakeGlobalVariablesScriptHook;
use MediaWiki\MediaWikiServices;
use MediaWiki\ResourceLoader\Hook\ResourceLoaderRegisterModulesHook;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Revision\Hook\ContentHandlerDefaultModelForHook;
use MediaWiki\Revision\RevisionLookup;
use MediaWiki\Revision\SlotRecord;
use OutputPage;
use ResourceLoader;
use Skin;
use Title;

Expand All @@ -23,6 +22,17 @@ class MainHookHandler implements
ResourceLoaderRegisterModulesHook
{

private ContentHandlerFactory $contentHandlerFactory;
private RevisionLookup $revisionLookup;

public function __construct(
ContentHandlerFactory $contentHandlerFactory,
RevisionLookup $revisionLookup
) {
$this->contentHandlerFactory = $contentHandlerFactory;
$this->revisionLookup = $revisionLookup;
}

/**
* @param OutputPage $out
* @param Skin $skin
Expand Down Expand Up @@ -135,17 +145,15 @@ public function onResourceLoaderRegisterModules( ResourceLoader $rl ): void {
continue;
}

$handler = ContentHandler::getForTitle( $title );
$handler = $this->contentHandlerFactory->getContentHandler( $title->getContentModel() );
if ( $handler->isSupportedFormat( CONTENT_FORMAT_CSS ) ) {
$format = CONTENT_FORMAT_CSS;
} elseif ( $handler->isSupportedFormat( CONTENT_FORMAT_JAVASCRIPT ) ) {
$format = CONTENT_FORMAT_JAVASCRIPT;
} else {
continue;
}
$revision = MediaWikiServices::getInstance()
->getRevisionLookup()
->getRevisionByTitle( $title, 0, RevisionLookup::READ_NORMAL );
$revision = $this->revisionLookup->getRevisionByTitle( $title, 0, RevisionLookup::READ_NORMAL );

if ( !$revision ) {
continue;
Expand Down
16 changes: 8 additions & 8 deletions src/ResourceLoader/ResourceLoaderArticlesModule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
use Less_Parser;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\ResourceLoader\Context;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\ResourceLoader\WikiModule;
use MemoizedCallable;
use Peast\Peast;
use Peast\Syntax\Exception as PeastSyntaxException;
use ResourceLoader;
use ResourceLoaderContext;
use ResourceLoaderWikiModule;
use ScssPhp\ScssPhp\Compiler as SCSSCompiler;

class ResourceLoaderArticlesModule extends ResourceLoaderWikiModule {
class ResourceLoaderArticlesModule extends WikiModule {

private const USERJSPARSE_CACHE_VERSION = 3;

/**
* Get list of pages used by this module
*
* @param ResourceLoaderContext $context
* @param Context $context
* @return array List of pages
*/
protected function getPages( ResourceLoaderContext $context ) {
protected function getPages( Context $context ) {
$request = $context->getRequest();
$articles = $request->getVal( 'articles' );
$articles = explode( '|', $articles ?? '' );
Expand Down Expand Up @@ -100,10 +100,10 @@ static function () use ( $contents, $fileName ) {
}

/**
* @param ResourceLoaderContext $context
* @param Context $context
* @return array
*/
public function getStyles( ResourceLoaderContext $context ) {
public function getStyles( Context $context ) {
$less = '';
$scss = '';
foreach ( $this->getPages( $context ) as $titleText => $options ) {
Expand Down