Merge changes I5d11a642,I4ed191bd

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiLoginTest.php

diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php
index f1199e0..67a75f3 100644 (file)
--- a/tests/phpunit/includes/api/ApiLoginTest.php
+++ b/tests/phpunit/includes/api/ApiLoginTest.php
@@ -107,7 +107,8 @@ class ApiLoginTest extends ApiTestCase {
         * @group Broken
         */
        public function testApiLoginGotCookie() {
-               $this->markTestIncomplete( "The server can't do external HTTP requests, and the internal one won't give cookies" );
+               $this->markTestIncomplete( "The server can't do external HTTP requests, "
+                       . "and the internal one won't give cookies" );
 
                global $wgServer, $wgScriptPath;
 
@@ -147,7 +148,10 @@ class ApiLoginTest extends ApiTestCase {
                $this->assertNotEquals( false, $serverName );
                $serializedCookie = $cj->serializeToHttpRequest( $wgScriptPath, $serverName );
                $this->assertNotEquals( '', $serializedCookie );
-               $this->assertRegexp( '/_session=[^;]*; .*UserID=[0-9]*; .*UserName=' . $user->userName . '; .*Token=/', $serializedCookie );
+               $this->assertRegexp(
+                       '/_session=[^;]*; .*UserID=[0-9]*; .*UserName=' . $user->userName . '; .*Token=/',
+                       $serializedCookie
+               );
        }
 
        public function testRunLogin() {