dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 8c47b37)
Merge "[BREAKING CHANGE] Remove mw.widgets.CategorySelector"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 9 Apr 2018 16:11:58 +0000 (16:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 9 Apr 2018 16:11:58 +0000 (16:11 +0000)
autoload.php patch | blob | history
includes/PHPVersionCheck.php patch | blob | history
includes/utils/AutoloadGenerator.php patch | blob | history
mw-config/index.php patch | blob | history

diff --git a/autoload.php b/autoload.php
index b4596c4..4076620 100644 (file)
--- a/autoload.php
+++ b/autoload.php
@@ -1,6 +1,6 @@
 <?php
 // This file is generated by maintenance/generateLocalAutoload.php, do not adjust manually
-// phpcs:ignoreFile Generic.Files.LineLength
+// phpcs:disable Generic.Files.LineLength
 global $wgAutoloadLocalClasses;
 
 $wgAutoloadLocalClasses = [
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index a48d460..46452d9 100644 (file)
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -1,5 +1,4 @@
 <?php
-// phpcs:ignoreFile Generic.Arrays.DisallowLongArraySyntax,MediaWiki.Usage.DirUsage.FunctionFound
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +18,7 @@
  * @file
  */
 
+// phpcs:disable Generic.Arrays.DisallowLongArraySyntax,PSR2.Classes.PropertyDeclaration,MediaWiki.Usage.DirUsage
 /**
  * Check PHP Version, as well as for composer dependencies in entry points,
  * and display something vaguely comprehensible in the event of a totally
@@ -54,7 +54,6 @@ class PHPVersionCheck {
         *   - api.php
         *   - mw-config/index.php
         *   - cli
-        * @return $this
         */
        function setEntryPoint( $entryPoint ) {
                $this->entryPoint = $entryPoint;
@@ -102,8 +101,6 @@ class PHPVersionCheck {
 
        /**
         * Displays an error, if the installed php version does not meet the minimum requirement.
-        *
-        * @return $this
         */
        function checkRequiredPHPVersion() {
                $phpInfo = $this->getPHPInfo();
@@ -124,7 +121,7 @@ class PHPVersionCheck {
                                . "{$otherInfo['minSupported']}.\n\nCheck if you have a"
                                . " newer php executable with a different name, such as php5.\n\n";
 
-                       // phpcs:ignore Generic.Files.LineLength
+                       // phpcs:disable Generic.Files.LineLength
                        $longHtml = <<<HTML
                        Please consider <a href="{$phpInfo['upgradeURL']}">upgrading your copy of
                        {$phpInfo['implementation']}</a>.
@@ -139,7 +136,7 @@ class PHPVersionCheck {
                        See our<a href="https://www.mediawiki.org/wiki/Compatibility#PHP">compatibility page</a>
                        for details of which versions are compatible with prior versions of {$phpInfo['implementation']}.
 HTML;
-                       // phpcs:enable
+                       // phpcs:enable Generic.Files.LineLength
                        $this->triggerError(
                                "Supported {$phpInfo['implementation']} versions",
                                $shortText,
@@ -151,8 +148,6 @@ HTML;
 
        /**
         * Displays an error, if the vendor/autoload.php file could not be found.
-        *
-        * @return $this
         */
        function checkVendorExistence() {
                if ( !file_exists( dirname( __FILE__ ) . '/../vendor/autoload.php' ) ) {
@@ -164,14 +159,14 @@ HTML;
                                . "https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries\n"
                                . "for help on installing the required components.";
 
-                       // phpcs:ignore Generic.Files.LineLength
+                       // phpcs:disable Generic.Files.LineLength
                        $longHtml = <<<HTML
                MediaWiki now also has some external dependencies that need to be installed via
                composer or from a separate git repo. Please see
                <a href="https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries">mediawiki.org</a>
                for help on installing the required components.
 HTML;
-                       // phpcs:enable
+                       // phpcs:enable Generic.Files.LineLength
 
                        $this->triggerError( 'External dependencies', $shortText, $longText, $longHtml );
                }
@@ -179,8 +174,6 @@ HTML;
 
        /**
         * Displays an error, if a PHP extension does not exist.
-        *
-        * @return $this
         */
        function checkExtensionExistence() {
                $missingExtensions = array();
diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php
index a6783b0..0e2ef85 100644 (file)
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -239,7 +239,7 @@ class AutoloadGenerator {
                return <<<EOD
 <?php
 // This file is generated by $commandName, do not adjust manually
-// phpcs:ignoreFile Generic.Files.LineLength
+// phpcs:disable Generic.Files.LineLength
 global \${$this->variableName};
 
 \${$this->variableName} {$op} [
diff --git a/mw-config/index.php b/mw-config/index.php
index 72cf654..a47822b 100644 (file)
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -1,5 +1,5 @@
 <?php
-// phpcs:ignoreFile Generic.Arrays.DisallowLongArraySyntax
+// phpcs:disable Generic.Arrays.DisallowLongArraySyntax
 /**
  * New version of MediaWiki web-based config/installation
  *
@@ -79,5 +79,4 @@ function wfInstallerMain() {
        $session = $installer->execute( $session );
 
        $_SESSION['installData'][$fingerprint] = $session;
-
 }
Wiklou, le Wiki du Wiklou