Merge "Fix incorrect method name"

diff --git a/.phpcs.xml b/.phpcs.xml
index 2a34154..944c3e2 100644 (file)
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -22,7 +22,6 @@
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
                <exclude name="Squiz.Scope.MethodScope.Missing" />
-               <exclude name="Squiz.Scope.MemberVarScope.Missing" />
        </rule>
        <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
                <properties>

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index 8eda14a..70ad0b2 100644 (file)
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -19,6 +19,7 @@
  */
 
 // phpcs:disable Generic.Arrays.DisallowLongArraySyntax,PSR2.Classes.PropertyDeclaration,MediaWiki.Usage.DirUsage
+// phpcs:disable Squiz.Scope.MemberVarScope.Missing,Squiz.Scope.MethodScope.Missing
 /**
  * Check PHP Version, as well as for composer dependencies in entry points,
  * and display something vaguely comprehensible in the event of a totally

diff --git a/includes/libs/filebackend/FileBackend.php b/includes/libs/filebackend/FileBackend.php
index 6d5efa2..2852265 100644 (file)
--- a/includes/libs/filebackend/FileBackend.php
+++ b/includes/libs/filebackend/FileBackend.php
@@ -394,7 +394,7 @@ abstract class FileBackend implements LoggerAwareInterface {
         *                           This should only be used if all entries in the process
         *                           cache were added after the files were already locked. (since 1.20)
         *
-        * @remarks Remarks on locking:
+        * @note Remarks on locking:
         * File system paths given to operations should refer to files that are
         * already locked or otherwise safe from modification from other processes.
         * Normally these files will be new temp files, which should be adequate.

diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index e47e75e..be1a851 100644 (file)
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -135,6 +135,7 @@ abstract class LBFactory implements ILBFactory {
                        'IPAddress' => $_SERVER[ 'REMOTE_ADDR' ] ?? '',
                        'UserAgent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
                        // Headers application can inject via LBFactory::setRequestInfo()
+                       'ChronologyProtection' => null,
                        'ChronologyClientId' => null, // prior $cpClientId value from LBFactory::shutdown()
                        'ChronologyPositionIndex' => null // prior $cpIndex value from LBFactory::shutdown()
                ];

diff --git a/tests/phpunit/includes/libs/XhprofDataTest.php b/tests/phpunit/includes/libs/XhprofDataTest.php
index 1cbd86f..3e93794 100644 (file)
--- a/tests/phpunit/includes/libs/XhprofDataTest.php
+++ b/tests/phpunit/includes/libs/XhprofDataTest.php
@@ -19,8 +19,6 @@
  */
 
 /**
- * @uses XhprofData
- * @uses AutoLoader
  * @copyright © 2014 Wikimedia Foundation and contributors
  * @since 1.25
  */
@@ -154,7 +152,6 @@ class XhprofDataTest extends PHPUnit\Framework\TestCase {
        /**
         * @covers XhprofData::getCallers
         * @covers XhprofData::getCallees
-        * @uses XhprofData
         */
        public function testEdges() {
                $xhprofData = $this->getXhprofDataFixture();
@@ -170,7 +167,6 @@ class XhprofDataTest extends PHPUnit\Framework\TestCase {
 
        /**
         * @covers XhprofData::getCriticalPath
-        * @uses XhprofData
         */
        public function testCriticalPath() {
                $xhprofData = $this->getXhprofDataFixture();

diff --git a/tests/phpunit/includes/password/PasswordTestCase.php b/tests/phpunit/includes/password/PasswordTestCase.php
index 80b9838..7afdd0a 100644 (file)
--- a/tests/phpunit/includes/password/PasswordTestCase.php
+++ b/tests/phpunit/includes/password/PasswordTestCase.php
@@ -51,7 +51,6 @@ abstract class PasswordTestCase extends MediaWikiTestCase {
         * parameter (a password) should match.
         * @return array
         * @throws MWException
-        * @abstract
         */
        public static function providePasswordTests() {
                throw new MWException( "Not implemented" );