#3 PSR-2

- ran PHP Coding Standards Fixer (https://github.com/FriendsOfPhp/PHP-CS-Fixer)

doc/changelog.txt

@@ -176,4 +176,7 @@ AuthenticationGuardBundle Issue 9: cross framework library refactoring
 - FunctionalTest ::testCheckAuthenticationWithUserReleasedOnIpAddressAndCookie
     made compatible with PHP 5.3
 ------------------------------------
+#3 PSR-2
+- ran PHP Coding Standards Fixer (https://github.com/FriendsOfPhp/PHP-CS-Fixer)
+--------------------------------------
 #2DO: tag v0.3 (when finished solving issues)

src/Metaclass/TresholdsGovernor/Connection/PDOConnection.php

@@ -77,4 +77,4 @@ public function executeQuery($query, array $params = array())
     }
 
     // transactions may be needed for packing data when reducing granularity is added (NYI)
-}
+}

src/Metaclass/TresholdsGovernor/Connection/PDOException.php

@@ -14,5 +14,4 @@ public function __construct($errorInfo)
         $this->code      = $sqlState;
         $this->errorInfo = $errorInfo;
     }
-
-}
+}

src/Metaclass/TresholdsGovernor/Gateway/DbalGateway.php

@@ -8,5 +8,4 @@
  */
 class DbalGateway extends RdbGateway
 {
-
-}
+}

src/Metaclass/TresholdsGovernor/Gateway/RdbGateway.php

@@ -1,32 +1,34 @@
 <?php 
 namespace Metaclass\TresholdsGovernor\Gateway;
 
-use Metaclass\Connection\PDOConnection;
+use Metaclass\TresholdsGovernor\Connection\PDOConnection;
 
