Update to REL1_43

ERM38444

[master]

Author: HamishSlater

.gitignore

@@ -1,14 +1,4 @@
-*~
-*.kate-swp
-*.swp
-/data/
-/config/
-node_modules/**
-vendor/**
-
-composer.lock
-composer.phar
-
+/composer.lock
+/vendor
+/node_modules
 .eslintcache
-
-.phpunit.result.cache

.phpcs.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-	</rule>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
-	<arg name="extensions" value="php,php5,inc"/>
+	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="UTF-8"/>
-</ruleset>
+</ruleset>

.phpunit.xml

@@ -2,3 +2,19 @@
 # WikiText for MediaWiki
 
 Provides an infrastructure to tokenize content into nodes
+
+## Compatibility
+- `2.0.x` -> MediaWiki 1.43
+- `1.0.x` -> MediaWiki 1.39
+
+## Use in a MediaWiki extension
+
+Require this component in the `composer.json` of your extension:
+
+```json
+{
+	"require": {
+		"mwstake/mediawiki-lib-nodes": "~2"
+	}
+}
+```

README.md

@@ -10,11 +10,11 @@
 		}
 	],
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "39.0.0",
-		"mediawiki/minus-x": "1.1.1",
+		"mediawiki/mediawiki-codesniffer": "45.0.0",
+		"mediawiki/mediawiki-phan-config": "0.14.0",
+		"mediawiki/minus-x": "1.1.3",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
-		"php-parallel-lint/php-parallel-lint": "1.3.2",
-		"phpunit/phpunit": "^8.5"
+		"php-parallel-lint/php-parallel-lint": "1.4.0"
 	},
 	"autoload": {
 		"psr-4": {
@@ -24,12 +24,19 @@
 	"scripts": {
 		"test": [
 			"parallel-lint . --exclude vendor --exclude node_modules",
-			"minus-x check .",
-			"phpcs -sp"
+			"@phpcs",
+			"minus-x check ."
 		],
 		"fix": [
 			"minus-x fix .",
 			"phpcbf"
-		]
+		],
+		"phan": "phan -d . --long-progress-bar",
+		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }

composer.json

@@ -3,7 +3,7 @@
 namespace MWStake\MediaWiki\Lib\Nodes;
 
 use MediaWiki\Revision\RevisionRecord;
-use User;
+use MediaWiki\User\User;
 
 interface IMutator extends IParser {
 	/**

src/IMutator.php

@@ -2,7 +2,9 @@
 
 namespace MWStake\MediaWiki\Lib\Nodes;
 
-interface INode extends \JsonSerializable {
+use JsonSerializable;
+
+interface INode extends JsonSerializable {
 	/**
 	 * @return string
 	 */

src/INode.php

@@ -2,13 +2,15 @@
 
 namespace MWStake\MediaWiki\Lib\Nodes;
 
-use Content;
+use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\PageUpdater;
-use User;
+use MediaWiki\User\User;
 
 abstract class MutableParser implements IMutator {
 	/** @var RevisionRecord */
@@ -70,11 +72,11 @@ public function saveRevision(
 			->newFromTitle( $title );
 
 		if ( !$user ) {
-			$user = \User::newSystemUser( 'Mediawiki default' );
+			$user = User::newSystemUser( 'Mediawiki default' );
 		}
 		$updater = $wikipage->newPageUpdater( $user );
 		$this->setUpdaterSlotsOnSave( $updater );
-		$rev = $updater->saveRevision( \CommentStoreComment::newUnsavedComment( $comment ), $flags );
+		$rev = $updater->saveRevision( CommentStoreComment::newUnsavedComment( $comment ), $flags );
 		if ( !$rev && $this->isNullEdit( $updater->getStatus() ) ) {
 			// Do not fail on null edits
 			$rev = $this->revision;
@@ -100,7 +102,7 @@ protected function setUpdaterSlotsOnSave( PageUpdater $updater ) {
 	 * @return Content
 	 */
 	public function getContent(): Content {
-		return  $this->revision->getContent( SlotRecord::MAIN );
+		return $this->revision->getContent( SlotRecord::MAIN );
 	}
 
 	/**
@@ -121,9 +123,9 @@ abstract public function replaceNode( IMutableNode $node ): bool;
 	abstract public function removeNode( INode $node ): bool;
 
 	/**
-	 * @return \Content
+	 * @return Content
 	 */
-	abstract protected function getContentObject(): \Content;
+	abstract protected function getContentObject(): Content;
 
 	protected function isMutated(): bool {
 		return $this->mutated;
@@ -145,10 +147,10 @@ protected function setRevisionContent() {
 	}
 
 	/**
-	 * @param \Status $saveStatus
+	 * @param Status $saveStatus
 	 * @return bool
 	 */
-	protected function isNullEdit( \Status $saveStatus ): bool {
+	protected function isNullEdit( Status $saveStatus ): bool {
 		$errors = $saveStatus->getErrors();
 		return count( $errors ) === 1 && $errors[0]['message'] === 'edit-no-change';
 	}