Upgrade mediawiki-codesniffer to latest version (45.0.0)

.github/workflows/php.yml

@@ -13,8 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.2'
-          - '7.3'
           - '7.4'
 
     steps:

composer.json

@@ -23,14 +23,14 @@
 		"irc": "irc://irc.freenode.net/wikidata"
 	},
 	"require": {
-		"php": ">=7.2.0",
+		"php": ">=7.4",
 		"data-values/data-values": "~3.0|~2.0|~1.0|~0.1",
 		"data-values/interfaces": "~1.0|~0.2.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~8.0",
 		"ockcyp/covers-validator": "^1.3.3",
-		"mediawiki/mediawiki-codesniffer": "^34"
+		"mediawiki/mediawiki-codesniffer": "^45"
 	},
 	"extra": {
 		"branch-alias": {
@@ -67,5 +67,10 @@
 			"@cs",
 			"@test"
 		]
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }

phpcs.xml

@@ -7,4 +7,5 @@
 		<exclude name="Generic.Files.LineLength.TooLong" />
 		<exclude name="Generic.Files.LineLength.MaxExceeded" />
 	</rule>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
 </ruleset>

src/DataValues/MonolingualTextValue.php

@@ -65,7 +65,7 @@ public function unserialize( $value ) {
 	}
 
 	public function __unserialize( array $data ): void {
-		list( $languageCode, $text ) = $data;
+		[ $languageCode, $text ] = $data;
 		$this->__construct( $languageCode, $text );
 	}
 

src/ValueFormatters/Exceptions/MismatchingDataValueTypeException.php

@@ -36,7 +36,7 @@ public function __construct(
 		$expectedValueType,
 		$dataValueType,
 		$message = '',
-		Exception $previous = null
+		?Exception $previous = null
 	) {
 		$this->expectedValueType = $expectedValueType;
 		$this->dataValueType = $dataValueType;

src/ValueParsers/BoolParser.php

@@ -18,6 +18,10 @@ class BoolParser extends StringValueParser {
 
 	private const FORMAT_NAME = 'bool';
 
+	/**
+	 * @var Mapping from possible string values to their
+	 *      boolean equivalents
+	 */
 	private static $values = [
 		'yes' => true,
 		'on' => true,

src/ValueParsers/StringParser.php

@@ -26,7 +26,7 @@ class StringParser implements ValueParser {
 	/**
 	 * @param StringNormalizer|null $normalizer
 	 */
-	public function __construct( StringNormalizer $normalizer = null ) {
+	public function __construct( ?StringNormalizer $normalizer = null ) {
 		$this->normalizer = $normalizer ?: new NullStringNormalizer();
 	}
 

src/ValueParsers/StringValueParser.php

@@ -28,7 +28,7 @@ abstract class StringValueParser implements ValueParser {
 	/**
 	 * @param ParserOptions|null $options
 	 */
-	public function __construct( ParserOptions $options = null ) {
+	public function __construct( ?ParserOptions $options = null ) {
 		$this->options = $options ?: new ParserOptions();
 
 		$this->defaultOption( ValueParser::OPT_LANG, 'en' );

tests/ValueParsers/DispatchingValueParserTest.php

@@ -22,17 +22,17 @@
  */
 class DispatchingValueParserTest extends TestCase {
 
-	private function getParser( $invocation ) : ValueParser {
+	private function getParser( $invocation ): ValueParser {
 		$mock = $this->createMock( ValueParser::class );
 
 		$mock->expects( $invocation )
 			->method( 'parse' )
-			->will( $this->returnCallback( function( $value ) {
+			->willReturnCallback( static function ( $value ) {
 				if ( $value === 'invalid' ) {
 					throw new ParseException( 'failed' );
 				}
 				return $value;
-			} ) );
+			} );
 
 		return $mock;
 	}

tests/ValueParsers/NullParserTest.php

@@ -55,7 +55,7 @@ public function invalidInputProvider() {
 	 *
 	 * @dataProvider invalidInputProvider
 	 */
-	public function testParseWithInvalidInputs( $value, ValueParser $parser = null ) {
+	public function testParseWithInvalidInputs( $value, ?ValueParser $parser = null ) {
 		$this->markTestSkipped( 'NullParser has no invalid inputs' );
 	}
 

tests/ValueParsers/StringParserTest.php

@@ -26,9 +26,9 @@ public function provideParse() {
 		$normalizer = $this->createMock( StringNormalizer::class );
 		$normalizer->expects( $this->once() )
 			->method( 'normalize' )
-			->will( $this->returnCallback( function( $value ) {
+			->willReturnCallback( static function ( $value ) {
 				return strtolower( trim( $value ) );
-			} ) );
+			} );
 
 		return [
 			'simple' => [ 'hello world', null, new StringValue( 'hello world' ) ],

tests/ValueParsers/ValueParserTestBase.php

@@ -44,7 +44,7 @@ abstract protected function getInstance();
 	 * @param mixed $expected
 	 * @param ValueParser|null $parser
 	 */
-	public function testParseWithValidInputs( $value, $expected, ValueParser $parser = null ) {
+	public function testParseWithValidInputs( $value, $expected, ?ValueParser $parser = null ) {
 		if ( $parser === null ) {
 			$parser = $this->getInstance();
 		}
@@ -77,7 +77,7 @@ private function assertSmartEquals( $expected, $actual ) {
 	 * @param mixed $value
 	 * @param ValueParser|null $parser
 	 */
-	public function testParseWithInvalidInputs( $value, ValueParser $parser = null ) {
+	public function testParseWithInvalidInputs( $value, ?ValueParser $parser = null ) {
 		if ( $parser === null ) {
 			$parser = $this->getInstance();
 		}