mdaniels5757 / waca

includes/Fragments/NavigationMenuAccessControl.php

Doc Comments +5 added lines, -1 removed lines

@@ -24,6 +24,10 @@ 
 
 trait NavigationMenuAccessControl
 {
+    /**
+     * @param string $name
+     * @param boolean $value
+     */
     protected abstract function assign($name, $value);
 
     /**
@@ -32,7 +36,7 @@ 
     protected abstract function getSecurityManager();
 
     /**
-     * @param $currentUser
+     * @param \Waca\DataObjects\User $currentUser
      */
     protected function setupNavMenuAccess($currentUser)
     {

includes/Fragments/RequestData.php

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
     /**
      * Assigns a Smarty variable
      *
-     * @param  array|string $name  the template variable name(s)
+     * @param  string $name  the template variable name(s)
      * @param  mixed        $value the value to assign
      */
     abstract protected function assign($name, $value);

Braces +1 added lines, -2 removed lines

@@ -295,8 +295,7 @@
                 if (!$proxyIsInPrivateRange) {
                     $proxyReverseDns = $this->getRdnsProvider()->getReverseDNS($proxyAddress);
                     $proxyLocation = $this->getLocationProvider()->getIpLocation($proxyAddress);
-                }
-                else {
+                } else {
                     // this is going to fail, so why bother trying?
                     $proxyReverseDns = false;
                     $proxyLocation = false;

includes/Pages/Registration/PageRegisterBase.php

Doc Comments +8 added lines, -5 removed lines

@@ -44,6 +44,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     protected abstract function getRegistrationTemplate();
 
     protected function isProtectedPage()
@@ -70,12 +73,12 @@ 
     }
 
     /**
-     * @param $emailAddress
-     * @param $password
-     * @param $username
+     * @param null|string $emailAddress
+     * @param null|string $password
+     * @param null|string $username
      * @param $useOAuthSignup
-     * @param $confirmationId
-     * @param $onwikiUsername
+     * @param null|integer $confirmationId
+     * @param null|string $onwikiUsername
      *
      * @throws ApplicationLogicException
      */

Braces +2 added lines, -4 removed lines

@@ -36,8 +36,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect('register');
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign("useOAuthSignup", $useOAuthSignup);
             $this->setTemplate($this->getRegistrationTemplate());
@@ -198,8 +197,7 @@ 
             WebRequest::setPartialLogin($user);
 
             $this->redirectUrl($oauthHelper->getAuthoriseUrl($requestToken->key));
-        }
-        else {
+        } else {
             // only notify if we're not using the oauth signup.
             $this->getNotificationHelper()->userNew($user);
             WebRequest::setLoggedInUser($user);

includes/Router/PublicRequestRouter.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     /**
      * Gets the default route if no explicit route is requested.
      *
-     * @return callable
+     * @return string[]
      */
     protected function getDefaultRoute()
     {

includes/Router/RequestRouter.php

Doc Comments +1 added lines, -1 removed lines

@@ -440,7 +440,7 @@
     }
 
     /**
-     * @return callable
+     * @return string[]
      */
     protected function getDefaultRoute()
     {

Braces +5 added lines, -10 removed lines

@@ -340,8 +340,7 @@ 
         if (count($pathInfo) === 0) {
             // No pathInfo, so no page to load. Load the main page.
             return $this->getDefaultRoute();
-        }
-        elseif (count($pathInfo) === 1) {
+        } elseif (count($pathInfo) === 1) {
             // Exactly one path info segment, it's got to be a page.
             $classSegment = $pathInfo[0];
 
@@ -353,8 +352,7 @@ 
             // Let's handle more than two, and collapse it down into two.
             $requestedAction = array_pop($pathInfo);
             $classSegment = implode('/', $pathInfo);
-        }
-        else {
+        } else {
             // Two path info segments.
             $classSegment = $pathInfo[0];
             $requestedAction = $pathInfo[1];
@@ -383,8 +381,7 @@ 
             $action = 'main';
 
             return array($pageClass, $action);
-        }
-        else {
+        } else {
             // Doesn't exist in map. Fall back to 404
             $pageClass = Page404::class;
             $action = "main";
@@ -413,16 +410,14 @@ 
                 $action = $requestedAction;
 
                 return array($pageClass, $action);
-            }
-            else {
+            } else {
                 // Valid page, invalid action. 404 our way out.
                 $pageClass = Page404::class;
                 $action = 'main';
 
                 return array($pageClass, $action);
             }
-        }
-        else {
+        } else {
             // Class doesn't exist in map. Fall back to 404
             $pageClass = Page404::class;
             $action = 'main';

smarty-plugins/modifier.date.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
         $dateString = $date->format('Y-m-d H:i:s');
 
         return $dateString;
-    }
-    else {
+    } else {
         return $input;
     }
 }
\ No newline at end of file

smarty-plugins/modifier.relativedate.php

Braces +9 added lines, -18 removed lines

@@ -22,8 +22,7 @@ 
         && (get_class($input) === DateTime::class || get_class($input) === DateTimeImmutable::class)
     ) {
         $then = $input;
-    }
-    else {
+    } else {
         $then = new DateTime($input);
     }
 
