Merge pull request #54 from reedy/php8

Swap to mediawiki/mediawiki-codesniffer and related updates

Author: JeroenDeDauw

.github/workflows/php.yml

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

composer.json

@@ -23,13 +23,13 @@
 		"irc": "irc://irc.freenode.net/wikidata"
 	},
 	"require": {
-		"php": ">=7.2",
+		"php": ">=7.4",
 		"data-values/data-values": "~3.0|~2.0|~1.0|~0.1",
 		"serialization/serialization": "~4.0|~3.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~8.5",
-		"wikibase/wikibase-codesniffer": "^1.2.0"
+		"mediawiki/mediawiki-codesniffer": "45.0.0",
+		"phpunit/phpunit": "~8.5"
 	},
 	"autoload": {
 		"psr-4": {
@@ -47,6 +47,14 @@
 			"composer validate --no-interaction",
 			"phpcs -p -s",
 			"phpunit"
+		],
+		"fix": [
+			"phpcbf"
 		]
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }

phpcs.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/wikibase/wikibase-codesniffer/Wikibase" />
-
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
+	</rule>
 	<file>.</file>
 </ruleset>

tests/Deserializers/DataValueDeserializerTest.php

@@ -29,7 +29,7 @@ public function testGivenEmptyArray_isDeserializerForReturnsFalse() {
 
 	private function newDeserializer() {
 		return new DataValueDeserializer( [
-			'boolean' => function( $bool ) {
+			'boolean' => static function ( $bool ) {
 				return new BooleanValue( $bool );
 			},
 			'number' => NumberValue::class,

tests/Serializers/DataValueSerializerTest.php

@@ -73,7 +73,7 @@ public function testWhenGivenDataValue_SerializeCallsToArray() {
 		$dataValue = $this->createMock( DataValue::class );
 		$dataValue->expects( $this->once() )
 			->method( 'toArray' )
-			->will( $this->returnValue( $returnValue ) );
+			->willReturn( $returnValue );
 
 		$this->assertEquals( $returnValue, $serializer->serialize( $dataValue ) );
 	}