mdaniels5757 / waca

includes/Helpers/BotMediaWikiClient.php

Braces +4 added lines, -8 removed lines

@@ -72,12 +72,10 @@ 
             $userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
             if (isset($userinfoResult->query->userinfo->anon)) {
                 throw new MediaWikiApiException('Unable to log in.');
-            }
-            else {
+            } else {
                 $this->knownLoggedIn = true;
             }
-        }
-        else {
+        } else {
             $this->knownLoggedIn = true;
         }
     }
@@ -96,11 +94,9 @@ 
 
         if ($method == 'GET') {
             $data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, $apiParams);
-        }
-        elseif ($method == 'POST') {
+        } elseif ($method == 'POST') {
             $data = $this->httpHelper->post($this->mediawikiWebServiceEndpoint, $apiParams);
-        }
-        else {
+        } else {
             throw new ApplicationLogicException('Unsupported HTTP Method');
         }
 

includes/Helpers/Logger.php

Braces +1 added lines, -2 removed lines

@@ -74,8 +74,7 @@
 
         if ($domain !== null) {
             $log->setDomain($domain);
-        }
-        elseif (method_exists($object, 'getDomain')) {
+        } elseif (method_exists($object, 'getDomain')) {
             $log->setDomain($object->getDomain());
         }
 

includes/Helpers/SearchHelpers/LogSearchHelper.php

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 
         if ($domain === null) {
             $helper->whereClause .= ' AND domain IS NULL';
-        }
-        else {
+        } else {
             $helper->whereClause .= ' AND coalesce(domain, ?) = ?';
             $helper->parameterList[] = $domain;
             $helper->parameterList[] = $domain;

includes/IdentificationVerifier.php

Braces +2 added lines, -4 removed lines

@@ -77,14 +77,12 @@
     {
         if ($this->checkIdentificationCache($onWikiName)) {
             return true;
-        }
-        else {
+        } else {
             if ($this->isIdentifiedOnWiki($onWikiName)) {
                 $this->cacheIdentificationStatus($onWikiName);
 
                 return true;
-            }
-            else {
+            } else {
                 return false;
             }
         }

includes/ExceptionHandler.php

Braces +2 added lines, -4 removed lines

@@ -65,8 +65,7 @@ 
             ob_end_clean();
 
             $message = str_replace('$2$', $textErrorData, $message);
-        }
-        else {
+        } else {
             $message = str_replace('$2$', "", $message);
         }
 
@@ -135,8 +134,7 @@ 
 
         if ($fromGlobalHandler) {
             $errorData['globalHandler'] = true;
-        }
-        else {
+        } else {
             $errorData['globalHandler'] = false;
         }
 

includes/Fragments/NavigationMenuAccessControl.php

Braces +2 added lines, -1 removed lines

@@ -113,7 +113,8 @@
      *
      * @return void
      */
-    public function setUpNavBarBadges(User $currentUser, PdoDatabase $database) {
+    public function setUpNavBarBadges(User $currentUser, PdoDatabase $database)
+    {
         // Set up some variables.
         // A size of 0 causes nothing to show up on the page (checked on navigation-menu.tpl) so leaving it 0 here is fine.
         $countOfFlagged = 0;

includes/PdoDatabase.php

Braces +1 added lines, -2 removed lines

@@ -97,8 +97,7 @@
         // all over the rest of the code
         if ($this->hasActiveTransaction) {
             return false;
-        }
-        else {
+        } else {
             $accessMode = 'READ WRITE';
 
             switch ($isolationLevel) {

includes/DataObjects/Ban.php

Braces +3 added lines, -6 removed lines

@@ -155,12 +155,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE `ban`
@@ -339,8 +337,7 @@ 
     {
         if ($ip === null) {
             $this->ip = null;
-        }
-        else {
+        } else {
             $this->ip = inet_pton($ip);
         }
 

includes/DataObjects/UserDomain.php

Braces +2 added lines, -4 removed lines

@@ -37,12 +37,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // insert / delete only, no updates please.
             throw new Exception('Updating domain membership is not available');
         }