Merge "Consistently use spaces and stars in comments"

diff --combined tests/phpunit/includes/api/ApiEditPageTest.php
index 2045a13,5203451..d2762e0
--- 1/tests/phpunit/includes/api/ApiEditPageTest.php
--- 2/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@@ -39,6 -39,7 +39,6 @@@ class ApiEditPageTest extends ApiTestCa
                        $this->tablesUsed,
                        [ 'change_tag', 'change_tag_def', 'logging' ]
                );
 -              $this->overrideMwServices();
        }
  
        public function testEdit() {
@@@ -410,10 -411,10 +410,10 @@@
                $count++;
  
                /*
-               * T43990: if the target page has a newer revision than the redirect, then editing the
-               * redirect while specifying 'redirect' and *not* specifying 'basetimestamp' erroneously
-               * caused an edit conflict to be detected.
-               */
+                * T43990: if the target page has a newer revision than the redirect, then editing the
+                * redirect while specifying 'redirect' and *not* specifying 'basetimestamp' erroneously
+                * caused an edit conflict to be detected.
+                */
  
                // assume NS_HELP defaults to wikitext
                $name = "Help:ApiEditPageTest_testEditConflict_redirect_T43990_$count";
@@@ -1367,6 -1368,9 +1367,6 @@@
                ChangeTags::defineTag( 'custom tag' );
                $this->setMwGlobals( 'wgRevokePermissions',
                        [ 'user' => [ 'applychangetags' => true ] ] );
 -              // Supply services with updated globals
 -              $this->overrideMwServices();
 -
                try {
                        $this->doApiRequestWithToken( [
                                'action' => 'edit',
@@@ -1545,6 -1549,8 +1545,6 @@@
  
                $this->setMwGlobals( 'wgRevokePermissions',
                        [ 'user' => [ 'upload' => true ] ] );
 -              // Supply services with updated globals
 -              $this->overrideMwServices();
  
                $this->doApiRequestWithToken( [
                        'action' => 'edit',
@@@ -1560,6 -1566,8 +1560,6 @@@
                        'The content you supplied exceeds the article size limit of 1 kilobyte.' );
  
                $this->setMwGlobals( 'wgMaxArticleSize', 1 );
 -              // Supply services with updated globals
 -              $this->overrideMwServices();
  
                $text = str_repeat( '!', 1025 );
  
@@@ -1577,6 -1585,8 +1577,6 @@@
                        'The action you have requested is limited to users in the group: ' );
  
                $this->setMwGlobals( 'wgRevokePermissions', [ '*' => [ 'edit' => true ] ] );
 -              // Supply services with updated globals
 -              $this->overrideMwServices();
  
                $this->doApiRequestWithToken( [
                        'action' => 'edit',
@@@ -1593,6 -1603,8 +1593,6 @@@
  
                $this->setMwGlobals( 'wgRevokePermissions',
                        [ 'user' => [ 'editcontentmodel' => true ] ] );
 -              // Supply services with updated globals
 -              $this->overrideMwServices();
  
                $this->doApiRequestWithToken( [
                        'action' => 'edit',