Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 3 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,12 @@ jobs:
fail-fast: false
matrix:
include:
- mw: 'REL1_39'
php: 8.1
experimental: false
- mw: 'REL1_40'
php: 8.1
experimental: false
- mw: 'REL1_41'
php: 8.2
experimental: false
- mw: 'REL1_42'
php: 8.2
experimental: false
- mw: 'REL1_43'
php: 8.3
experimental: false
- mw: 'REL1_44'
php: 8.4
experimental: false
- mw: 'master'
php: 8.4
experimental: true
Expand Down
17 changes: 13 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,20 @@ Parameters: none

## Installation

Platform requirements:
Platform requirements of 4.x:

* [PHP] 8.0 or later (tested up to 8.3)
* [MediaWiki] 1.39 or later (tested up to 1.43 and master)
* [PHP] 8.0 or later (tested up to 8.4)
* [MediaWiki] 1.43 or later (tested up to 1.44 and master)

For older PHP or MediaWiki, use older versions of External Content.

The recommended way to install External Content is using [Composer] with
[MediaWiki's built-in support for Composer][Composer install].

On the commandline, go to your wikis root directory. Then run these two commands:

```shell script
COMPOSER=composer.local.json composer require --no-update professional-wiki/external-content:~3.0
COMPOSER=composer.local.json composer require --no-update professional-wiki/external-content:~4.0
```
```shell script
composer update professional-wiki/external-content --no-dev -o
Expand Down Expand Up @@ -244,6 +246,13 @@ Alternatively, you can execute commands from the MediaWiki root directory:

## Release notes

### Version 4.0.0 - 2025-07-04

* Raised minimum MediaWiki version from 1.39 to 1.43
* Added support for MediaWiki 1.44
* Fixed compatibility issue with the Network extension
* Translation updates

### Version 3.0.1 - 2025-04-06

* Fixed compatibility with MediaWiki 1.43 and above (IDatabase TypeError)
Expand Down
4 changes: 2 additions & 2 deletions extension.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "External Content",
"version": "3.0.1",
"version": "4.0.0",
"license-name": "GPL-2.0-or-later",

"author": [
Expand All @@ -13,7 +13,7 @@
"descriptionmsg": "external-content-desc",

"requires": {
"MediaWiki": ">= 1.39.0",
"MediaWiki": ">= 1.43.0",
"platform": {
"php": ">= 8.0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/Adapters/EmbedPresenter/CategoryUsageTracker.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace ProfessionalWiki\ExternalContent\Adapters\EmbedPresenter;

use Parser;
use MediaWiki\Parser\Parser;

class CategoryUsageTracker implements UsageTracker {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace ProfessionalWiki\ExternalContent\Adapters\EmbedPresenter;

use Html;
use MediaWiki\Html\Html;
use MessageLocalizer;
use ProfessionalWiki\ExternalContent\UseCases\Embed\EmbedPresenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace ProfessionalWiki\ExternalContent\Adapters\EmbedResourceLoader;

use ParserOutput;
use MediaWiki\Parser\ParserOutput;
use ProfessionalWiki\ExternalContent\Domain\ContentRenderer;
use ProfessionalWiki\ExternalContent\Domain\ContentRenderer\CodeRenderer;
use ProfessionalWiki\ExternalContent\UseCases\Embed\EmbedResourceLoader;
Expand Down
4 changes: 2 additions & 2 deletions src/Domain/ContentRenderer/CodeRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace ProfessionalWiki\ExternalContent\Domain\ContentRenderer;

use Html;
use MediaWiki\Html\Html;
use ProfessionalWiki\ExternalContent\Domain\ContentRenderer;

class CodeRenderer implements ContentRenderer {
Expand Down Expand Up @@ -77,7 +77,7 @@ private function normalizeLines( string $lines ): string {
$ranges = array_filter( $exploded, static function( $value ): bool {
return ( preg_match( '/^\d+$/', $value ) || preg_match( '/^(\d+)-(\d+)$/', $value ) );
} );

return implode( ',', $ranges );
}
}
2 changes: 1 addition & 1 deletion src/EntryPoints/BitbucketFunction.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace ProfessionalWiki\ExternalContent\EntryPoints;

use Parser;
use MediaWiki\Parser\Parser;
use ProfessionalWiki\ExternalContent\Adapters\EmbedPresenter\CategoryUsageTracker;
use ProfessionalWiki\ExternalContent\Adapters\EmbedPresenter\ParserFunctionEmbedPresenter;
use ProfessionalWiki\ExternalContent\Adapters\EmbedResourceLoader\ParserFunctionEmbedResourceLoader;
Expand Down
2 changes: 1 addition & 1 deletion src/EntryPoints/EmbedFunction.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace ProfessionalWiki\ExternalContent\EntryPoints;

use Parser;
use MediaWiki\Parser\Parser;
use ProfessionalWiki\ExternalContent\Adapters\EmbedPresenter\CategoryUsageTracker;
use ProfessionalWiki\ExternalContent\Adapters\EmbedPresenter\ParserFunctionEmbedPresenter;
use ProfessionalWiki\ExternalContent\Adapters\EmbedResourceLoader\ParserFunctionEmbedResourceLoader;
Expand Down
6 changes: 3 additions & 3 deletions src/EntryPoints/MediaWikiHooks.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

namespace ProfessionalWiki\ExternalContent\EntryPoints;

use ContentHandler;
use MediaWiki\Content\ContentHandler;
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionRecord;
use Parser;
use ParserOutput;
use MediaWiki\Parser\Parser;
use MediaWiki\Parser\ParserOutput;
use ProfessionalWiki\ExternalContent\EmbedExtensionFactory;
use SearchEngine;
use WikiPage;
Expand Down
3 changes: 2 additions & 1 deletion tests/Integration/EmbedFunctionIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use FileFetcher\InMemoryFileFetcher;
use FileFetcher\StubFileFetcher;
use MediaWiki\MediaWikiServices;
use MediaWiki\Title\Title;
use ProfessionalWiki\ExternalContent\Tests\TestEnvironment;

/**
Expand Down Expand Up @@ -54,7 +55,7 @@ public function testUsageIsTracked(): void {

$parser->parse(
'{{#embed:https://example.com/KITTENS.md}}',
\Title::newFromText( 'EmbedFunctionIntegrationTest' ),
Title::newFromText( 'EmbedFunctionIntegrationTest' ),
new \ParserOptions( \User::newSystemUser( 'TestUser' ) )
)->getText();

Expand Down
4 changes: 2 additions & 2 deletions tests/Integration/EmbedFunctionSystemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

use CommentStoreComment;
use FileFetcher\StubFileFetcher;
use Title;
use User;
use MediaWiki\Title\Title;
use MediaWiki\User\User;
use WikiPage;

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/TestEnvironment.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace ProfessionalWiki\ExternalContent\Tests;

use MediaWiki\MediaWikiServices;
use Title;
use MediaWiki\Title\Title;

class TestEnvironment {

Expand Down
Loading