-class RdbGateway {
+class RdbGateway
+{
 
     /**
-     * @var PDOConnection|Doctrine\DBAL\Connection $dbalConnection The database connection to use.
+     * @var PDOConnection|\Doctrine\DBAL\Connection $dbalConnection The database connection to use.
      */
     protected $connection;
 
     /**
-     * @param PDOConnection|Doctrine\DBAL\Connection $dbalConnection The database connection to use.
+     * @param PDOConnection|\Doctrine\DBAL\Connection $dbalConnection The database connection to use.
      */
-    public function __construct($dbalConnection) {
+    public function __construct($dbalConnection)
+    {
         $this->connection = $dbalConnection;
     }
 
     /**
-     * @return PDOConnection|Doctrine\DBAL\Connection
+     * @return PDOConnection|\Doctrine\DBAL\Connection
      */
-    protected function getConnection() 
+    protected function getConnection()
     {
         return $this->connection;
     }
 
 //----------------------------- RequestCountsGatewayInterface ------------------------------------
-    
+
     /**
      * @return int Total of $counterColumn counted for $ipAddress with dtFrom after $timeLimit
      * AND as far as specified username, ipAddress and cookieToken equal to specified.
@@ -89,7 +91,6 @@ public function insertOrIncrementCount(\DateTime $dateTime, $username, $ipAddres
         } else {
             $this->createRequestCountsWith($dateTime, $ipAddress, $username, $cookieToken, $counter, $blockedCounterName);
         }
-
     }
 
     /**
@@ -100,7 +101,8 @@ public function insertOrIncrementCount(\DateTime $dateTime, $username, $ipAddres
      * @param string $ipAddress
      * @param string $cookieToken
      */
-    protected function getCountsIdWhereDateAndUsernameAndIpAddressAndCookie(\DateTime $dateTime, $username, $ipAddress, $cookieToken) {
+    protected function getCountsIdWhereDateAndUsernameAndIpAddressAndCookie(\DateTime $dateTime, $username, $ipAddress, $cookieToken)
+    {
         $sql = 'SELECT r.id FROM secu_requests r
     WHERE (r.username = :username)
     AND (r.ipAddress = :ipAddress)
@@ -184,9 +186,10 @@ protected function createRequestCountsWith($datetime, $ipAddress, $username, $co
      * @param string $cookieToken
      * @throws BadFunctionCallException
      */
-    public function updateCountsColumnWhereColumnNullAfterSupplied($columnToUpdate, \DateTime $value, \DateTime $dtLimit, $username, $ipAddress, $cookieToken) {
+    public function updateCountsColumnWhereColumnNullAfterSupplied($columnToUpdate, \DateTime $value, \DateTime $dtLimit, $username, $ipAddress, $cookieToken)
+    {
         if ($username === null && $ipAddress == null) {
-            throw new \BadFunctionCallException ('At least one of username and ip address must be supplied');
+            throw new \BadFunctionCallException('At least one of username and ip address must be supplied');
         }
         $sql = "UPDATE secu_requests
     SET $columnToUpdate = :value
@@ -215,7 +218,7 @@ public function updateCountsColumnWhereColumnNullAfterSupplied($columnToUpdate,
      * Delete all RequestCounts with dtFrom before $dtLimit
      * @param \DateTime $dtLimit 
      */
-    public function deleteCountsUntil(\DateTime $dtLimit) 
+    public function deleteCountsUntil(\DateTime $dtLimit)
     {
         $sql = 'DELETE FROM secu_requests WHERE dtFrom < :dtLimit';
         $params = array('dtLimit' => $dtLimit->format('Y-m-d H:i:s'));
@@ -337,7 +340,7 @@ public function countAddressesBlocked(\DateTime $timeLimit, $failureLimit)
         ";
 
         $conn = $this->getConnection();
-        $found = $conn->fetchAll( $sql, array($timeLimit->format('Y-m-d H:i:s'), $failureLimit) );
+        $found = $conn->fetchAll($sql, array($timeLimit->format('Y-m-d H:i:s'), $failureLimit));
         return isset($found['blocked']) ? $found['blocked'] : 0;
     }
 
@@ -376,7 +379,7 @@ public function insertOrUpdateRelease(\DateTime $datetime, $username, $ipAddress
      * @param string $cookieToken
      * @return int id of the Release
      */
-    protected function getReleasesIdWhereDateAndUsernameAndIpAddressAndCookie($username, $ipAddress, $cookieToken) 
+    protected function getReleasesIdWhereDateAndUsernameAndIpAddressAndCookie($username, $ipAddress, $cookieToken)
     {
         $params = array(
                 'username' => $username,
@@ -459,13 +462,11 @@ public function isUserReleasedByCookieFrom($username, $cookieToken, \DateTime $r
      * Delete all releases dated before $dtLimit
      * @param DateTime $dtLimit 
      */
-    public function deleteReleasesUntil(\DateTime $dtLimit) 
+    public function deleteReleasesUntil(\DateTime $dtLimit)
     {
         $sql = 'DELETE FROM secu_releases WHERE releasedAt < :dtLimit';
         $params = array('dtLimit' => $dtLimit->format('Y-m-d H:i:s'));
 
         $this->getConnection()->executeQuery($sql, $params);
     }
 }
-
-?>

src/Metaclass/TresholdsGovernor/Manager/RdbManager.php

@@ -34,13 +34,13 @@ public function countLoginsFailedForIpAddres($ipAddress, \DateTime $timeLimit)
 
     /** {@inheritdoc} */
     public function countLoginsFailedForUserName($username, \DateTime $timeLimit)
-    { 
+    {
         return $this->gateway->countWhereSpecifiedAfter('loginsFailed', $username,  null, null, $timeLimit, 'userReleasedAt');
     }
 
     /** {@inheritdoc} */
     public function countLoginsFailedForUserOnAddress($username, $ipAddress, \DateTime $timeLimit)
-    { 
+    {
         return $this->gateway->countWhereSpecifiedAfter('loginsFailed', $username, $ipAddress, null, $timeLimit, 'userReleasedForAddressAndCookieAt');
     }
 
@@ -53,7 +53,7 @@ public function countLoginsFailedForUserByCookie($username, $cookieToken, \DateT
     /** {@inheritdoc} */
     public function insertOrIncrementSuccessCount(\DateTime $dateTime, $username, $ipAddress, $cookieToken)
     {
-         $this->gateway->insertOrIncrementCount($dateTime, $username, $ipAddress, $cookieToken, true);
+        $this->gateway->insertOrIncrementCount($dateTime, $username, $ipAddress, $cookieToken, true);
     }
 
     /** {@inheritdoc} */
@@ -100,12 +100,12 @@ public function deleteCountsUntil(\DateTime $limit)
 //StatisticsManagerInterface
 
     /** {@inheritdoc} */
-    public function countLoginsFailed( \DateTime $timeLimit)
+    public function countLoginsFailed(\DateTime $timeLimit)
     {
         return $this->gateway->countWhereSpecifiedAfter('loginsFailed', null, null, null, $timeLimit);
     }
     /** {@inheritdoc} */
-    public function countLoginsSucceeded( \DateTime $timeLimit)
+    public function countLoginsSucceeded(\DateTime $timeLimit)
     {
         return $this->gateway->countWhereSpecifiedAfter('loginsSucceeded', null, null, null, $timeLimit);
     }
@@ -151,9 +151,9 @@ public function isUserReleasedOnAddressFrom($username, $ipAddress, $timeLimit)
 
     /** {@inheritdoc} */
     public function isUserReleasedByCookieFrom($username, $cookieToken, $timeLimit)
-     {
-       return $this->gateway->isUserReleasedByCookieFrom($username, $cookieToken, $timeLimit);
-     }
+    {
+        return $this->gateway->isUserReleasedByCookieFrom($username, $cookieToken, $timeLimit);
+    }
 
     /** {@inheritdoc} */
      public function insertOrUpdateRelease($dateTime, $username, $ipAddress, $cookieToken)
@@ -166,7 +166,4 @@ public function deleteReleasesUntil($limit)
      {
          $this->gateway->deleteReleasesUntil($limit);
      }
-
 }
-
-?>

src/Metaclass/TresholdsGovernor/Manager/ReleasesManagerInterface.php

@@ -41,5 +41,4 @@ public function insertOrUpdateRelease($dateTime, $username, $ipAddress, $cookieT
      * @param \DateTime $limit
      */
     public function deleteReleasesUntil($limit);
-
-}
+}

src/Metaclass/TresholdsGovernor/Manager/RequestCountsManagerInterface.php

@@ -103,5 +103,4 @@ public function releaseCountsForUserNameAndCookie($username, $cookieToken, \Date
      * @param \DateTime $limit 
      */
     public function deleteCountsUntil(\DateTime $limit);
-
-}
+}

src/Metaclass/TresholdsGovernor/Manager/StatisticsManagerInterface.php

@@ -16,13 +16,13 @@ interface StatisticsManagerInterface
      * @param \DateTime $timeLimit
      * @return int Total of `loginsFailed` counted with `dtFrom` after $timeLimit
      */
-    public function countLoginsFailed( \DateTime $timeLimit);
+    public function countLoginsFailed(\DateTime $timeLimit);
 
     /**
      * @param \DateTime $timeLimit
      * @return int Total of `loginsSucceeded` counted with `dtFrom` after $timeLimit
      */
-    public function countLoginsSucceeded( \DateTime $timeLimit);
+    public function countLoginsSucceeded(\DateTime $timeLimit);
 
     /**
      * @param $username
@@ -74,4 +74,4 @@ public function countsByUsernameBetween($username, \DateTime $limitFrom, \DateTi
      * @return array of arrays, each with values for all column of `secu_requests`
      */
     public function countsByAddressBetween($ipAddress, \DateTime $limitFrom, \DateTime $limitUntil);
-}
+}

src/Metaclass/TresholdsGovernor/Result/IpAddressBlocked.php

@@ -15,4 +15,3 @@ public function getCounterName()
         return 'ipAddressBlocked';
     }
 }
-?>

src/Metaclass/TresholdsGovernor/Result/Rejection.php

@@ -27,4 +27,3 @@ public function __construct($message, $parameters=array())
      * */
     abstract public function getCounterName();
 }
-?>

src/Metaclass/TresholdsGovernor/Result/UsernameBlocked.php

@@ -14,6 +14,4 @@ public function getCounterName()
     {
         return 'usernameBlocked';
     }
-
 }
-?>

src/Metaclass/TresholdsGovernor/Result/UsernameBlockedForCookie.php

@@ -14,6 +14,4 @@ public function getCounterName()
     {
         return 'usernameBlockedForCookie';
     }
-
 }
-?>

src/Metaclass/TresholdsGovernor/Result/UsernameBlockedForIpAddress.php

@@ -9,9 +9,9 @@
  * @copyright MetaClass Groningen 2014
  */
  class UsernameBlockedForIpAddress extends Rejection
-{
+ {
      public function getCounterName()
      {
          return 'usernameBlockedForIpAddress';
      }
-}
+ }