Skip to content

Use classes namespaced in MW 1.40 after removal #810

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
merged 2 commits into from
Mar 16, 2025
Merged

Use classes namespaced in MW 1.40 after removal #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4636f74
Use classes namespaced in MW 1.40 after removal
Abijeet Mar 12, 2025
aab6186
Drop MW < 40 builds
JeroenDeDauw Mar 16, 2025
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
26 changes: 6 additions & 20 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,6 @@ jobs:
strategy:
matrix:
include:
- mw: 'REL1_35'
php: 7.4
experimental: false
- mw: 'REL1_36'
php: 7.4
experimental: false
- mw: 'REL1_37'
php: 7.4
experimental: false
- mw: 'REL1_38'
php: 8.0
experimental: false
- mw: 'REL1_39'
php: 8.1
experimental: false
- mw: 'REL1_40'
php: 8.1
Expand Down Expand Up @@ -95,13 +81,13 @@ jobs:

- name: Run PHPUnit
run: php tests/phpunit/phpunit.php -c extensions/Maps
if: matrix.mw != 'REL1_37'
if: matrix.mw != 'REL1_43'

- name: Run PHPUnit with code coverage
run: |
php tests/phpunit/phpunit.php -c extensions/Maps --coverage-clover coverage.xml
bash <(curl -s https://codecov.io/bash)
if: matrix.mw == 'REL1_38'
if: matrix.mw == 'REL1_43'


# Psalm:
Expand Down Expand Up @@ -171,7 +157,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
extensions: mbstring
tools: composer, cs2pr

Expand All @@ -198,7 +184,7 @@ jobs:
- name: Install MediaWiki
if: steps.cache-mediawiki.outputs.cache-hit != 'true'
working-directory: ~
run: bash EarlyCopy/.github/workflows/installMediaWiki.sh REL1_39 Maps
run: bash EarlyCopy/.github/workflows/installMediaWiki.sh REL1_43 Maps

Comment on lines 184 to 188
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

❓ Verification inconclusive

Ensure consistency in MediaWiki installation for PHPStan job.
For the PHPStan job (lines 184–188), the "Install MediaWiki" step now calls

with its working directory again set to ~. Please confirm that using REL1_43 here (and the working-directory setting) is correct and consistent with your intended CI environment.

🏁 Script executed:

bash EarlyCopy/.github/workflows/installMediaWiki.sh REL1_43 Maps

Length of output: 148

PHPStan Job: Fix MediaWiki Installation Script Path and Version

  • The CI step currently calls: 
    bash EarlyCopy/.github/workflows/installMediaWiki.sh REL1_43 Maps
    with its working directory set to ~. However, when executed, it produces the error: 
    bash: EarlyCopy/.github/workflows/installMediaWiki.sh: No such file or directory
  • This suggests that either the script file is not located where expected relative to the home directory, or the working directory setting does not correctly point to the repository root.
  • Please verify whether the file is actually present at the path EarlyCopy/.github/workflows/installMediaWiki.sh (relative to the intended working directory), or adjust the working-directory configuration accordingly.
  • Additionally, confirm that using REL1_43 is indeed the intended version for the MediaWiki installation in your CI environment.

- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -231,7 +217,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
extensions: mbstring, intl, php-ast
tools: composer

Expand All @@ -258,7 +244,7 @@ jobs:
- name: Install MediaWiki
if: steps.cache-mediawiki.outputs.cache-hit != 'true'
working-directory: ~
run: bash EarlyCopy/.github/workflows/installMediaWiki.sh REL1_39 Maps
run: bash EarlyCopy/.github/workflows/installMediaWiki.sh REL1_43 Maps

- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "parserhook",

"requires": {
"MediaWiki": ">= 1.35.0",
"MediaWiki": ">= 1.40.0",
"platform": {
"php": ">= 7.4"
}
Expand Down
2 changes: 1 addition & 1 deletion src/GeoJsonPages/GeoJsonLegacyContent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
use Maps\GeoJsonPages\GeoJsonContent as GeoJsonPagesGeoJsonContent;
use Maps\MapsFactory;
use Maps\Presentation\OutputFacade;
use MediaWiki\Title\Title;
use ParserOptions;
use ParserOutput;
use Title;

/**
* @deprecated This class should be removed when Maps drops support for MediaWiki 1.37.
Expand Down
2 changes: 1 addition & 1 deletion src/GeoJsonPages/GeoJsonMapPageUi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Maps\GeoJsonPages;

use Html;
use MediaWiki\Html\Html;
use Maps\Presentation\OutputFacade;

class GeoJsonMapPageUi {
Expand Down
2 changes: 1 addition & 1 deletion src/GeoJsonPages/Semantic/SemanticGeoJsonStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
namespace Maps\GeoJsonPages\Semantic;

use Maps\GeoJsonPages\GeoJsonStore;
use MediaWiki\Title\Title;
use Onoi\EventDispatcher\EventDispatcher;
use SMW\DIProperty;
use SMW\ParserData;
use SMWDIContainer;
use Title;

class SemanticGeoJsonStore implements GeoJsonStore {

Expand Down
2 changes: 1 addition & 1 deletion src/GoogleMapsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Maps;

use Html;
use MediaWiki\Html\Html;
use Maps\Map\MapData;
use ParamProcessor\ProcessedParam;
use ParamProcessor\ProcessingResult;
Expand Down
2 changes: 1 addition & 1 deletion src/LeafletService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Maps;

use Html;
use MediaWiki\Html\Html;
use Maps\DataAccess\ImageRepository;
use Maps\Map\MapData;
use ParamProcessor\ParameterTypes;
Expand Down
2 changes: 1 addition & 1 deletion src/LegacyMapEditor/MapEditorHtml.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace Maps\LegacyMapEditor;

use ContextSource;
use Html;
use MediaWiki\Html\Html;

/**
* Class to Handle HTML generation for Special:MapEditor
Expand Down
2 changes: 1 addition & 1 deletion src/Map/MapHtmlBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace Maps\Map;

use FormatJson;
use Html;
use MediaWiki\Html\Html;

class MapHtmlBuilder {

Expand Down
4 changes: 2 additions & 2 deletions src/Map/SemanticFormat/MapPrinter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Maps\Map\SemanticFormat;

use Linker;
use MediaWiki\Linker\Linker;
use Maps\FileUrlFinder;
use Maps\LegacyModel\BaseElement;
use Maps\LegacyModel\Location;
Expand All @@ -16,11 +16,11 @@
use Maps\SemanticMW\QueryHandler;
use Maps\WikitextParsers\LocationParser;
use MediaWiki\MediaWikiServices;
use MediaWiki\Title\Title;
use Parser;
use SMW\Query\QueryResult;
use SMW\Query\ResultPrinters\ResultPrinter;
use SMWOutputs;
use Title;

/**
* @licence GNU GPL v2+
Expand Down
2 changes: 1 addition & 1 deletion src/MapsFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
use Maps\WikitextParsers\RectangleParser;
use Maps\WikitextParsers\WmsOverlayParser;
use MediaWiki\MediaWikiServices;
use MediaWiki\Title\Title;
use ParamProcessor\ParamDefinitionFactory;
use Parser;
use RepoGroup;
use SimpleCache\Cache\Cache;
use SimpleCache\Cache\MediaWikiCache;
use SMW\Services\ServicesFactory as ApplicationFactory;
use Title;

/**
* @licence GNU GPL v2+
Expand Down
6 changes: 3 additions & 3 deletions src/SemanticMW/QueryHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

namespace Maps\SemanticMW;

use Html;
use Linker;
use MediaWiki\Html\Html;
use MediaWiki\Linker\Linker;
use MediaWiki\Title\Title;
use Maps\LegacyModel\Location;
use Maps\MapsFunctions;
use MediaWiki\MediaWikiServices;
Expand All @@ -15,7 +16,6 @@
use SMWDataValue;
use SMWDIGeoCoord;
use SMWWikiPageValue;
use Title;

/**
* @licence GNU GPL v2+
Expand Down
2 changes: 1 addition & 1 deletion src/WikitextParsers/LocationParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Maps\FileUrlFinder;
use Maps\LegacyModel\Location;
use Maps\MapsFactory;
use Title;
use MediaWiki\Title\Title;
use ValueParsers\ParseException;
use ValueParsers\StringValueParser;
use ValueParsers\ValueParser;
Expand Down
2 changes: 0 additions & 2 deletions tests/Integration/DataAccess/GeoJsonFetcherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
use Maps\GeoJsonPages\GeoJsonContent;
use Maps\Tests\MapsTestFactory;
use Maps\Tests\Util\PageCreator;
use MediaWiki\MediaWikiServices;
use PHPUnit\Framework\TestCase;
use Title;

/**
* @covers \Maps\DataAccess\GeoJsonFetcher
Expand Down
2 changes: 1 addition & 1 deletion tests/System/SemanticQueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
use Maps\Tests\MapsTestFactory;
use Maps\Tests\Util\PageCreator;
use Maps\Tests\Util\TestFactory;
use MediaWiki\Title\Title;
use PHPUnit\Framework\TestCase;
use Title;

/**
* @licence GNU GPL v2+
Expand Down
4 changes: 2 additions & 2 deletions tests/Util/PageCreator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace Maps\Tests\Util;

use CommentStoreComment;
use Title;
use MediaWiki\CommentStore\CommentStoreComment;
use MediaWiki\Title\Title;
use User;

/**
Expand Down