Fix various phpcs issues

addwiki · Jan 26, 2021 · b00df0d · b00df0d
1 parent cddd7b7
commit b00df0d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,25 +1,18 @@
 <?xml version="1.0"?>
 <ruleset name="MediaWiki">
 	<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="Generic.ControlStructures.DisallowYodaConditions.Found" />
-		<exclude name="Generic.PHP.SAPIUsage.FunctionFound" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.NoParamType" />
-		<exclude name="MediaWiki.Commenting.FunctionAnnotations.UnrecognizedAnnotation" />
 		<exclude name="MediaWiki.Commenting.MissingCovers.MissingCovers" />
 		<exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationPrivate" />
-		<exclude name="MediaWiki.PHP71Features.VoidReturnType.NotAllowed" />
 		<exclude name="MediaWiki.Usage.ForbiddenFunctions.is_resource" />
 		<exclude name="MediaWiki.Usage.ForbiddenFunctions.passthru" />
 		<exclude name="MediaWiki.Usage.InArrayUsage.Found" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
-		<exclude name="PSR12.Properties.ConstantVisibility.NotFound" />
-		<exclude name="Squiz.Scope.MethodScope.Missing" />
 	</rule>
 
 	<rule ref="Generic.Files.LineLength">

diff --git a/src/MediawikiApi.php b/src/MediawikiApi.php
@@ -348,7 +348,7 @@ private function getUserAgent() {
 	}
 
 	/**
-	 * @param $result
+	 * @param array $result
 	 */
 	private function logWarnings( $result ) {
 		if ( is_array( $result ) ) {

diff --git a/src/MediawikiSession.php b/src/MediawikiSession.php
@@ -103,7 +103,7 @@ private function reallyGetToken( $type ) {
 		// If mw<1.25 (no new module)
 		$metaWarning = "Unrecognized value for parameter 'meta': tokens";
 		if ( isset( $result['warnings']['query']['*'] )
-			&& false !== strpos( $result['warnings']['query']['*'], $metaWarning ) ) {
+			&& strpos( $result['warnings']['query']['*'], $metaWarning ) !== false ) {
 			$this->usePre125TokensModule = true;
 			$this->logger->log( LogLevel::DEBUG, 'Falling back to pre 1.25 token system' );
 			$this->tokens[$type] = $this->reallyGetPre125Token( $type );
@@ -141,7 +141,7 @@ private function getNewTokenType( $type ) {
 	/**
 	 * Tries to guess an old token type from a new token type
 	 *
-	 * @param $type
+	 * @param string $type
 	 *
 	 * @return string
 	 */