Skip to content
Merged
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
23 changes: 7 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,12 @@ jobs:
strategy:
matrix:
include:
- mw: 'REL1_39'
php: 7.4
experimental: false
- mw: 'REL1_40'
php: 8.0
experimental: false
- mw: 'REL1_41'
php: 8.1
experimental: false
- mw: 'REL1_42'
php: 8.2
experimental: false
- mw: 'REL1_43'
php: 8.3
experimental: false
- mw: 'REL1_44'
php: 8.3
experimental: false
- mw: 'master'
php: 8.4
experimental: true
Expand Down Expand Up @@ -70,7 +61,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: EarlyCopy

- name: Install MediaWiki
if: steps.cache-mediawiki.outputs.cache-hit != 'true'
working-directory: ~
Expand Down Expand Up @@ -128,12 +119,12 @@ jobs:
- uses: actions/checkout@v4
with:
path: EarlyCopy

- name: Install MediaWiki
if: steps.cache-mediawiki.outputs.cache-hit != 'true'
working-directory: ~
run: bash EarlyCopy/.github/workflows/installMediaWiki.sh ${{ matrix.mw }} Network

- uses: actions/checkout@v4
with:
path: mediawiki/extensions/Network
Expand Down Expand Up @@ -205,4 +196,4 @@ jobs:
- name: Composer install
run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader

- run: vendor/bin/phpcs -p -s
- run: vendor/bin/phpcs -p -s
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ It was created by [Professional Wiki] and funded by

## Platform requirements

- PHP 7.4 or later (tested up to PHP 8.4)
- MediaWiki 1.39.x or later (tested up to 1.43.x)
- PHP 8.1 or later (tested up to PHP 8.4)
- MediaWiki 1.43.x or later (tested up to 1.44.x)

See the [release notes](#release-notes) for more information on the different versions of Network.

Expand Down Expand Up @@ -365,6 +365,13 @@ The JavaScript tests can only be run by going to the [`Special:JavaScriptTest` p

## Release notes

### Version 4.0.0

Released on July 22nd, 2025.

- Raised minimum PHP version from 7.4 to 8.1
- Raised minimum MediaWiki version from 1.39 to 1.43

### Version 3.0.0

Released on July 7th, 2025.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"source": "https://github.com/ProfessionalWiki/Network"
},
"require": {
"php": ">=7.4",
"php": ">=8.1",
"composer/installers": "^2|^1.0.1"
},
"require-dev": {
Expand Down
4 changes: 2 additions & 2 deletions extension.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Network",

"version": "3.0.0",
"version": "4.0.0",

"author": [
"[https://www.entropywins.wtf/mediawiki Jeroen De Dauw]",
Expand All @@ -17,7 +17,7 @@
"type": "parserhook",

"requires": {
"MediaWiki": ">= 1.39.0"
"MediaWiki": ">= 1.43.0"
},

"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/EntryPoints/NetworkFunction.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
use MediaWiki\Extension\Network\NetworkFunction\NetworkPresenter;
use MediaWiki\Extension\Network\NetworkFunction\NetworkUseCase;
use MediaWiki\Extension\Network\NetworkFunction\RequestModel;
use MediaWiki\Title\Title;
use Parser;
use Title;

class NetworkFunction {

Expand Down
4 changes: 2 additions & 2 deletions src/EntryPoints/SpecialNetwork.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

namespace MediaWiki\Extension\Network\EntryPoints;

use Html;
use IncludableSpecialPage;
use MediaWiki\Extension\Network\Extension;
use MediaWiki\Extension\Network\NetworkFunction\NetworkConfig;
use MediaWiki\Extension\Network\NetworkFunction\NetworkPresenter;
use MediaWiki\Extension\Network\NetworkFunction\NetworkUseCase;
use MediaWiki\Extension\Network\NetworkFunction\RequestModel;
use MediaWiki\Html\Html;
use MediaWiki\MediaWikiServices;
use MediaWiki\Title\Title;
use Message;
use Title;
use WebRequest;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/NetworkFunction/AbstractNetworkPresenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace MediaWiki\Extension\Network\NetworkFunction;

use Html;
use MediaWiki\Html\Html;

abstract class AbstractNetworkPresenter implements NetworkPresenter {

Expand Down
8 changes: 7 additions & 1 deletion tests/php/NetworkFunctionIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
namespace MediaWiki\Extension\Network\Tests;

use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\ParserOptions;
use MediaWiki\Title\Title;
use MediaWiki\User\User;
use PHPUnit\Framework\TestCase;

/**
Expand All @@ -15,8 +18,11 @@ class NetworkFunctionIntegrationTest extends TestCase {
private const PAGE_TITLE = 'ContextPageTitle';

private function parse( string $textToParse ): string {
$parserOptions = new ParserOptions( User::newSystemUser( 'TestUser' ) );
return MediaWikiServices::getInstance()->getParser()
->parse( $textToParse, \Title::newFromText( self::PAGE_TITLE ), new \ParserOptions( \User::newSystemUser( 'TestUser' ) ) )->getText();
->parse( $textToParse, Title::newFromText( self::PAGE_TITLE ), $parserOptions )
->runOutputPipeline( $parserOptions )
->getContentHolderText();
}

public function testWhenThereAreNoParameters_contextPageIsUsed() {
Expand Down