Merge pull request #21 from wmde/php8

Add PHP 8 to CI

Author: itamargiv

.phpcs.xml

@@ -1,14 +1,39 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/wikibase/wikibase-codesniffer/Wikibase">
-		<exclude name="Wikibase.Commenting.ClassLevelDocumentation" />
+
+	<!-- This rule set includes all rules from the MediaWiki rule set, see
+		https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
+		-->
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+
+		<!-- The function comment sniff is way to rigorous about way to many details that need
+			exceptions:
+			* It complains about missing documentation on fully self-explanatory function headers
+			  with strict type hints.
+			* It complains about missing documentation if there is a proper @see tag.
+			* It complains about duplicate spaces in "@param <type>  $<var>", but removing these
+			  doesn't make the code easier to read.
+			* It does not understand "@param <type> [$optional,…]. -->
+		<exclude name="MediaWiki.Commenting.FunctionComment" />
+
+		<exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationPrivate" />
+
+		<!-- Even if we encourage to use spaces in comments, we don't think this sniff should block
+			patches from being merged. -->
+		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment" />
 	</rule>
 
+	<!-- Metrics are intentionally not part of the base Wikibase CodeSniffer rule set. -->
+	<rule ref="Generic.Metrics.CyclomaticComplexity" />
+	<rule ref="Generic.Metrics.NestingLevel" />
+
 	<rule ref="Generic.Files.LineLength">
 		<properties>
 			<property name="lineLimit" value="120" />
 		</properties>
 	</rule>
 
 	<file>.</file>
+	<arg name="extensions" value="php" />
+	<arg name="encoding" value="UTF-8" />
 </ruleset>

.travis.yml

@@ -1,9 +1,12 @@
 language: php
 
+dist: xenial
+
 php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 sudo: false
 

composer.json

@@ -18,7 +18,7 @@
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^8.5.3",
-		"wikibase/wikibase-codesniffer": "^1.2.0"
+		"mediawiki/mediawiki-codesniffer": "34.0.0"
 	},
 	"autoload-dev": {
 		"psr-4": {

src/Component.php

@@ -67,7 +67,9 @@ public function render( array $data ) {
 	 * @return DOMDocument
 	 */
 	private function parseHtml( $html ) {
-		$entityLoaderDisabled = libxml_disable_entity_loader( true );
+		if ( LIBXML_VERSION < 20900 ) {
+			$entityLoaderDisabled = libxml_disable_entity_loader( true );
+		}
 		$internalErrors = libxml_use_internal_errors( true );
 		$document = new DOMDocument( '1.0', 'UTF-8' );
 
@@ -84,7 +86,9 @@ private function parseHtml( $html ) {
 
 		// Restore previous state
 		libxml_use_internal_errors( $internalErrors );
-		libxml_disable_entity_loader( $entityLoaderDisabled );
+		if ( LIBXML_VERSION < 20900 ) {
+			libxml_disable_entity_loader( $entityLoaderDisabled );
+		}
 
 		foreach ( $errors as $error ) {
 			//TODO html5 tags can fail parsing

src/FilterExpressionParsing/FilterParser.php

@@ -20,6 +20,7 @@ class FilterParser {
 	 *
 	 * @return ParseResult
 	 */
+	// phpcs:ignore Generic.Metrics.CyclomaticComplexity
 	public function parse( $exp ) {
 		$inSingle = false;
 		$inDouble = false;