mdaniels5757 / waca

includes/AutoLoader.php

Indentation +29 added lines, -29 removed lines

@@ -13,37 +13,37 @@
  */
 class AutoLoader
 {
-    public static function load($class)
-    {
-        // handle namespaces sensibly
-        if (strpos($class, "Waca") !== false) {
-            // strip off the initial namespace
-            $class = str_replace("Waca\\", "", $class);
+	public static function load($class)
+	{
+		// handle namespaces sensibly
+		if (strpos($class, "Waca") !== false) {
+			// strip off the initial namespace
+			$class = str_replace("Waca\\", "", $class);
 
-            // swap backslashes for forward slashes to map to directory names
-            $class = str_replace("\\", "/", $class);
-        }
+			// swap backslashes for forward slashes to map to directory names
+			$class = str_replace("\\", "/", $class);
+		}
 
-        $paths = array(
-            __DIR__ . '/' . $class . ".php",
-            __DIR__ . '/DataObjects/' . $class . ".php",
-            __DIR__ . '/Providers/' . $class . ".php",
-            __DIR__ . '/Providers/Interfaces/' . $class . ".php",
-            __DIR__ . '/Validation/' . $class . ".php",
-            __DIR__ . '/Helpers/' . $class . ".php",
-            __DIR__ . '/Helpers/Interfaces/' . $class . ".php",
-            __DIR__ . '/' . $class . ".php",
-        );
+		$paths = array(
+			__DIR__ . '/' . $class . ".php",
+			__DIR__ . '/DataObjects/' . $class . ".php",
+			__DIR__ . '/Providers/' . $class . ".php",
+			__DIR__ . '/Providers/Interfaces/' . $class . ".php",
+			__DIR__ . '/Validation/' . $class . ".php",
+			__DIR__ . '/Helpers/' . $class . ".php",
+			__DIR__ . '/Helpers/Interfaces/' . $class . ".php",
+			__DIR__ . '/' . $class . ".php",
+		);
 
-        foreach ($paths as $file) {
-            if (file_exists($file)) {
-                /** @noinspection PhpIncludeInspection */
-                require_once($file);
-            }
+		foreach ($paths as $file) {
+			if (file_exists($file)) {
+				/** @noinspection PhpIncludeInspection */
+				require_once($file);
+			}
 
-            if (class_exists($class)) {
-                return;
-            }
-        }
-    }
+			if (class_exists($class)) {
+				return;
+			}
+		}
+	}
 }

includes/RequestStatus.php

Indentation +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@
 
 class RequestStatus
 {
-    const HOSPITAL = 'Hospital';
-    const JOBQUEUE = 'JobQueue';
-    const CLOSED = 'Closed';
+	const HOSPITAL = 'Hospital';
+	const JOBQUEUE = 'JobQueue';
+	const CLOSED = 'Closed';
 }
\ No newline at end of file

includes/Fragments/RequestListData.php

Indentation +67 added lines, -67 removed lines

