From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Tue, 3 Dec 2013 13:31:04 +0000 (+0100)
Subject: Break long lines and suppress false posive
X-Git-Tag: 1.31.0-rc.0~17819^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=13095a6a83e4d486e97da09f3362dd3d9ba7f734;p=lhc%2Fweb%2Fwiklou.git

Break long lines and suppress false posive

Change-Id: I14c61d8060cd3a3a2a15193f6721e7f87b783538
---

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 861fa82b2a..829ba6f4d6 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -744,7 +744,11 @@ class ApiMain extends ApiBase {
 				$this->dieUsageMsg( array( 'missingparam', 'token' ) );
 			}
 
-			if ( !$this->getUser()->matchEditToken( $moduleParams['token'], $salt, $this->getContext()->getRequest() ) ) {
+			if ( !$this->getUser()->matchEditToken(
+				$moduleParams['token'],
+				$salt,
+				$this->getContext()->getRequest() )
+			) {
 				$this->dieUsageMsg( 'sessionfailure' );
 			}
 		}
diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index b44565e431..653feab741 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -198,7 +198,10 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase {
 			}
 
 			// Check permissions
-			if ( isset( $show['patrolled'] ) || isset( $show['!patrolled'] ) || isset( $show['unpatrolled'] ) ) {
+			if ( isset( $show['patrolled'] )
+				|| isset( $show['!patrolled'] )
+				|| isset( $show['unpatrolled'] )
+			) {
 				if ( !$user->useRCPatrol() && !$user->useNPPatrol() ) {
 					$this->dieUsage(
 						'You need the patrol right to request the patrolled flag',
diff --git a/includes/content/TextContentHandler.php b/includes/content/TextContentHandler.php
index c4584aed51..94b5c57865 100644
--- a/includes/content/TextContentHandler.php
+++ b/includes/content/TextContentHandler.php
@@ -29,11 +29,13 @@
  * @ingroup Content
  */
 class TextContentHandler extends ContentHandler {
+	// @codingStandardsIgnoreStart bug 57585
 	public function __construct( $modelId = CONTENT_MODEL_TEXT,
 		$formats = array( CONTENT_FORMAT_TEXT )
 	) {
 		parent::__construct( $modelId, $formats );
 	}
+	// @codingStandardsIgnoreEnd
 
 	/**
 	 * Returns the content's text as-is.
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 8611238d8e..47efa705d0 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -70,7 +70,8 @@ class FileRepo {
 	/** @var string Equivalent to $wgArticlePath, e.g. http://en.wikipedia.org/wiki/$1 */
 	protected $articleUrl;
 
-	/** @var bool Whether to fetch commons image description pages and display them on the local wiki */
+	/** @var bool Whether to fetch commons image description pages and display
+	 *    them on the local wiki */
 	public $fetchDescription;
 
 	/** @var bool Equivalent to $wgCapitalLinks (or $wgCapitalLinkOverrides[NS_FILE],