@@ -48,29 +47,21 @@ 
     if ($secs <= 10) {
         $output = "just now";
         $pluralise = false;
-    }
-    elseif ($secs > 10 && $secs < $minuteCut) {
+    } elseif ($secs > 10 && $secs < $minuteCut) {
         $output = round($secs / $second) . " second";
-    }
-    elseif ($secs >= $minuteCut && $secs < $hourCut) {
+    } elseif ($secs >= $minuteCut && $secs < $hourCut) {
         $output = round($secs / $minute) . " minute";
-    }
-    elseif ($secs >= $hourCut && $secs < $dayCut) {
+    } elseif ($secs >= $hourCut && $secs < $dayCut) {
         $output = round($secs / $hour) . " hour";
-    }
-    elseif ($secs >= $dayCut && $secs < $weekCut) {
+    } elseif ($secs >= $dayCut && $secs < $weekCut) {
         $output = round($secs / $day) . " day";
-    }
-    elseif ($secs >= $weekCut && $secs < $monthCut) {
+    } elseif ($secs >= $weekCut && $secs < $monthCut) {
         $output = round($secs / $week) . " week";
-    }
-    elseif ($secs >= $monthCut && $secs < $yearCut) {
+    } elseif ($secs >= $monthCut && $secs < $yearCut) {
         $output = round($secs / $month) . " month";
-    }
-    elseif ($secs >= $yearCut && $secs < $year * 10) {
+    } elseif ($secs >= $yearCut && $secs < $year * 10) {
         $output = round($secs / $year) . " year";
-    }
-    else {
+    } else {
         $output = "a long time ago";
         $pluralise = false;
     }

includes/ExceptionHandler.php

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
             ob_end_clean();
 
             $message = str_replace('$2$', $textErrorData, $message);
-        }
-        else {
+        } else {
             $message = str_replace('$2$', "", $message);
         }
 

includes/Helpers/LogHelper.php

Braces +3 added lines, -3 removed lines

@@ -52,7 +52,8 @@ 
          *
          * @return int
          */
-        $sortKey = function(DataObject $item) {
+        $sortKey = function(DataObject $item)
+        {
             if ($item instanceof Log) {
                 return $item->getTimestamp()->getTimestamp();
             }
@@ -296,8 +297,7 @@ 
                 // some old templates have been completely deleted and lost to the depths of time.
                 if ($welcomeTemplate === false) {
                     return "Welcome template #{$objectId}";
-                }
-                else {
+                } else {
                     $userCode = htmlentities($welcomeTemplate->getUserCode(), ENT_COMPAT, 'UTF-8');
 
                     return "<a href=\"{$baseurl}/internal.php/welcomeTemplates/view?template={$objectId}\">{$userCode}</a>";