@@ -18,71 +18,71 @@
 
 trait RequestListData
 {
-    // function imports from InternalPageBase etc.
-    protected abstract function getDatabase();
-
-    protected abstract function getXffTrustProvider();
-
-    protected abstract function getSiteConfiguration();
-
-    protected abstract function barrierTest($action, User $user, $pageName = null);
-
-    /**
-     * @param Request[] $requests
-     *
-     * @return RequestList
-     */
-    protected function prepareRequestData(array $requests) : RequestList
-    {
-        $requestList = new RequestList();
-        $requestList->requests = $requests;
-
-        $userIds = array_map(
-            function(Request $entry) {
-                return $entry->getReserved();
-            },
-            $requests
-        );
-
-        $requestList->userList = UserSearchHelper::get($this->getDatabase())->inIds($userIds)->fetchMap('username');
-
-        $requestList->requestTrustedIp = [];
-        $requestList->relatedIpRequests = [];
-        $requestList->relatedEmailRequests = [];
-
-        foreach ($requests as $request) {
-            $trustedIp = $this->getXffTrustProvider()->getTrustedClientIp(
-                $request->getIp(),
-                $request->getForwardedIp()
-            );
-
-            RequestSearchHelper::get($this->getDatabase())
-                ->byIp($trustedIp)
-                ->withConfirmedEmail()
-                ->excludingPurgedData($this->getSiteConfiguration())
-                ->excludingRequest($request->getId())
-                ->getRecordCount($ipCount);
-
-            RequestSearchHelper::get($this->getDatabase())
-                ->byEmailAddress($request->getEmail())
-                ->withConfirmedEmail()
-                ->excludingPurgedData($this->getSiteConfiguration())
-                ->excludingRequest($request->getId())
-                ->getRecordCount($emailCount);
-
-            $requestList->requestTrustedIp[$request->getId()] = $trustedIp;
-            $requestList->relatedEmailRequests[$request->getId()] = $emailCount;
-            $requestList->relatedIpRequests[$request->getId()] = $ipCount;
-        }
-
-        $currentUser = User::getCurrent($this->getDatabase());
-
-        $requestList->canBan = $this->barrierTest('set', $currentUser, PageBan::class);
-        $requestList->canBreakReservation = $this->barrierTest('force', $currentUser, PageBreakReservation::class);
-        $requestList->showPrivateData = $this->barrierTest('alwaysSeePrivateData', $currentUser, 'RequestData');
-        $requestList->dataClearEmail = $this->getSiteConfiguration()->getDataClearEmail();
-        $requestList->dataClearIp = $this->getSiteConfiguration()->getDataClearIp();
-
-        return $requestList;
-    }
+	// function imports from InternalPageBase etc.
+	protected abstract function getDatabase();
+
+	protected abstract function getXffTrustProvider();
+
+	protected abstract function getSiteConfiguration();
+
+	protected abstract function barrierTest($action, User $user, $pageName = null);
+
+	/**
+	 * @param Request[] $requests
+	 *
+	 * @return RequestList
+	 */
+	protected function prepareRequestData(array $requests) : RequestList
+	{
+		$requestList = new RequestList();
+		$requestList->requests = $requests;
+
+		$userIds = array_map(
+			function(Request $entry) {
+				return $entry->getReserved();
+			},
+			$requests
+		);
+
+		$requestList->userList = UserSearchHelper::get($this->getDatabase())->inIds($userIds)->fetchMap('username');
+
+		$requestList->requestTrustedIp = [];
+		$requestList->relatedIpRequests = [];
+		$requestList->relatedEmailRequests = [];
+
+		foreach ($requests as $request) {
+			$trustedIp = $this->getXffTrustProvider()->getTrustedClientIp(
+				$request->getIp(),
+				$request->getForwardedIp()
+			);
+
+			RequestSearchHelper::get($this->getDatabase())
+				->byIp($trustedIp)
+				->withConfirmedEmail()
+				->excludingPurgedData($this->getSiteConfiguration())
+				->excludingRequest($request->getId())
+				->getRecordCount($ipCount);
+
+			RequestSearchHelper::get($this->getDatabase())
+				->byEmailAddress($request->getEmail())
+				->withConfirmedEmail()
+				->excludingPurgedData($this->getSiteConfiguration())
+				->excludingRequest($request->getId())
+				->getRecordCount($emailCount);
+
+			$requestList->requestTrustedIp[$request->getId()] = $trustedIp;
+			$requestList->relatedEmailRequests[$request->getId()] = $emailCount;
+			$requestList->relatedIpRequests[$request->getId()] = $ipCount;
+		}
+
+		$currentUser = User::getCurrent($this->getDatabase());
+
+		$requestList->canBan = $this->barrierTest('set', $currentUser, PageBan::class);
+		$requestList->canBreakReservation = $this->barrierTest('force', $currentUser, PageBreakReservation::class);
+		$requestList->showPrivateData = $this->barrierTest('alwaysSeePrivateData', $currentUser, 'RequestData');
+		$requestList->dataClearEmail = $this->getSiteConfiguration()->getDataClearEmail();
+		$requestList->dataClearIp = $this->getSiteConfiguration()->getDataClearIp();
+
+		return $requestList;
+	}
 }

Braces +2 added lines, -1 removed lines

