stwalkerster / waca

includes/Exceptions/AccessDeniedException.php

Doc Comments +3 added lines

@@ -58,6 +58,9 @@
 		return $this->fetchTemplate("exception/access-denied.tpl");
 	}
 
+	/**
+	 * @param string $action
+	 */
 	private function getLogEntry($action, User $user, PdoDatabase $database)
 	{
 		$logs = LogSearchHelper::get($database)

Unused Use Statements -2 removed lines

@@ -8,9 +8,7 @@
 
 namespace Waca\Exceptions;
 
-use Waca\DataObjects\Log;
 use Waca\DataObjects\User;
-use Waca\Helpers\LogHelper;
 use Waca\Helpers\SearchHelpers\LogSearchHelper;
 use Waca\PdoDatabase;
 

includes/Helpers/LogHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 * @param int         $requestId
 	 * @param PdoDatabase $db
 	 *
-	 * @return array
+	 * @return DataObject[]
 	 */
 	public static function getRequestLogsWithComments($requestId, PdoDatabase $db)
 	{

includes/Helpers/SearchHelpers/SearchHelperBase.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	 *
 	 * @param PdoDatabase $database
 	 * @param string      $table
-	 * @param null        $order Order by clause, excluding ORDER BY.
+	 * @param string        $order Order by clause, excluding ORDER BY.
 	 */
 	protected function __construct(PdoDatabase $database, $table, $order = null)
 	{

includes/Helpers/SearchHelpers/LogSearchHelper.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	 */
 	public function byUser($userId)
 	{
-		$this->whereClause .=' AND user = ?';
+		$this->whereClause .= ' AND user = ?';
 		$this->parameterList[] = $userId;
 
 		return $this;
@@ -75,7 +75,7 @@ 
 	 */
 	public function byAction($action)
 	{
-		$this->whereClause .=' AND action = ?';
+		$this->whereClause .= ' AND action = ?';
 		$this->parameterList[] = $action;
 
 		return $this;
@@ -90,7 +90,7 @@ 
 	 */
 	public function byObjectType($objectType)
 	{
-		$this->whereClause .=' AND objecttype = ?';
+		$this->whereClause .= ' AND objecttype = ?';
 		$this->parameterList[] = $objectType;
 
 		return $this;
@@ -105,7 +105,7 @@ 
 	 */
 	public function byObjectId($objectId)
 	{
-		$this->whereClause .=' AND objectid = ?';
+		$this->whereClause .= ' AND objectid = ?';
 		$this->parameterList[] = $objectId;
 
 		return $this;

includes/Helpers/SearchHelpers/RequestSearchHelper.php

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	public function byIp($ipAddress)
 	{
-		$this->whereClause .=' AND (ip LIKE ? OR forwardedip LIKE ?)';
+		$this->whereClause .= ' AND (ip LIKE ? OR forwardedip LIKE ?)';
 		$this->parameterList[] = $ipAddress;
 		$this->parameterList[] = '%' . trim($ipAddress, '%') . '%';
 
@@ -75,7 +75,7 @@ 
 	 */
 	public function byEmailAddress($emailAddress)
 	{
-		$this->whereClause .=' AND email LIKE ?';
+		$this->whereClause .= ' AND email LIKE ?';
 		$this->parameterList[] = $emailAddress;
 
 		return $this;
@@ -90,7 +90,7 @@ 
 	 */
 	public function byName($name)
 	{
-		$this->whereClause .=' AND name LIKE ?';
+		$this->whereClause .= ' AND name LIKE ?';
 		$this->parameterList[] = $name;
 
 		return $this;
@@ -105,7 +105,7 @@ 
 	 */
 	public function excludingRequest($requestId)
 	{
-		$this->whereClause .=' AND id <> ?';
+		$this->whereClause .= ' AND id <> ?';
 		$this->parameterList[] = $requestId;
 
 		return $this;
@@ -118,7 +118,7 @@ 
 	 */
 	public function withConfirmedEmail()
 	{
-		$this->whereClause .=' AND emailconfirm = ?';
+		$this->whereClause .= ' AND emailconfirm = ?';
 		$this->parameterList[] = 'Confirmed';
 
 		return $this;
@@ -133,7 +133,7 @@ 
 	 */
 	public function excludingPurgedData(SiteConfiguration $configuration)
 	{
-		$this->whereClause .=' AND ip <> ? AND email <> ?';
+		$this->whereClause .= ' AND ip <> ? AND email <> ?';
 		$this->parameterList[] = $configuration->getDataClearIp();
 		$this->parameterList[] = $configuration->getDataClearEmail();
 

includes/Pages/PageLog.php

Spacing +2 added lines, -2 removed lines

@@ -46,11 +46,11 @@
 		$offset = ($page - 1) * $limit;
 
 		$logSearch = LogSearchHelper::get($database)->limit($limit, $offset);
-		if($filterUser !== null){
+		if ($filterUser !== null) {
 			$logSearch->byUser(User::getByUsername($filterUser, $database)->getId());
 		}
 
-		if($filterAction !== null){
+		if ($filterAction !== null) {
 			$logSearch->byAction($filterAction);
 		}
 

Braces +2 added lines, -2 removed lines

@@ -46,11 +46,11 @@
 		$offset = ($page - 1) * $limit;
 
 		$logSearch = LogSearchHelper::get($database)->limit($limit, $offset);
-		if($filterUser !== null){
+		if($filterUser !== null) {
 			$logSearch->byUser(User::getByUsername($filterUser, $database)->getId());
 		}
 
-		if($filterAction !== null){
+		if($filterAction !== null) {
 			$logSearch->byAction($filterAction);
 		}
 

includes/Security/SecurityConfigurationFactory.php

Braces +2 added lines, -1 removed lines

@@ -125,7 +125,8 @@
 	 * @category Security-Critical
 	 * @return SecurityConfiguration
 	 */
-	public function asNone() {
+	public function asNone()
+	{
 		$config = new SecurityConfiguration();
 
 		return $config;