enwikipedia-acc / waca

includes/DataObjects/OAuthIdentity.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -10,9 +10,9 @@
 
 use DateTimeImmutable;
 use Exception;
-use stdClass;
 use Waca\DataObject;
 use Waca\Exceptions\OptimisticLockFailedException;
+use stdClass;
 
 class OAuthIdentity extends DataObject
 {

includes/Pages/PageJobQueue.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -14,8 +14,8 @@
 use Waca\DataObjects\Request;
 use Waca\DataObjects\User;
 use Waca\Exceptions\ApplicationLogicException;
-use Waca\Helpers\Logger;
 use Waca\Helpers\LogHelper;
+use Waca\Helpers\Logger;
 use Waca\Helpers\SearchHelpers\JobQueueSearchHelper;
 use Waca\Helpers\SearchHelpers\LogSearchHelper;
 use Waca\Helpers\SearchHelpers\RequestSearchHelper;

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
             throw new ApplicationLogicException('Could not find requested job');
         }
 
-        $this->setHtmlTitle('Job #' . $job->getId());
+        $this->setHtmlTitle('Job #'.$job->getId());
 
         $this->prepareMaps();
 

includes/Router/RequestRouter.php

Unused Use Statements +10 added lines, -10 removed lines

@@ -15,27 +15,20 @@ 
 use Waca\Pages\PageEmailManagement;
 use Waca\Pages\PageExpandedRequestList;
 use Waca\Pages\PageJobQueue;
-use Waca\Pages\RequestAction\PageCreateRequest;
-use Waca\Pages\UserAuth\PageChangePassword;
-use Waca\Pages\UserAuth\PageForgotPassword;
 use Waca\Pages\PageLog;
-use Waca\Pages\UserAuth\PageLogin;
-use Waca\Pages\UserAuth\PageLogout;
 use Waca\Pages\PageMain;
-use Waca\Pages\UserAuth\PageOAuth;
-use Waca\Pages\UserAuth\PageOAuthCallback;
-use Waca\Pages\UserAuth\PagePreferences;
-use Waca\Pages\Registration\PageRegisterStandard;
-use Waca\Pages\Registration\PageRegisterOption;
 use Waca\Pages\PageSearch;
 use Waca\Pages\PageSiteNotice;
 use Waca\Pages\PageTeam;
 use Waca\Pages\PageUserManagement;
 use Waca\Pages\PageViewRequest;
 use Waca\Pages\PageWelcomeTemplateManagement;
+use Waca\Pages\Registration\PageRegisterOption;
+use Waca\Pages\Registration\PageRegisterStandard;
 use Waca\Pages\RequestAction\PageBreakReservation;
 use Waca\Pages\RequestAction\PageCloseRequest;
 use Waca\Pages\RequestAction\PageComment;
+use Waca\Pages\RequestAction\PageCreateRequest;
 use Waca\Pages\RequestAction\PageCustomClose;
 use Waca\Pages\RequestAction\PageDeferRequest;
 use Waca\Pages\RequestAction\PageDropRequest;
@@ -49,6 +42,13 @@ 
 use Waca\Pages\Statistics\StatsTemplateStats;
 use Waca\Pages\Statistics\StatsTopCreators;
 use Waca\Pages\Statistics\StatsUsers;
+use Waca\Pages\UserAuth\PageChangePassword;
+use Waca\Pages\UserAuth\PageForgotPassword;
+use Waca\Pages\UserAuth\PageLogin;
+use Waca\Pages\UserAuth\PageLogout;
+use Waca\Pages\UserAuth\PageOAuth;
+use Waca\Pages\UserAuth\PageOAuthCallback;
+use Waca\Pages\UserAuth\PagePreferences;
 use Waca\Tasks\IRoutedTask;
 use Waca\WebRequest;
 

includes/Security/AuthenticationManager.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use Waca\PdoDatabase;
 use Waca\Security\CredentialProviders\ICredentialProvider;
 use Waca\Security\CredentialProviders\PasswordCredentialProvider;
-use Waca\Security\CredentialProviders\YubikeyCredentialProvider;
 use Waca\SiteConfiguration;
 
 class AuthenticationManager

includes/Security/RoleConfiguration.php

Unused Use Statements +4 added lines, -4 removed lines

@@ -16,10 +16,6 @@ 
 use Waca\Pages\PageJobQueue;
 use Waca\Pages\PageLog;
 use Waca\Pages\PageMain;
-use Waca\Pages\RequestAction\PageCreateRequest;
-use Waca\Pages\UserAuth\PageChangePassword;
-use Waca\Pages\UserAuth\PageOAuth;
-use Waca\Pages\UserAuth\PagePreferences;
 use Waca\Pages\PageSearch;
 use Waca\Pages\PageSiteNotice;
 use Waca\Pages\PageTeam;
@@ -29,6 +25,7 @@ 
 use Waca\Pages\RequestAction\PageBreakReservation;
 use Waca\Pages\RequestAction\PageCloseRequest;
 use Waca\Pages\RequestAction\PageComment;
+use Waca\Pages\RequestAction\PageCreateRequest;
 use Waca\Pages\RequestAction\PageCustomClose;
 use Waca\Pages\RequestAction\PageDeferRequest;
 use Waca\Pages\RequestAction\PageDropRequest;
@@ -42,6 +39,9 @@ 
 use Waca\Pages\Statistics\StatsTemplateStats;
 use Waca\Pages\Statistics\StatsTopCreators;
 use Waca\Pages\Statistics\StatsUsers;
+use Waca\Pages\UserAuth\PageChangePassword;
+use Waca\Pages\UserAuth\PageOAuth;
+use Waca\Pages\UserAuth\PagePreferences;
 
 class RoleConfiguration
 {

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

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, &$czechboxFields)
@@ -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;