@@ -38,7 +38,8 @@
         $requestList->requests = $requests;
 
         $userIds = array_map(
-            function(Request $entry) {
+            function(Request $entry)
+            {
                 return $entry->getReserved();
             },
             $requests

includes/Fragments/NavigationMenuAccessControl.php

Indentation +39 added lines, -39 removed lines

@@ -25,48 +25,48 @@
 
 trait NavigationMenuAccessControl
 {
-    protected abstract function assign($name, $value);
+	protected abstract function assign($name, $value);
 
-    /**
-     * @return SecurityManager
-     */
-    protected abstract function getSecurityManager();
+	/**
+	 * @return SecurityManager
+	 */
+	protected abstract function getSecurityManager();
 
-    /**
-     * @param $currentUser
-     */
-    protected function setupNavMenuAccess($currentUser)
-    {
-        $this->assign('nav__canRequests', $this->getSecurityManager()
-                ->allows(PageMain::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+	/**
+	 * @param $currentUser
+	 */
+	protected function setupNavMenuAccess($currentUser)
+	{
+		$this->assign('nav__canRequests', $this->getSecurityManager()
+				->allows(PageMain::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
 
-        $this->assign('nav__canLogs', $this->getSecurityManager()
-                ->allows(PageLog::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canUsers', $this->getSecurityManager()
-                ->allows(StatsUsers::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canSearch', $this->getSecurityManager()
-                ->allows(PageSearch::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canStats', $this->getSecurityManager()
-                ->allows(StatsMain::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canLogs', $this->getSecurityManager()
+				->allows(PageLog::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canUsers', $this->getSecurityManager()
+				->allows(StatsUsers::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canSearch', $this->getSecurityManager()
+				->allows(PageSearch::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canStats', $this->getSecurityManager()
+				->allows(StatsMain::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
 
-        $this->assign('nav__canBan', $this->getSecurityManager()
-                ->allows(PageBan::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canEmailMgmt', $this->getSecurityManager()
-                ->allows(PageEmailManagement::class, RoleConfiguration::MAIN,
-                    $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canWelcomeMgmt', $this->getSecurityManager()
-                ->allows(PageWelcomeTemplateManagement::class, RoleConfiguration::MAIN,
-                    $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canSiteNoticeMgmt', $this->getSecurityManager()
-                ->allows(PageSiteNotice::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canUserMgmt', $this->getSecurityManager()
-                ->allows(PageUserManagement::class, RoleConfiguration::MAIN,
-                    $currentUser) === SecurityManager::ALLOWED);
-        $this->assign('nav__canJobQueue', $this->getSecurityManager()
-                ->allows(PageJobQueue::class, RoleConfiguration::MAIN,
-                    $currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canBan', $this->getSecurityManager()
+				->allows(PageBan::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canEmailMgmt', $this->getSecurityManager()
+				->allows(PageEmailManagement::class, RoleConfiguration::MAIN,
+					$currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canWelcomeMgmt', $this->getSecurityManager()
+				->allows(PageWelcomeTemplateManagement::class, RoleConfiguration::MAIN,
+					$currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canSiteNoticeMgmt', $this->getSecurityManager()
+				->allows(PageSiteNotice::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canUserMgmt', $this->getSecurityManager()
+				->allows(PageUserManagement::class, RoleConfiguration::MAIN,
+					$currentUser) === SecurityManager::ALLOWED);
+		$this->assign('nav__canJobQueue', $this->getSecurityManager()
+				->allows(PageJobQueue::class, RoleConfiguration::MAIN,
+					$currentUser) === SecurityManager::ALLOWED);
 
-        $this->assign('nav__canViewRequest', $this->getSecurityManager()
-                ->allows(PageViewRequest::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
-    }
+		$this->assign('nav__canViewRequest', $this->getSecurityManager()
+				->allows(PageViewRequest::class, RoleConfiguration::MAIN, $currentUser) === SecurityManager::ALLOWED);
+	}
 }
\ No newline at end of file

includes/Helpers/TypeAheadHelper.php

Indentation +31 added lines, -31 removed lines

@@ -12,21 +12,21 @@ 
 
 class TypeAheadHelper implements ITypeAheadHelper
 {
-    private $definedClasses = array();
+	private $definedClasses = array();
 
-    /**
-     * @param string   $class     CSS class to apply this typeahead to.
-     * @param callable $generator Generator function taking no arguments to return an array of strings.
-     */
-    public function defineTypeAheadSource($class, callable $generator)
-    {
-        $dataList = '';
-        foreach ($generator() as $dataItem) {
-            $dataList .= '"' . htmlentities($dataItem) . '", ';
-        }
-        $dataList = "[" . rtrim($dataList, ", ") . "]";
+	/**
+	 * @param string   $class     CSS class to apply this typeahead to.
+	 * @param callable $generator Generator function taking no arguments to return an array of strings.
+	 */
+	public function defineTypeAheadSource($class, callable $generator)
+	{
+		$dataList = '';
+		foreach ($generator() as $dataItem) {
+			$dataList .= '"' . htmlentities($dataItem) . '", ';
+		}
+		$dataList = "[" . rtrim($dataList, ", ") . "]";
 
-        $script = <<<JS
+		$script = <<<JS
 
 $('.{$class}').typeahead({
         hint: true,
@@ -39,32 +39,32 @@ 
 })
 ;
 JS;
-        $this->definedClasses[$class] = $script;
-    }
+		$this->definedClasses[$class] = $script;
+	}
 
-    /**
-     * @return string HTML fragment containing a JS block for typeaheads.
-     */
-    public function getTypeAheadScriptBlock()
-    {
-        $jsBlocks = '';
+	/**
+	 * @return string HTML fragment containing a JS block for typeaheads.
+	 */
+	public function getTypeAheadScriptBlock()
+	{
+		$jsBlocks = '';
 
-        if (count($this->definedClasses) === 0) {
-            return '';
-        }
+		if (count($this->definedClasses) === 0) {
+			return '';
+		}
 
-        foreach ($this->definedClasses as $class => $js) {
-            $jsBlocks = $js . "\r\n\r\n";
-        }
+		foreach ($this->definedClasses as $class => $js) {
+			$jsBlocks = $js . "\r\n\r\n";
+		}
 
-        $data = <<<HTML
+		$data = <<<HTML
 <script type="text/javascript">
 	{$jsBlocks}
 </script>
 HTML;
 
-        $this->definedClasses = array();
+		$this->definedClasses = array();
 
-        return $data;
-    }
+		return $data;
+	}
 }

includes/Helpers/RequestEmailHelper.php

Indentation +46 added lines, -46 removed lines

@@ -14,50 +14,50 @@
 
 class RequestEmailHelper
 {
-    /**
-     * @var IEmailHelper
-     */
-    private $emailHelper;
-
-    /**
-     * RequestEmailHelper constructor.
-     *
-     * @param IEmailHelper $emailHelper
-     */
-    public function __construct(IEmailHelper $emailHelper)
-    {
-        $this->emailHelper = $emailHelper;
-    }
-
-    /**
-     * @param Request $request
-     * @param string  $mailText
-     * @param User    $currentUser
-     * @param boolean $ccMailingList
-     */
-    public function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
-    {
-        $headers = array(
-            'X-ACC-Request' => $request->getId(),
-            'X-ACC-UserID'  => $currentUser->getId(),
-        );
-
-        if ($ccMailingList) {
-            $headers['Cc'] = 'accounts-enwiki-l@lists.wikimedia.org';
-        }
-
-        $helper = $this->emailHelper;
-
-        $emailSig = $currentUser->getEmailSig();
-        if ($emailSig !== '' || $emailSig !== null) {
-            $emailSig = "\n\n" . $emailSig;
-        }
-
-        $subject = "RE: [ACC #{$request->getId()}] English Wikipedia Account Request";
-        $content = $mailText . $emailSig;
-
-        $helper->sendMail($request->getEmail(), $subject, $content, $headers);
-
-        $request->setEmailSent(true);
-    }
+	/**
+	 * @var IEmailHelper
+	 */
+	private $emailHelper;
+
+	/**
+	 * RequestEmailHelper constructor.
+	 *
+	 * @param IEmailHelper $emailHelper
+	 */
+	public function __construct(IEmailHelper $emailHelper)
+	{
+		$this->emailHelper = $emailHelper;
+	}
+
+	/**
+	 * @param Request $request
+	 * @param string  $mailText
+	 * @param User    $currentUser
+	 * @param boolean $ccMailingList
+	 */
+	public function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
+	{
+		$headers = array(
+			'X-ACC-Request' => $request->getId(),
+			'X-ACC-UserID'  => $currentUser->getId(),
+		);
+
+		if ($ccMailingList) {
+			$headers['Cc'] = 'accounts-enwiki-l@lists.wikimedia.org';
+		}
+
+		$helper = $this->emailHelper;
+
+		$emailSig = $currentUser->getEmailSig();
+		if ($emailSig !== '' || $emailSig !== null) {
+			$emailSig = "\n\n" . $emailSig;
+		}
+
+		$subject = "RE: [ACC #{$request->getId()}] English Wikipedia Account Request";
+		$content = $mailText . $emailSig;
+
+		$helper->sendMail($request->getEmail(), $subject, $content, $headers);
+
+		$request->setEmailSent(true);
+	}
 }

includes/Helpers/OAuthProtocolHelper.php

Indentation +91 added lines, -91 removed lines

@@ -16,95 +16,95 @@
 
 class OAuthProtocolHelper implements Interfaces\IOAuthProtocolHelper
 {
-    private $oauthClient;
-
-    private $mediawikiWebServiceEndpoint;
-
-    private $authUrl;
-
-    /**
-     * OAuthHelper constructor.
-     *
-     * @param string     $oauthEndpoint
-     * @param string     $consumerKey
-     * @param string     $consumerSecret
-     * @param string     $mediawikiWebServiceEndpoint
-     */
-    public function __construct(
-        $oauthEndpoint,
-        $consumerKey,
-        $consumerSecret,
-        $mediawikiWebServiceEndpoint
-    ) {
-        $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
-
-        $oauthClientConfig = new ClientConfig($oauthEndpoint);
-        $oauthClientConfig->setConsumer(new Consumer($consumerKey, $consumerSecret));
-
-        $this->oauthClient = new Client($oauthClientConfig);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getRequestToken()
-    {
-        /** @var Token $requestToken */
-        list($authUrl, $requestToken) = $this->oauthClient->initiate();
-        $this->authUrl = $authUrl;
-        return $requestToken;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getAuthoriseUrl($requestToken)
-    {
-        return $this->authUrl;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier)
-    {
-        $requestToken = new Token($oauthRequestToken, $oauthRequestSecret);
-
-        return $this->oauthClient->complete($requestToken, $oauthVerifier);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret)
-    {
-        return $this->oauthClient->identify(new Token($oauthAccessToken, $oauthAccessSecret));
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function apiCall($apiParams, $accessToken, $accessSecret, $method = 'GET')
-    {
-        $userToken = new Token($accessToken, $accessSecret);
-
-        $apiParams['format'] = 'json';
-
-        if ($apiParams === null || ! is_array($apiParams)) {
-            throw new CurlException("Invalid API call");
-        }
-
-        $url = $this->mediawikiWebServiceEndpoint;
-        $isPost = ($method === 'POST');
-
-        if ($method === 'GET') {
-            $query = http_build_query($apiParams);
-            $url .= '?' . $query;
-            $apiParams = null;
-        }
-
-        $data = $this->oauthClient->makeOAuthCall($userToken, $url, $isPost, $apiParams);
-
-        return json_decode($data);
-    }
+	private $oauthClient;
+
+	private $mediawikiWebServiceEndpoint;
+
+	private $authUrl;
+
+	/**
+	 * OAuthHelper constructor.
+	 *
+	 * @param string     $oauthEndpoint
+	 * @param string     $consumerKey
+	 * @param string     $consumerSecret
+	 * @param string     $mediawikiWebServiceEndpoint
+	 */
+	public function __construct(
+		$oauthEndpoint,
+		$consumerKey,
+		$consumerSecret,
+		$mediawikiWebServiceEndpoint
+	) {
+		$this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
+
+		$oauthClientConfig = new ClientConfig($oauthEndpoint);
+		$oauthClientConfig->setConsumer(new Consumer($consumerKey, $consumerSecret));
+
+		$this->oauthClient = new Client($oauthClientConfig);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getRequestToken()
+	{
+		/** @var Token $requestToken */
+		list($authUrl, $requestToken) = $this->oauthClient->initiate();
+		$this->authUrl = $authUrl;
+		return $requestToken;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getAuthoriseUrl($requestToken)
+	{
+		return $this->authUrl;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier)
+	{
+		$requestToken = new Token($oauthRequestToken, $oauthRequestSecret);
+
+		return $this->oauthClient->complete($requestToken, $oauthVerifier);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret)
+	{
+		return $this->oauthClient->identify(new Token($oauthAccessToken, $oauthAccessSecret));
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function apiCall($apiParams, $accessToken, $accessSecret, $method = 'GET')
+	{
+		$userToken = new Token($accessToken, $accessSecret);
+
+		$apiParams['format'] = 'json';
+
+		if ($apiParams === null || ! is_array($apiParams)) {
+			throw new CurlException("Invalid API call");
+		}
+
+		$url = $this->mediawikiWebServiceEndpoint;
+		$isPost = ($method === 'POST');
+
+		if ($method === 'GET') {
+			$query = http_build_query($apiParams);
+			$url .= '?' . $query;
+			$apiParams = null;
+		}
+
+		$data = $this->oauthClient->makeOAuthCall($userToken, $url, $isPost, $apiParams);
+
+		return json_decode($data);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
         $apiParams['format'] = 'json';
 
-        if ($apiParams === null || ! is_array($apiParams)) {
+        if ($apiParams === null || !is_array($apiParams)) {
             throw new CurlException("Invalid API call");
         }
 

includes/Helpers/BotMediaWikiClient.php

Indentation +131 added lines, -131 removed lines

@@ -16,135 +16,135 @@
 
 class BotMediaWikiClient implements IMediaWikiClient
 {
-    /**
-     * @var HttpHelper
-     */
-    private $httpHelper;
-    /** @var string */
-    private $mediawikiWebServiceEndpoint;
-    /** @var string */
-    private $creationBotUsername;
-    /** @var string */
-    private $creationBotPassword;
-    /** @var bool */
-    private $knownLoggedIn = false;
-
-    /**
-     * BotMediaWikiClient constructor.
-     *
-     * @param SiteConfiguration $siteConfiguration
-     */
-    public function __construct(SiteConfiguration $siteConfiguration)
-    {
-        $this->mediawikiWebServiceEndpoint = $siteConfiguration->getMediawikiWebServiceEndpoint();
-
-        $this->creationBotUsername = $siteConfiguration->getCreationBotUsername();
-        $this->creationBotPassword = $siteConfiguration->getCreationBotPassword();
-
-        $this->httpHelper = new HttpHelper(
-            $siteConfiguration,
-            $siteConfiguration->getCurlCookieJar()
-        );
-    }
-
-    public function doApiCall($apiParams, $method = 'GET')
-    {
-        $this->ensureLoggedIn();
-        $apiParams['assert'] = 'user';
-
-        return $this->callApi($apiParams, $method);
-    }
-
-    private function ensureLoggedIn()
-    {
-        if ($this->knownLoggedIn) {
-            return;
-        }
-
-        $userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
-        if (isset($userinfoResult->query->userinfo->anon)) {
-            // not logged in.
-            $this->logIn();
-
-            // retest
-            $userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
-            if (isset($userinfoResult->query->userinfo->anon)) {
-                throw new MediaWikiApiException('Unable to log in.');
-            }
-            else {
-                $this->knownLoggedIn = true;
-            }
-        }
-        else {
-            $this->knownLoggedIn = true;
-        }
-    }
-
-    /**
-     * @param $apiParams
-     * @param $method
-     *
-     * @return mixed
-     * @throws ApplicationLogicException
-     * @throws CurlException
-     */
-    private function callApi($apiParams, $method)
-    {
-        $apiParams['format'] = 'json';
-
-        if ($method == 'GET') {
-            $data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, $apiParams);
-        }
-        elseif ($method == 'POST') {
-            $data = $this->httpHelper->post($this->mediawikiWebServiceEndpoint, $apiParams);
-        }
-        else {
-            throw new ApplicationLogicException('Unsupported HTTP Method');
-        }
-
-        if ($data === false) {
-            throw new CurlException('Curl error: ' . $this->httpHelper->getError());
-        }
-
-        $result = json_decode($data);
-
-        return $result;
-    }
-
-    private function logIn()
-    {
-        // get token
-        $tokenParams = array(
-            'action' => 'query',
-            'meta'   => 'tokens',
-            'type'   => 'login',
-        );
-
-        $response = $this->callApi($tokenParams, 'POST');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $token = $response->query->tokens->logintoken;
-
-        if ($token === null) {
-            throw new MediaWikiApiException('Edit token could not be acquired');
-        }
-
-        $params = array(
-            'action' => 'login',
-            'lgname' => $this->creationBotUsername,
-            'lgpassword' => $this->creationBotPassword,
-            'lgtoken' => $token,
-        );
-
-        $loginResponse = $this->callApi($params, 'POST');
-
-        if($loginResponse->login->result == 'Success'){
-            return;
-        }
-
-        throw new ApplicationLogicException(json_encode($loginResponse));
-    }
+	/**
+	 * @var HttpHelper
+	 */
+	private $httpHelper;
+	/** @var string */
+	private $mediawikiWebServiceEndpoint;
+	/** @var string */
+	private $creationBotUsername;
+	/** @var string */
+	private $creationBotPassword;
+	/** @var bool */
+	private $knownLoggedIn = false;
+
+	/**
+	 * BotMediaWikiClient constructor.
+	 *
+	 * @param SiteConfiguration $siteConfiguration
+	 */
+	public function __construct(SiteConfiguration $siteConfiguration)
+	{
+		$this->mediawikiWebServiceEndpoint = $siteConfiguration->getMediawikiWebServiceEndpoint();
+
+		$this->creationBotUsername = $siteConfiguration->getCreationBotUsername();
+		$this->creationBotPassword = $siteConfiguration->getCreationBotPassword();
+
+		$this->httpHelper = new HttpHelper(
+			$siteConfiguration,
+			$siteConfiguration->getCurlCookieJar()
+		);
+	}
+
+	public function doApiCall($apiParams, $method = 'GET')
+	{
+		$this->ensureLoggedIn();
+		$apiParams['assert'] = 'user';
+
+		return $this->callApi($apiParams, $method);
+	}
+
+	private function ensureLoggedIn()
+	{
+		if ($this->knownLoggedIn) {
+			return;
+		}
+
+		$userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
+		if (isset($userinfoResult->query->userinfo->anon)) {
+			// not logged in.
+			$this->logIn();
+
+			// retest
+			$userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
+			if (isset($userinfoResult->query->userinfo->anon)) {
+				throw new MediaWikiApiException('Unable to log in.');
+			}
+			else {
+				$this->knownLoggedIn = true;
+			}
+		}
+		else {
+			$this->knownLoggedIn = true;
+		}
+	}
+
+	/**
+	 * @param $apiParams
+	 * @param $method
+	 *
+	 * @return mixed
+	 * @throws ApplicationLogicException
+	 * @throws CurlException
+	 */
+	private function callApi($apiParams, $method)
+	{
+		$apiParams['format'] = 'json';
+
+		if ($method == 'GET') {
+			$data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, $apiParams);
+		}
+		elseif ($method == 'POST') {
+			$data = $this->httpHelper->post($this->mediawikiWebServiceEndpoint, $apiParams);
+		}
+		else {
+			throw new ApplicationLogicException('Unsupported HTTP Method');
+		}
+
+		if ($data === false) {
+			throw new CurlException('Curl error: ' . $this->httpHelper->getError());
+		}
+
+		$result = json_decode($data);
+
+		return $result;
+	}
+
+	private function logIn()
+	{
+		// get token
+		$tokenParams = array(
+			'action' => 'query',
+			'meta'   => 'tokens',
+			'type'   => 'login',
+		);
+
+		$response = $this->callApi($tokenParams, 'POST');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$token = $response->query->tokens->logintoken;
+
+		if ($token === null) {
+			throw new MediaWikiApiException('Edit token could not be acquired');
+		}
+
+		$params = array(
+			'action' => 'login',
+			'lgname' => $this->creationBotUsername,
+			'lgpassword' => $this->creationBotPassword,
+			'lgtoken' => $token,
+		);
+
+		$loginResponse = $this->callApi($params, 'POST');
+
+		if($loginResponse->login->result == 'Success'){
+			return;
+		}
+
+		throw new ApplicationLogicException(json_encode($loginResponse));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 
         $loginResponse = $this->callApi($params, 'POST');
 
-        if($loginResponse->login->result == 'Success'){
+        if ($loginResponse->login->result == 'Success') {
             return;
         }
 

Braces +5 added lines, -9 removed lines

@@ -70,12 +70,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;
         }
     }
@@ -94,11 +92,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');
         }
 
@@ -141,7 +137,7 @@ 
 
         $loginResponse = $this->callApi($params, 'POST');
 
-        if($loginResponse->login->result == 'Success'){
+        if($loginResponse->login->result == 'Success') {
             return;
         }
 

includes/Helpers/MediaWikiHelper.php

Indentation +241 added lines, -241 removed lines

@@ -15,245 +15,245 @@
 
 class MediaWikiHelper
 {
-    /**
-     * @var IMediaWikiClient
-     */
-    private $mediaWikiClient;
-    /**
-     * @var SiteConfiguration
-     */
-    private $siteConfiguration;
-
-    /**
-     * MediaWikiHelper constructor.
-     *
-     * @param IMediaWikiClient  $mediaWikiClient
-     * @param SiteConfiguration $siteConfiguration
-     */
-    public function __construct(IMediaWikiClient $mediaWikiClient, SiteConfiguration $siteConfiguration)
-    {
-        $this->mediaWikiClient = $mediaWikiClient;
-        $this->siteConfiguration = $siteConfiguration;
-    }
-
-    /**
-     * @todo handle override antispoof and titleblacklist issues
-     *
-     * @param string $username
-     * @param string $emailAddress
-     * @param string $reason
-     *
-     * @throws Exception
-     * @throws MediaWikiApiException
-     */
-    public function createAccount($username, $emailAddress, $reason)
-    {
-        // get token
-        $tokenParams = array(
-            'action' => 'query',
-            'meta'   => 'tokens',
-            'type'   => 'createaccount',
-        );
-
-        $response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $token = $response->query->tokens->createaccounttoken;
-
-        $callback = $this->siteConfiguration->getBaseUrl() . '/internal.php/oauth/createCallback';
-
-        $checkboxFields = array();
-        $requiredFields = array();
-        $this->getCreationFieldData($requiredFields, $checkboxFields);
-
-        $apiCallData = array(
-            'action'              => 'createaccount',
-            'createreturnurl'     => $callback,
-            'createtoken'         => $token,
-            'createmessageformat' => 'html',
-        );
-
-        $createParams = array_fill_keys($requiredFields, '') + $apiCallData;
-
-        $createParams['username'] = $username;
-        $createParams['mailpassword'] = true;
-        $createParams['email'] = $emailAddress;
-        $createParams['reason'] = $reason;
-
-        $createResponse = $this->mediaWikiClient->doApiCall($createParams, 'POST');
-
-        if (isset($createResponse->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        if (!isset($createResponse->createaccount) || !isset($createResponse->createaccount->status)) {
-            throw new MediaWikiApiException('Unknown error creating account');
-        }
-
-        if ($createResponse->createaccount->status === 'FAIL') {
-            throw new MediaWikiApiException($createResponse->createaccount->message);
-        }
-
-        if ($createResponse->createaccount->status === 'PASS') {
-            // success!
-            return;
-        }
-
-        throw new Exception('API result reported status of ' . $createResponse->createaccount->status);
-    }
-
-    /**
-     * @param string $username
-     * @param string $title
-     * @param        $summary
-     * @param string $message
-     * @param bool   $createOnly
-     *
-     * @throws MediaWikiApiException
-     */
-    public function addTalkPageMessage($username, $title, $summary, $message, $createOnly = true)
-    {
-        // get token
-        $tokenParams = array(
-            'action' => 'query',
-            'meta'   => 'tokens',
-            'type'   => 'csrf',
-        );
-
-        $response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $token = $response->query->tokens->csrftoken;
-
-        if ($token === null) {
-            throw new MediaWikiApiException('Edit token could not be acquired');
-        }
-
-        $editParameters = array(
-            'action'       => 'edit',
-            'title'        => 'User talk:' . $username,
-            'section'      => 'new',
-            'sectiontitle' => $title,
-            'summary'      => $summary,
-            'text'         => $message,
-            'token'        => $token,
-        );
-
-        if ($createOnly) {
-            $editParameters['createonly'] = true;
-        }
-
-        $response = $this->mediaWikiClient->doApiCall($editParameters, 'POST');
-
-        if (!isset($response->edit)) {
-            if (isset($response->error)) {
-                throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-            }
-
-            throw new MediaWikiApiException('Unknown error encountered during editing.');
-        }
-
-        $editResponse = $response->edit;
-        if ($editResponse->result === "Success") {
-            return;
-        }
-
-        throw new MediaWikiApiException('Edit status unsuccessful: ' . $editResponse->result);
-    }
-
-    public function getCreationFieldData(&$requiredFields, &$checkboxFields)
-    {
-        // get token
-        $params = array(
-            'action'         => 'query',
-            'meta'           => 'authmanagerinfo',
-            'amirequestsfor' => 'create',
-        );
-
-        $response = $this->mediaWikiClient->doApiCall($params, 'GET');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $requests = $response->query->authmanagerinfo->requests;
-
-        // We don't want to deal with these providers ever.
-        $discardList = array(
-            // Requires a username and password
-            'MediaWiki\\Auth\\PasswordAuthenticationRequest',
-        );
-
-        // We require these providers to function
-        $requireList = array(
-            'MediaWiki\\Auth\\TemporaryPasswordAuthenticationRequest',
-            'MediaWiki\\Auth\\UsernameAuthenticationRequest',
-            'MediaWiki\\Auth\\UserDataAuthenticationRequest',
-            'MediaWiki\\Auth\\CreationReasonAuthenticationRequest',
-        );
-
-        $requiredFields = array();
-        // Keep checkbox fields separate, since "required" actually means optional as absent == false.
-        $checkboxFields = array();
-
-        foreach ($requests as $req) {
-            // Immediately discard anything that is on the discard list.
-            if (in_array($req->id, $discardList)) {
-                continue;
-            }
-
-            $required = false;
-
-            if ($req->required === 'primary-required' && !in_array($req->id, $requireList)) {
-                // Only want one.
-                continue;
-            }
-
-            if (in_array($req->id, $requireList)) {
-                unset($requireList[$req->id]);
-                $required = true;
-            }
-
-            if ($req->required === 'required') {
-                $required = true;
-            }
-
-            if ($required) {
-                foreach ($req->fields as $name => $data) {
-                    if ($data->type === 'checkbox') {
-                        $checkboxFields[] = $name;
-                    }
-                    else {
-                        $requiredFields[] = $name;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $username
-     * @return bool
-     */
-    public function checkAccountExists($username) {
-        $parameters = array(
-            'action'  => 'query',
-            'list'    => 'users',
-            'format'  => 'php',
-            'ususers' => $username,
-        );
-
-        $apiResult = $this->mediaWikiClient->doApiCall($parameters, 'GET');
-
-        $entry = $apiResult->query->users[0];
-        $exists = !isset($entry->missing);
-
-        return $exists;
-    }
+	/**
+	 * @var IMediaWikiClient
+	 */
+	private $mediaWikiClient;
+	/**
+	 * @var SiteConfiguration
+	 */
+	private $siteConfiguration;
+
+	/**
+	 * MediaWikiHelper constructor.
+	 *
+	 * @param IMediaWikiClient  $mediaWikiClient
+	 * @param SiteConfiguration $siteConfiguration
+	 */
+	public function __construct(IMediaWikiClient $mediaWikiClient, SiteConfiguration $siteConfiguration)
+	{
+		$this->mediaWikiClient = $mediaWikiClient;
+		$this->siteConfiguration = $siteConfiguration;
+	}
+
+	/**
+	 * @todo handle override antispoof and titleblacklist issues
+	 *
+	 * @param string $username
+	 * @param string $emailAddress
+	 * @param string $reason
+	 *
+	 * @throws Exception
+	 * @throws MediaWikiApiException
+	 */
+	public function createAccount($username, $emailAddress, $reason)
+	{
+		// get token
+		$tokenParams = array(
+			'action' => 'query',
+			'meta'   => 'tokens',
+			'type'   => 'createaccount',
+		);
+
+		$response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$token = $response->query->tokens->createaccounttoken;
+
+		$callback = $this->siteConfiguration->getBaseUrl() . '/internal.php/oauth/createCallback';
+
+		$checkboxFields = array();
+		$requiredFields = array();
+		$this->getCreationFieldData($requiredFields, $checkboxFields);
+
+		$apiCallData = array(
+			'action'              => 'createaccount',
+			'createreturnurl'     => $callback,
+			'createtoken'         => $token,
+			'createmessageformat' => 'html',
+		);
+
+		$createParams = array_fill_keys($requiredFields, '') + $apiCallData;
+
+		$createParams['username'] = $username;
+		$createParams['mailpassword'] = true;
+		$createParams['email'] = $emailAddress;
+		$createParams['reason'] = $reason;
+
+		$createResponse = $this->mediaWikiClient->doApiCall($createParams, 'POST');
+
+		if (isset($createResponse->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		if (!isset($createResponse->createaccount) || !isset($createResponse->createaccount->status)) {
+			throw new MediaWikiApiException('Unknown error creating account');
+		}
+
+		if ($createResponse->createaccount->status === 'FAIL') {
+			throw new MediaWikiApiException($createResponse->createaccount->message);
+		}
+
+		if ($createResponse->createaccount->status === 'PASS') {
+			// success!
+			return;
+		}
+
+		throw new Exception('API result reported status of ' . $createResponse->createaccount->status);
+	}
+
+	/**
+	 * @param string $username
+	 * @param string $title
+	 * @param        $summary
+	 * @param string $message
+	 * @param bool   $createOnly
+	 *
+	 * @throws MediaWikiApiException
+	 */
+	public function addTalkPageMessage($username, $title, $summary, $message, $createOnly = true)
+	{
+		// get token
+		$tokenParams = array(
+			'action' => 'query',
+			'meta'   => 'tokens',
+			'type'   => 'csrf',
+		);
+
+		$response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$token = $response->query->tokens->csrftoken;
+
+		if ($token === null) {
+			throw new MediaWikiApiException('Edit token could not be acquired');
+		}
+
+		$editParameters = array(
+			'action'       => 'edit',
+			'title'        => 'User talk:' . $username,
+			'section'      => 'new',
+			'sectiontitle' => $title,
+			'summary'      => $summary,
+			'text'         => $message,
+			'token'        => $token,
+		);
+
+		if ($createOnly) {
+			$editParameters['createonly'] = true;
+		}
+
+		$response = $this->mediaWikiClient->doApiCall($editParameters, 'POST');
+
+		if (!isset($response->edit)) {
+			if (isset($response->error)) {
+				throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+			}
+
+			throw new MediaWikiApiException('Unknown error encountered during editing.');
+		}
+
+		$editResponse = $response->edit;
+		if ($editResponse->result === "Success") {
+			return;
+		}
+
+		throw new MediaWikiApiException('Edit status unsuccessful: ' . $editResponse->result);
+	}
+
+	public function getCreationFieldData(&$requiredFields, &$checkboxFields)
+	{
+		// get token
+		$params = array(
+			'action'         => 'query',
+			'meta'           => 'authmanagerinfo',
+			'amirequestsfor' => 'create',
+		);
+
+		$response = $this->mediaWikiClient->doApiCall($params, 'GET');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$requests = $response->query->authmanagerinfo->requests;
+
+		// We don't want to deal with these providers ever.
+		$discardList = array(
+			// Requires a username and password
+			'MediaWiki\\Auth\\PasswordAuthenticationRequest',
+		);
+
+		// We require these providers to function
+		$requireList = array(
+			'MediaWiki\\Auth\\TemporaryPasswordAuthenticationRequest',
+			'MediaWiki\\Auth\\UsernameAuthenticationRequest',
+			'MediaWiki\\Auth\\UserDataAuthenticationRequest',
+			'MediaWiki\\Auth\\CreationReasonAuthenticationRequest',
+		);
+
+		$requiredFields = array();
+		// Keep checkbox fields separate, since "required" actually means optional as absent == false.
+		$checkboxFields = array();
+
+		foreach ($requests as $req) {
+			// Immediately discard anything that is on the discard list.
+			if (in_array($req->id, $discardList)) {
+				continue;
+			}
+
+			$required = false;
+
+			if ($req->required === 'primary-required' && !in_array($req->id, $requireList)) {
+				// Only want one.
+				continue;
+			}
+
+			if (in_array($req->id, $requireList)) {
+				unset($requireList[$req->id]);
+				$required = true;
+			}
+
+			if ($req->required === 'required') {
+				$required = true;
+			}
+
+			if ($required) {
+				foreach ($req->fields as $name => $data) {
+					if ($data->type === 'checkbox') {
+						$checkboxFields[] = $name;
+					}
+					else {
+						$requiredFields[] = $name;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param string $username
+	 * @return bool
+	 */
+	public function checkAccountExists($username) {
+		$parameters = array(
+			'action'  => 'query',
+			'list'    => 'users',
+			'format'  => 'php',
+			'ususers' => $username,
+		);
+
+		$apiResult = $this->mediaWikiClient->doApiCall($parameters, 'GET');
+
+		$entry = $apiResult->query->users[0];
+		$exists = !isset($entry->missing);
+
+		return $exists;
+	}
 }

Braces +3 added lines, -3 removed lines

@@ -228,8 +228,7 @@ 
                 foreach ($req->fields as $name => $data) {
                     if ($data->type === 'checkbox') {
                         $checkboxFields[] = $name;
-                    }
-                    else {
+                    } else {
                         $requiredFields[] = $name;
                     }
                 }
@@ -241,7 +240,8 @@ 
      * @param string $username
      * @return bool
      */
-    public function checkAccountExists($username) {
+    public function checkAccountExists($username)
+    {
         $parameters = array(
             'action'  => 'query',
             'list'    => 'users',