enwikipedia-acc / waca

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/MediaWikiHelper.php

Braces +2 added lines, -1 removed lines

@@ -241,7 +241,8 @@
      * @param string $username
      * @return bool
      */
-    public function checkAccountExists($username) {
+    public function checkAccountExists($username)
+    {
         $parameters = array(
             'action'  => 'query',
             'list'    => 'users',

Spacing +9 added lines, -9 removed lines

@@ -58,12 +58,12 @@ 
         $response = $this->mediaWikiClient->doApiCall($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->createaccounttoken;
 
-        $callback = $this->siteConfiguration->getBaseUrl() . '/internal.php/oauth/createCallback';
+        $callback = $this->siteConfiguration->getBaseUrl().'/internal.php/oauth/createCallback';
 
         $checkboxFields = array();
         $requiredFields = array();
@@ -86,7 +86,7 @@ 
         $createResponse = $this->mediaWikiClient->doApiCall($createParams, 'POST');
 
         if (isset($createResponse->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+            throw new MediaWikiApiException($response->error->code.': '.$response->error->info);
         }
 
         if (!isset($createResponse->createaccount) || !isset($createResponse->createaccount->status)) {
@@ -102,7 +102,7 @@ 
             return;
         }
 
-        throw new Exception('API result reported status of ' . $createResponse->createaccount->status);
+        throw new Exception('API result reported status of '.$createResponse->createaccount->status);
     }
 
     /**
@@ -126,7 +126,7 @@ 
         $response = $this->mediaWikiClient->doApiCall($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->csrftoken;
@@ -137,7 +137,7 @@ 
 
         $editParameters = array(
             'action'       => 'edit',
-            'title'        => 'User talk:' . $username,
+            'title'        => 'User talk:'.$username,
             'section'      => 'new',
             'sectiontitle' => $title,
             'summary'      => $summary,
@@ -153,7 +153,7 @@ 
 
         if (!isset($response->edit)) {
             if (isset($response->error)) {
-                throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+                throw new MediaWikiApiException($response->error->code.': '.$response->error->info);
             }
 
             throw new MediaWikiApiException('Unknown error encountered during editing.');
@@ -164,7 +164,7 @@ 
             return;
         }
 
-        throw new MediaWikiApiException('Edit status unsuccessful: ' . $editResponse->result);
+        throw new MediaWikiApiException('Edit status unsuccessful: '.$editResponse->result);
     }
 
     public function getCreationFieldData(&$requiredFields, &$checkboxFields)
@@ -179,7 +179,7 @@ 
         $response = $this->mediaWikiClient->doApiCall($params, 'GET');
 
         if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+            throw new MediaWikiApiException($response->error->code.': '.$response->error->info);
         }
 
         $requests = $response->query->authmanagerinfo->requests;

includes/Helpers/SearchHelpers/JobQueueSearchHelper.php

Braces +12 added lines, -6 removed lines

@@ -23,7 +23,8 @@ 
      *
      * @return JobQueueSearchHelper
      */
-    public static function get(PdoDatabase $database) {
+    public static function get(PdoDatabase $database)
+    {
         $helper = new JobQueueSearchHelper($database);
         return $helper;
     }
@@ -33,7 +34,8 @@ 
      *
      * @return $this
      */
-    public function statusIn($statuses) {
+    public function statusIn($statuses)
+    {
         $this->inClause('status', $statuses);
 
         return $this;
@@ -42,27 +44,31 @@ 
     /**
      * @return $this
      */
-    public function notAcknowledged() {
+    public function notAcknowledged()
+    {
         $this->whereClause .= ' AND (acknowledged IS NULL OR acknowledged = 0)';
 
         return $this;
     }
 
-    public function byTask($task) {
+    public function byTask($task)
+    {
         $this->whereClause .= ' AND task = ?';
         $this->parameterList[] = $task;
 
         return $this;
     }
 
-    public function byUser($userId) {
+    public function byUser($userId)
+    {
         $this->whereClause .= ' AND user = ?';
         $this->parameterList[] = $userId;
 
         return $this;
     }
 
-    public function byStatus($status) {
+    public function byStatus($status)
+    {
         $this->whereClause .= ' AND status = ?';
         $this->parameterList[] = $status;
 

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':

Braces +3 added lines, -2 removed lines

@@ -323,9 +323,10 @@
                 $taskDescriptions = JobQueue::getTaskDescriptions();
 
                 $task = $job->getTask();
-                if(isset($taskDescriptions[$task])){
+                if(isset($taskDescriptions[$task])) {
                     $description = $taskDescriptions[$task];
-                } else {
+                }
+                else {
                     $description = 'Unknown task';
                 }
 

Indentation +2 added lines, -2 removed lines

@@ -347,7 +347,7 @@ 
     {
         $userIds = array();
 
-	    foreach ($logs as $logEntry) {
+        foreach ($logs as $logEntry) {
             if (!$logEntry instanceof Log) {
                 // if this happens, we've done something wrong with passing back the log data.
                 throw new Exception('Log entry is not an instance of a Log, this should never happen.');
@@ -368,7 +368,7 @@ 
 
         $logData = array();
 
-	    foreach ($logs as $logEntry) {
+        foreach ($logs as $logEntry) {
             $objectDescription = self::getObjectDescription($logEntry->getObjectId(), $logEntry->getObjectType(),
                 $database, $configuration);
 

includes/Helpers/RequestEmailHelper.php

Spacing +2 added lines, -2 removed lines

@@ -239,11 +239,11 @@
 
         $emailSig = $currentUser->getEmailSig();
         if ($emailSig !== '' || $emailSig !== null) {
-            $emailSig = "\n\n" . $emailSig;
+            $emailSig = "\n\n".$emailSig;
         }
 
         $subject = "RE: [ACC #{$request->getId()}] English Wikipedia Account Request";
-        $content = $mailText . $emailSig;
+        $content = $mailText.$emailSig;
 
         $helper->sendMail($request->getEmail(), $subject, $content, $headers);
 

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;

Braces +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;