enwikipedia-acc / waca

includes/Helpers/SearchHelpers/SearchHelperBase.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
      * @param string $column The required column
      * @return array
      */
-    public function fetchColumn($column){
+    public function fetchColumn($column) {
         $statement = $this->getData($column);
 
         return $statement->fetchAll(PDO::FETCH_COLUMN);
@@ -90,8 +90,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);
@@ -138,7 +138,7 @@ 
     private function applyOrder()
     {
         if ($this->orderBy !== null) {
-            return ' ORDER BY ' . $this->orderBy;
+            return ' ORDER BY '.$this->orderBy;
         }
 
         return '';
@@ -168,8 +168,8 @@ 
      */
     protected function buildQuery($column)
     {
-        $query = 'SELECT /* SearchHelper */ origin.' . $column . ' FROM ' . $this->table . ' origin ';
-        $query .= $this->joinClause . $this->whereClause;
+        $query = 'SELECT /* SearchHelper */ origin.'.$column.' FROM '.$this->table.' origin ';
+        $query .= $this->joinClause.$this->whereClause;
 
         return $query;
     }
@@ -188,7 +188,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);

Braces +6 added lines, -3 removed lines

@@ -77,7 +77,8 @@ 
      * @param string $column The required column
      * @return array
      */
-    public function fetchColumn($column){
+    public function fetchColumn($column)
+    {
         $statement = $this->getData($column);
 
         return $statement->fetchAll(PDO::FETCH_COLUMN);
@@ -174,12 +175,14 @@ 
         return $query;
     }
 
-    public function inIds($idList) {
+    public function inIds($idList)
+    {
         $this->inClause('id', $idList);
         return $this;
     }
 
-    protected function inClause($column, $values) {
+    protected function inClause($column, $values)
+    {
         if (count($values) === 0) {
             return;
         }

includes/Tasks/PageBase.php

Spacing +6 added lines, -6 removed lines

@@ -219,7 +219,7 @@ 
             $targetScriptName = $currentScriptName;
         }
         else {
-            $targetScriptName = $this->getSiteConfiguration()->getBaseUrl() . '/' . $script;
+            $targetScriptName = $this->getSiteConfiguration()->getBaseUrl().'/'.$script;
         }
 
         $pathInfo = array($targetScriptName);
@@ -233,7 +233,7 @@ 
         $url = implode('/', $pathInfo);
 
         if (is_array($parameters) && count($parameters) > 0) {
-            $url .= '?' . http_build_query($parameters);
+            $url .= '?'.http_build_query($parameters);
         }
 
         $this->redirectUrl($url);
@@ -278,7 +278,7 @@ 
      * @param string $path The path (relative to the application root) of the file
      */
     final protected function addCss($path) {
-        if(in_array($path, $this->extraCss)){
+        if (in_array($path, $this->extraCss)) {
             // nothing to do
             return;
         }
@@ -291,8 +291,8 @@ 
      *
      * @param string $path The path (relative to the application root) of the file
      */
-    final protected function addJs($path){
-        if(in_array($path, $this->extraJs)){
+    final protected function addJs($path) {
+        if (in_array($path, $this->extraJs)) {
             // nothing to do
             return;
         }
@@ -345,7 +345,7 @@ 
     protected function sendResponseHeaders()
     {
         if (headers_sent()) {
-            throw new ApplicationLogicException          ('Headers have already been sent! This is likely a bug in the application.');
+            throw new ApplicationLogicException('Headers have already been sent! This is likely a bug in the application.');
         }
 
         foreach ($this->headerQueue as $item) {

Braces +6 added lines, -4 removed lines

@@ -277,8 +277,9 @@ 
      *
      * @param string $path The path (relative to the application root) of the file
      */
-    final protected function addCss($path) {
-        if(in_array($path, $this->extraCss)){
+    final protected function addCss($path)
+    {
+        if(in_array($path, $this->extraCss)) {
             // nothing to do
             return;
         }
@@ -291,8 +292,9 @@ 
      *
      * @param string $path The path (relative to the application root) of the file
      */
-    final protected function addJs($path){
-        if(in_array($path, $this->extraJs)){
+    final protected function addJs($path)
+    {
+        if(in_array($path, $this->extraJs)) {
             // nothing to do
             return;
         }

includes/IdentificationVerifier.php

Braces +2 added lines, -1 removed lines

@@ -187,7 +187,8 @@
             $endpoint = $this->siteConfiguration->getMetaWikimediaWebServiceEndpoint();
             $response = $this->httpHelper->get($endpoint, $parameters);
             $response = json_decode($response, true);
-        } catch (CurlException $ex) {
+        }
+        catch (CurlException $ex) {
             // failed getting identification status, so throw a nicer error.
             $m = 'Could not contact metawiki API to determine user\' identification status. '
                 . 'This is probably a transient error, so please try again.';

Spacing +2 added lines, -2 removed lines

@@ -181,7 +181,7 @@ 
         $onWikiName = $strings->ucfirst($onWikiName);
 
         $parameters = self::$apiQueryParameters;
-        $parameters['pltitles'] = "User:" . $onWikiName;
+        $parameters['pltitles'] = "User:".$onWikiName;
 
         try {
             $endpoint = $this->siteConfiguration->getMetaWikimediaWebServiceEndpoint();
@@ -197,6 +197,6 @@ 
 
         $page = @array_pop($response['query']['pages']);
 
-        return @$page['links'][0]['title'] === "User:" . $onWikiName;
+        return @$page['links'][0]['title'] === "User:".$onWikiName;
     }
 }