clone keyword must not be used as a function

Also changed a require_once

Change-Id: Ib8030ea5320a62ee4f114d8d506382c5665e3e02

diff --git a/includes/Message.php b/includes/Message.php
index fd67613..be6b0af 100644 (file)
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -419,7 +419,7 @@ class Message implements MessageSpecifier, Serializable {
                }
 
                if ( $value instanceof Message ) { // Message, RawMessage, ApiMessage, etc
-                       $message = clone( $value );
+                       $message = clone $value;
                } elseif ( $value instanceof MessageSpecifier ) {
                        $message = new Message( $value );
                } elseif ( is_string( $value ) ) {

diff --git a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
index fd36887..7f93c12 100644 (file)
--- a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
@@ -297,7 +297,7 @@ class LocalPasswordPrimaryAuthenticationProvider
                                // Nothing we can do besides claim it, because the user isn't in
                                // the DB yet
                                if ( $req->username !== $user->getName() ) {
-                                       $req = clone( $req );
+                                       $req = clone $req;
                                        $req->username = $user->getName();
                                }
                                $ret = AuthenticationResponse::newPass( $req->username );

diff --git a/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php b/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
index 44c2824..4a2d009 100644 (file)
--- a/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
@@ -360,7 +360,7 @@ class TemporaryPasswordPrimaryAuthenticationProvider
                        if ( $req->username !== null && $req->password !== null ) {
                                // Nothing we can do yet, because the user isn't in the DB yet
                                if ( $req->username !== $user->getName() ) {
-                                       $req = clone( $req );
+                                       $req = clone $req;
                                        $req->username = $user->getName();
                                }
 

diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php
index 2160928..2fa2d7f 100644 (file)
--- a/maintenance/getSlaveServer.php
+++ b/maintenance/getSlaveServer.php
@@ -1,3 +1,3 @@
 <?php
 // B/C alias
-require_once ( __DIR__ . '/getReplicaServer.php' );
+require_once __DIR__ . '/getReplicaServer.php';

diff --git a/phpcs.xml b/phpcs.xml
index 197cc78..1b22200 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -16,7 +16,6 @@
                <exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
                <exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
                <exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
-               <exclude name="MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords" />
                <exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
                <exclude name="MediaWiki.WhiteSpace.DisallowEmptyLineFunctions.NoEmptyLine" />
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeControlStructureBrace.EmptyLines" />

diff --git a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index 4d60342..e0ddb0a 100644 (file)
--- a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -626,7 +626,7 @@ class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase
                $req->password = 'bar';
 
                $expect = AuthenticationResponse::newPass( 'Foo' );
-               $expect->createRequest = clone( $req );
+               $expect->createRequest = clone $req;
                $expect->createRequest->username = 'Foo';
                $this->assertEquals( $expect, $provider->beginPrimaryAccountCreation( $user, $user, $reqs ) );
 

diff --git a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
index 6f45fa4..1708f1c 100644 (file)
--- a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
@@ -647,7 +647,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
                $req->password = 'bar';
 
                $expect = AuthenticationResponse::newPass( 'Foo' );
-               $expect->createRequest = clone( $req );
+               $expect->createRequest = clone $req;
                $expect->createRequest->username = 'Foo';
                $this->assertEquals( $expect, $provider->beginPrimaryAccountCreation( $user, $user, $reqs ) );
                $this->assertNull( $this->manager->getAuthenticationSessionData( 'no-email' ) );
@@ -703,7 +703,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
                } );
 
                $expect = AuthenticationResponse::newPass( $user->getName() );
-               $expect->createRequest = clone( $req );
+               $expect->createRequest = clone $req;
                $expect->createRequest->username = $user->getName();
                $res = $provider->beginPrimaryAccountCreation( $user, $creator, [ $req ] );
                $this->assertEquals( $expect, $res );