enwikipedia-acc / waca

includes/Security/CredentialProviders/PasswordCredentialProvider.php

Spacing +5 added lines, -5 removed lines

@@ -24,19 +24,19 @@ 
     public function authenticate(User $user, $data)
     {
         $storedData = $this->getCredentialData($user->getId());
-        if($storedData === null)
+        if ($storedData === null)
         {
             // No available credential matching these parameters
             return false;
         }
 
-        if($storedData->getVersion() !== 2) {
+        if ($storedData->getVersion() !== 2) {
             // Non-2 versions are not supported.
             return false;
         }
 
-        if(password_verify($data, $storedData->getData())) {
-            if(password_needs_rehash($storedData->getData(), PASSWORD_BCRYPT, array('cost' => self::PASSWORD_COST))){
+        if (password_verify($data, $storedData->getData())) {
+            if (password_needs_rehash($storedData->getData(), PASSWORD_BCRYPT, array('cost' => self::PASSWORD_COST))) {
                 $this->setCredential($user, $storedData->getFactor(), $data);
             }
 
@@ -50,7 +50,7 @@ 
     {
         $storedData = $this->getCredentialData($user->getId());
 
-        if($storedData === null){
+        if ($storedData === null) {
             $storedData = $this->createNewCredential($user);
         }
 

includes/Helpers/BotMediaWikiClient.php

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
         }
 
         if ($data === false) {
-            throw new CurlException('Curl error: ' . $this->httpHelper->getError());
+            throw new CurlException('Curl error: '.$this->httpHelper->getError());
         }
 
         $result = json_decode($data);
@@ -124,7 +124,7 @@ 
         $response = $this->callApi($tokenParams, 'POST');
 
         if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+            throw new MediaWikiApiException($response->error->code.': '.$response->error->info);
         }
 
         $token = $response->query->tokens->logintoken;
@@ -142,7 +142,7 @@ 
 
         $loginResponse = $this->callApi($params, 'POST');
 
-        if($loginResponse->login->result == 'Success'){
+        if ($loginResponse->login->result == 'Success') {
             return;
         }
 

includes/Helpers/HttpHelper.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
             curl_setopt($this->curlHandle, CURLOPT_SSL_VERIFYPEER, false);
         }
 
-        if($cookieJar !== null) {
+        if ($cookieJar !== null) {
             curl_setopt($this->curlHandle, CURLOPT_COOKIEFILE, $cookieJar);
             curl_setopt($this->curlHandle, CURLOPT_COOKIEJAR, $cookieJar);
         }
@@ -59,7 +59,7 @@ 
     public function get($url, $parameters = null, $headers = array())
     {
         if ($parameters !== null && is_array($parameters)) {
-            $getString = '?' . http_build_query($parameters);
+            $getString = '?'.http_build_query($parameters);
             $url .= $getString;
         }
 
@@ -74,7 +74,7 @@ 
 
         if ($result === false) {
             $error = curl_error($this->curlHandle);
-            throw new CurlException('Remote request failed with error ' . $error);
+            throw new CurlException('Remote request failed with error '.$error);
         }
 
         return $result;
@@ -104,7 +104,7 @@ 
 
         if ($result === false) {
             $error = curl_error($this->curlHandle);
-            throw new CurlException('Remote request failed with error ' . $error);
+            throw new CurlException('Remote request failed with error '.$error);
         }
 
         return $result;

includes/Helpers/SearchHelpers/SearchHelperBase.php

Spacing +10 added lines, -10 removed lines

@@ -84,8 +84,8 @@ 
     {
         $this->whereClause .= $whereClauseSection;
 
-        $countQuery = 'SELECT /* SearchHelper */ COUNT(*) FROM ' . $this->table . ' origin ';
-        $countQuery .= $this->joinClause . $this->whereClause;
+        $countQuery = 'SELECT /* SearchHelper */ COUNT(*) FROM '.$this->table.' origin ';
+        $countQuery .= $this->joinClause.$this->whereClause;
 
         $query = $this->buildQuery(array('*'));
         $query .= $this->applyOrder();
@@ -146,7 +146,7 @@ 
                 throw new ApplicationLogicException('Cannot apply distinct to column fetch already using group by');
             }
 
-            $this->groupByClause = ' GROUP BY origin.' . $column;
+            $this->groupByClause = ' GROUP BY origin.'.$column;
         }
 
         $statement = $this->getData(array($column));
@@ -175,8 +175,8 @@ 
      */
     public function getRecordCount(&$count)
     {
-        $query = 'SELECT /* SearchHelper */ COUNT(*) FROM ' . $this->table . ' origin ';
-        $query .= $this->joinClause . $this->whereClause;
+        $query = 'SELECT /* SearchHelper */ COUNT(*) FROM '.$this->table.' origin ';
+        $query .= $this->joinClause.$this->whereClause;
 
         $statement = $this->database->prepare($query);
         $statement->execute($this->parameterList);
@@ -223,7 +223,7 @@ 
     private function applyOrder()
     {
         if ($this->orderBy !== null) {
-            return ' ORDER BY ' . $this->orderBy;
+            return ' ORDER BY '.$this->orderBy;
         }
 
         return '';
@@ -255,11 +255,11 @@ 
     {
         $colData = array();
         foreach ($columns as $c) {
-            $colData[] = 'origin.' . $c;
+            $colData[] = 'origin.'.$c;
         }
 
-        $query = "SELECT {$this->modifiersClause} /* SearchHelper */ " . implode(', ', $colData) . ' FROM ' . $this->table . ' origin ';
-        $query .= $this->joinClause . $this->whereClause . $this->groupByClause;
+        $query = "SELECT {$this->modifiersClause} /* SearchHelper */ ".implode(', ', $colData).' FROM '.$this->table.' origin ';
+        $query .= $this->joinClause.$this->whereClause.$this->groupByClause;
 
         return $query;
     }
@@ -281,7 +281,7 @@ 
         $valueCount = count($values);
 
         // Firstly, let's create a string of question marks, which will do as positional parameters.
-        $inSection = str_repeat('?,', $valueCount - 1) . '?';
+        $inSection = str_repeat('?,', $valueCount - 1).'?';
 
         $this->whereClause .= " AND {$column} IN ({$inSection})";
         $this->parameterList = array_merge($this->parameterList, $values);

includes/Helpers/SearchHelpers/RequestSearchHelper.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
     {
         $this->whereClause .= ' AND (ip LIKE ? OR forwardedip LIKE ?)';
         $this->parameterList[] = $ipAddress;
-        $this->parameterList[] = '%' . trim($ipAddress, '%') . '%';
+        $this->parameterList[] = '%'.trim($ipAddress, '%').'%';
 
         return $this;
     }
@@ -167,7 +167,7 @@ 
     public function isHospitalised()
     {
         $this->whereClause .= ' AND status = ?';
-        $this->parameterList[] =  RequestStatus::HOSPITAL;
+        $this->parameterList[] = RequestStatus::HOSPITAL;
 
         return $this;
     }
@@ -180,7 +180,7 @@ 
     public function notHospitalised()
     {
         $this->whereClause .= ' AND status <> ?';
-        $this->parameterList[] =  RequestStatus::HOSPITAL;
+        $this->parameterList[] = RequestStatus::HOSPITAL;
 
         return $this;
     }

includes/Helpers/LogHelper.php

Spacing +9 added lines, -9 removed lines

@@ -129,7 +129,7 @@ 
             $template = EmailTemplate::getById((int)$id, $entry->getDatabase());
 
             if ($template != false) {
-                return "closed (" . $template->getName() . ")";
+                return "closed (".$template->getName().")";
             }
         }
 
@@ -275,10 +275,10 @@ 
                 $ban = Ban::getById($objectId, $database);
 
                 if ($ban === false) {
-                    return 'Ban #' . $objectId . "</a>";
+                    return 'Ban #'.$objectId."</a>";
                 }
 
-                return 'Ban #' . $objectId . " (" . htmlentities($ban->getTarget()) . ")</a>";
+                return 'Ban #'.$objectId." (".htmlentities($ban->getTarget()).")</a>";
             case 'EmailTemplate':
                 /** @var EmailTemplate $emailTemplate */
                 $emailTemplate = EmailTemplate::getById($objectId, $database);
@@ -323,7 +323,7 @@ 
                 $taskDescriptions = JobQueue::getTaskDescriptions();
 
                 $task = $job->getTask();
-                if(isset($taskDescriptions[$task])){
+                if (isset($taskDescriptions[$task])) {
                     $description = $taskDescriptions[$task];
                 } else {
                     $description = 'Unknown task';
@@ -331,7 +331,7 @@ 
 
                 return "<a href=\"{$baseurl}/internal.php/jobQueue/view?id={$objectId}\">Job #{$job->getId()} ({$description})</a>";
             default:
-                return '[' . $objectType . " " . $objectId . ']';
+                return '['.$objectType." ".$objectId.']';
         }
     }
 
@@ -379,7 +379,7 @@ 
                     $renameData = unserialize($logEntry->getComment());
                     $oldName = htmlentities($renameData['old'], ENT_COMPAT, 'UTF-8');
                     $newName = htmlentities($renameData['new'], ENT_COMPAT, 'UTF-8');
-                    $comment = 'Renamed \'' . $oldName . '\' to \'' . $newName . '\'.';
+                    $comment = 'Renamed \''.$oldName.'\' to \''.$newName.'\'.';
                     break;
                 case 'RoleChange':
                     $roleChangeData = unserialize($logEntry->getComment());
@@ -396,15 +396,15 @@ 
 
                     $reason = htmlentities($roleChangeData['reason'], ENT_COMPAT, 'UTF-8');
 
-                    $roleDelta = 'Removed [' . implode(', ', $removed) . '], Added [' . implode(', ', $added) . ']';
-                    $comment = $roleDelta . ' with comment: ' . $reason;
+                    $roleDelta = 'Removed ['.implode(', ', $removed).'], Added ['.implode(', ', $added).']';
+                    $comment = $roleDelta.' with comment: '.$reason;
                     break;
                 case 'JobIssue':
                     $jobIssueData = unserialize($logEntry->getComment());
                     $errorMessage = $jobIssueData['error'];
                     $status = $jobIssueData['status'];
 
-                    $comment = 'Job ' . htmlentities($status, ENT_COMPAT, 'UTF-8') . ': ';
+                    $comment = 'Job '.htmlentities($status, ENT_COMPAT, 'UTF-8').': ';
                     $comment .= htmlentities($errorMessage, ENT_COMPAT, 'UTF-8');
                     break;
                 case 'JobIssueRequest':

includes/Helpers/OAuthProtocolHelper.php

Spacing +9 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
      */
     public function getRequestToken()
     {
-        $endpoint = $this->oauthEndpoint . '/initiate&format=json&oauth_callback=oob';
+        $endpoint = $this->oauthEndpoint.'/initiate&format=json&oauth_callback=oob';
 
         $parsedUrl = parse_url($endpoint);
         $urlParameters = array();
@@ -92,7 +92,7 @@ 
         $data = $this->httpHelper->get($targetUrl, null);
 
         if ($data === false) {
-            throw new CurlException('Curl error: ' . $this->httpHelper->getError());
+            throw new CurlException('Curl error: '.$this->httpHelper->getError());
         }
 
         $token = json_decode($data);
@@ -102,7 +102,7 @@ 
         }
 
         if (isset($token->error)) {
-            throw new OAuthException('Error encountered while getting request token: ' . $token->error);
+            throw new OAuthException('Error encountered while getting request token: '.$token->error);
         }
 
         return $token;
@@ -129,7 +129,7 @@ 
      */
     public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier)
     {
-        $endpoint = $this->oauthEndpoint . '/token&format=json';
+        $endpoint = $this->oauthEndpoint.'/token&format=json';
 
         $requestConsumer = new OAuthConsumer($oauthRequestToken, $oauthRequestSecret);
 
@@ -147,7 +147,7 @@ 
         $data = $this->httpHelper->get($targetUrl, null);
 
         if ($data === false) {
-            throw new CurlException('Curl error: ' . $this->httpHelper->getError());
+            throw new CurlException('Curl error: '.$this->httpHelper->getError());
         }
 
         $token = json_decode($data);
@@ -157,7 +157,7 @@ 
         }
 
         if (isset($token->error)) {
-            throw new OAuthException('Error encountered while getting access token: ' . $token->error);
+            throw new OAuthException('Error encountered while getting access token: '.$token->error);
         }
 
         return $token;
@@ -173,7 +173,7 @@ 
      */
     public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret)
     {
-        $endpoint = $this->oauthEndpoint . '/identify&format=json';
+        $endpoint = $this->oauthEndpoint.'/identify&format=json';
 
         $oauthToken = new OAuthToken($oauthAccessToken, $oauthAccessSecret);
 
@@ -190,7 +190,7 @@ 
         $data = $this->httpHelper->get($targetUrl, null);
 
         if ($data === false) {
-            throw new CurlException('Curl error: ' . $this->httpHelper->getError());
+            throw new CurlException('Curl error: '.$this->httpHelper->getError());
         }
 
         $decodedData = json_decode($data);
@@ -246,7 +246,7 @@ 
         }
 
         if ($data === false) {
-            throw new CurlException('Curl error: ' . $this->httpHelper->getError());
+            throw new CurlException('Curl error: '.$this->httpHelper->getError());
         }
 
         return json_decode($data);

includes/Background/Task/BotCreationTask.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
 
     protected function getCreationReason(Request $request, User $user)
     {
-        return parent::getCreationReason($request, $user) . ', on behalf of [[User:' . $user->getOnWikiName() . ']]';
+        return parent::getCreationReason($request, $user).', on behalf of [[User:'.$user->getOnWikiName().']]';
     }
 }
\ No newline at end of file

includes/Background/Task/WelcomeUserTask.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
             return;
         }
 
-        if (!$mediaWikiHelper->checkAccountExists($request->getName())){
+        if (!$mediaWikiHelper->checkAccountExists($request->getName())) {
             $this->markFailed('Account does not exist!');
 
             return;