stwalkerster / waca

includes/Helpers/Logger.php

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

@@ -6,9 +6,9 @@
 use Waca\DataObjects\Ban;
 use Waca\DataObjects\Comment;
 use Waca\DataObjects\EmailTemplate;
-use Waca\DataObjects\SiteNotice;
 use Waca\DataObjects\Log;
 use Waca\DataObjects\Request;
+use Waca\DataObjects\SiteNotice;
 use Waca\DataObjects\User;
 use Waca\DataObjects\WelcomeTemplate;
 use Waca\PdoDatabase;

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		}
 
 		$objectType = get_class($object);
-		if(strpos($objectType, 'Waca\\DataObjects\\') !== false)
+		if (strpos($objectType, 'Waca\\DataObjects\\') !== false)
 		{
 			$objectType = str_replace('Waca\\DataObjects\\', '', $objectType);
 		}

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
 		}
 
 		$objectType = get_class($object);
-		if(strpos($objectType, 'Waca\\DataObjects\\') !== false)
-		{
+		if(strpos($objectType, 'Waca\\DataObjects\\') !== false) {
 			$objectType = str_replace('Waca\\DataObjects\\', '', $objectType);
 		}
 

includes/Pages/PageSearch.php

Doc Comments +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
 	/**
 	 * Gets search results by name
 	 *
-	 * @param $searchTerm string
+	 * @param null|string $searchTerm string
 	 *
 	 * @returns array<Request>
 	 */
@@ -85,9 +85,9 @@ 
 	/**
 	 * Gets search results by email
 	 *
-	 * @param $searchTerm string
+	 * @param null|string $searchTerm string
 	 *
-	 * @return array <Request>
+	 * @return Request[] <Request>
 	 * @throws ApplicationLogicException
 	 */
 	private function getEmailSearchResults($searchTerm)
@@ -107,7 +107,7 @@ 
 	/**
 	 * Gets search results by IP address or XFF IP address
 	 *
-	 * @param $searchTerm string
+	 * @param null|string $searchTerm string
 	 *
 	 * @returns array<Request>
 	 */
@@ -134,8 +134,8 @@ 
 	}
 
 	/**
-	 * @param $searchType
-	 * @param $searchTerm
+	 * @param null|string $searchType
+	 * @param null|string $searchTerm
 	 *
 	 * @throws ApplicationLogicException
 	 */

includes/Router/RequestRouter.php

Doc Comments +1 added lines, -1 removed lines

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

includes/DataObject.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	/**
 	 * @return bool
 	 */
-	public function isNew(){
+	public function isNew() {
 		return $this->id === null;
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -131,7 +131,8 @@
 	/**
 	 * @return bool
 	 */
-	public function isNew(){
+	public function isNew()
+	{
 		return $this->id === null;
 	}
 }

includes/DataObjects/Ban.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 				throw new Exception($statement->errorInfo());
 			}
 
-			if($statement->rowCount() !== 1){
+			if ($statement->rowCount() !== 1) {
 				throw new OptimisticLockFailedException();
 			}
 

Braces +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 				throw new Exception($statement->errorInfo());
 			}
 
-			if($statement->rowCount() !== 1){
+			if($statement->rowCount() !== 1) {
 				throw new OptimisticLockFailedException();
 			}
 

includes/Pages/PagePreferences.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 			$newPasswordConfirmation = WebRequest::postString('newpasswordconfirm');
 
 			$user = User::getCurrent($this->getDatabase());
-			if(!$user instanceof User){
+			if (!$user instanceof User) {
 				throw new ApplicationLogicException('User not found');
 			}
 

Braces +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 			$newPasswordConfirmation = WebRequest::postString('newpasswordconfirm');
 
 			$user = User::getCurrent($this->getDatabase());
-			if(!$user instanceof User){
+			if(!$user instanceof User) {
 				throw new ApplicationLogicException('User not found');
 			}
 

includes/Pages/Statistics/StatsUsers.php

Spacing +2 added lines, -2 removed lines

@@ -103,9 +103,9 @@
 		$this->assign("notcreated", $usersNotCreated);
 
 		list($logs, $logCount) = LogHelper::getLogs($database, null, null, 'User', $user->getId());
-		if($logs === false){
+		if ($logs === false) {
 			$this->assign('accountlog', array());
-		} else{
+		} else {
 			list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
 
 			$this->assign("accountlog", $logData);

Braces +3 added lines, -2 removed lines

@@ -103,9 +103,10 @@
 		$this->assign("notcreated", $usersNotCreated);
 
 		list($logs, $logCount) = LogHelper::getLogs($database, null, null, 'User', $user->getId());
-		if($logs === false){
+		if($logs === false) {
 			$this->assign('accountlog', array());
-		} else{
+		}
+		else {
 			list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
 
 			$this->assign("accountlog", $logData);

includes/Helpers/LogHelper.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: stwalkerster
- * Date: 26/03/2016
- * Time: 02:55
- */
+	 * Created by PhpStorm.
+	 * User: stwalkerster
+	 * Date: 26/03/2016
+	 * Time: 02:55
+	 */
 
 namespace Waca\Helpers;
 

Spacing +2 added lines, -2 removed lines

@@ -451,13 +451,13 @@
 			$objectDescription = self::getObjectDescription($logEntry->getObjectId(), $logEntry->getObjectType(),
 				$database, $configuration);
 
-			if($logEntry->getAction() === 'Renamed'){
+			if ($logEntry->getAction() === 'Renamed') {
 				$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 . '\'.';
 			}
-			else{
+			else {
 				$comment = $logEntry->getComment();
 			}
 

Braces +2 added lines, -2 removed lines

@@ -451,13 +451,13 @@
 			$objectDescription = self::getObjectDescription($logEntry->getObjectId(), $logEntry->getObjectType(),
 				$database, $configuration);
 
-			if($logEntry->getAction() === 'Renamed'){
+			if($logEntry->getAction() === 'Renamed') {
 				$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 . '\'.';
 			}
-			else{
+			else {
 				$comment = $logEntry->getComment();
 			}
 

includes/Helpers/RequestSearchHelper.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 *
 	 * @return RequestSearchHelper
 	 */
-	public static function get(PdoDatabase $database){
+	public static function get(PdoDatabase $database) {
 		$helper = new RequestSearchHelper($database);
 
 		return $helper;

Braces +2 added lines, -1 removed lines

@@ -42,7 +42,8 @@
 	 *
 	 * @return RequestSearchHelper
 	 */
-	public static function get(PdoDatabase $database){
+	public static function get(PdoDatabase $database)
+	{
 		$helper = new RequestSearchHelper($database);
 
 		return $helper;