Gendoria / cruftflake

tests/Gendoria/CruftFlake/Config/DoctrineConfigTest.php

Unused Use Statements -2 removed lines

@@ -10,8 +10,6 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Type;
 use PDO;
 use PHPUnit_Extensions_Database_TestCase;
 

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
         $conn = $this->getDatabaseTester()->getConnection();
         
         $machines = array();
-        for ($k=0; $k<1024; $k++) {
+        for ($k = 0; $k < 1024; $k++) {
             $machines[$k] = new DoctrineConfig($this->connection);
             $this->assertEquals($k, $machines[$k]->getMachine());
         }

tests/Gendoria/CruftFlake/GeneratorTest.php

Doc Comments +8 added lines

@@ -57,6 +57,7 @@ 
     /**
      * Get generator for normal tests.
      * 
+     * @param integer $newMachineId
      * @return Generator
      */
     private function buildSystemUnderTestHeartbeat($newMachineId)
@@ -70,12 +71,19 @@ 
         return new Generator($this->config, $this->timer);
     }
         
+    /**
+     * @param string $id
+     */
     private function assertId($id)
     {
         $this->assertTrue(is_string($id));
         $this->assertTrue(ctype_digit($id));
     }
     
+    /**
+     * @param string $v1
+     * @param string $v2
+     */
     private function assertReallyNotEquals($v1, $v2)
     {
         $this->assertTrue($v1 !== $v2);

Indentation +8 added lines, -8 removed lines

@@ -32,8 +32,8 @@ 
     private function buildSystemUnderTest()
     {
         $this->config->expects($this->once())
-                     ->method('getMachine')
-                     ->will($this->returnValue($this->machineId));
+                        ->method('getMachine')
+                        ->will($this->returnValue($this->machineId));
         return new Generator($this->config, $this->timer);
     }
     
@@ -45,8 +45,8 @@ 
     private function buildSystemUnderTest32Bit()
     {
         $this->config->expects($this->once())
-                     ->method('getMachine')
-                     ->will($this->returnValue($this->machineId));
+                        ->method('getMachine')
+                        ->will($this->returnValue($this->machineId));
         $generator = $this->getMock('Gendoria\CruftFlake\Generator\Generator', array('is32Bit'), array($this->config, $this->timer));
         $generator->expects($this->any())
             ->method('is32Bit')
@@ -62,11 +62,11 @@ 
     private function buildSystemUnderTestHeartbeat($newMachineId)
     {
         $this->config->expects($this->exactly(2))
-                     ->method('getMachine')
-                     ->will($this->onConsecutiveCalls($this->machineId, $newMachineId));
+                        ->method('getMachine')
+                        ->will($this->onConsecutiveCalls($this->machineId, $newMachineId));
         $this->config->expects($this->once())
-                     ->method('heartbeat')
-                     ->will($this->returnValue(true));
+                        ->method('heartbeat')
+                        ->will($this->returnValue(true));
         return new Generator($this->config, $this->timer);
     }
         

Spacing +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
         $cf = $this->buildSystemUnderTest();
         
         $ids = array();
-        for ($i=0; $i<4095; $i++) {
+        for ($i = 0; $i < 4095; $i++) {
             $id = $cf->generate();
             $ids[$id] = 1;
         }
@@ -194,7 +194,7 @@ 
         $cf = $this->buildSystemUnderTest();
         
         $ids = array();
-        for ($i=0; $i<4096; $i++) {
+        for ($i = 0; $i < 4096; $i++) {
             $id = $cf->generate();
             $ids[$id] = 1;
         }

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 call_user_func(function() {
-    if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
+    if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
         throw new LogicException('Could not find vendor/autoload.php. Did you forget to run "composer install --dev"?');
     }
     require $autoloadFile;

tests/Gendoria/CruftFlake/LocalClientTest.php

Spacing +1 added lines, -1 removed lines

@@ -48,6 +48,6 @@
         $status = $cf->status();
         
         $this->assertInstanceOf('Gendoria\CruftFlake\Generator\GeneratorStatus', $status);
-        $this->assertEquals(1,  $status->sequence);
+        $this->assertEquals(1, $status->sequence);
     }
 }

tests/Gendoria/CruftFlake/Config/ConsulConfigTest.php

Spacing +2 added lines, -2 removed lines

@@ -308,7 +308,7 @@ 
                 static $invCount = 0;
                 if ($url == '/kv/'.$kvPrefix.'?acquire='.$sessionId.'&flags=0') {
                     return true;
-                } elseif($url == '/session/renew') {
+                } elseif ($url == '/session/renew') {
                     return false;
                 } elseif ($url == '/session/create') {
                     if ($invCount == 0) {
@@ -339,7 +339,7 @@ 
                 static $invCount = 0;
                 if ($url == '/kv/'.$kvPrefix.'?acquire='.$sessionId.'&flags=0') {
                     return true;
-                } elseif($url == '/session/renew') {
+                } elseif ($url == '/session/renew') {
                     return false;
                 } elseif ($url == '/session/create') {
                     if ($invCount == 0) {

src/Gendoria/CruftFlake/Config/DoctrineConfig.php

Spacing +2 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
     public function heartbeat()
     {
         //If we have last successfull check recently new, we don't have to do anything
-        if ($this->lastSuccessfullCheck !== null && time() - $this->lastSuccessfullCheck < $this->sessionTTL / 2) {
+        if ($this->lastSuccessfullCheck !== null && time()-$this->lastSuccessfullCheck < $this->sessionTTL / 2) {
             return false;
         }
         
@@ -243,7 +243,7 @@ 
      */
     private function gc()
     {
-        $lastAccess = time() - $this->sessionTTL;
+        $lastAccess = time()-$this->sessionTTL;
         $qb = $this->connection->createQueryBuilder();
         $qb->delete($this->tableName)
             ->where('last_access < ?')

src/Gendoria/CruftFlake/Config/ConsulConfig.php

Spacing +10 added lines, -10 removed lines

@@ -77,7 +77,7 @@ 
     {
         $this->curl = $curl;
         $this->kvPrefix = $kvPrefix;
-        $this->sessionTTL = (int)$sessionTTL;
+        $this->sessionTTL = (int) $sessionTTL;
         //If we cannot connect to Consul on start, we have a problem.
         $this->createSession();
         $this->lastSuccessfullCheck = time();
@@ -114,7 +114,7 @@ 
     public function heartbeat()
     {
         //If we have last successfull check recently new, we don't have to do anything
-        if ($this->lastSuccessfullCheck !== null && time() - $this->lastSuccessfullCheck < $this->sessionTTL / 2 ) {
+        if ($this->lastSuccessfullCheck !== null && time()-$this->lastSuccessfullCheck < $this->sessionTTL / 2) {
             return false;
         }
         //If session reneval succeedes, update last successfull check.
@@ -131,7 +131,7 @@ 
         } catch (RuntimeException $e) {
             //We could not create new session. We can work for some time in 'detached' mode,
             //but if our TTL time runs out, we have to throw an exception.
-            if ($this->lastSuccessfullCheck === null || time() - $this->lastSuccessfullCheck >= $this->sessionTTL) {
+            if ($this->lastSuccessfullCheck === null || time()-$this->lastSuccessfullCheck >= $this->sessionTTL) {
                 throw $e;
             }
             return false;
@@ -149,7 +149,7 @@ 
         //Check, if we don't have existing value for the session
         $currentValue = $this->curl->performGetRequest('/kv/'.$this->kvPrefix.$this->sessionId);
         if (!empty($currentValue['Value'])) {
-            return (int)base64_decode($currentValue['Value']);
+            return (int) base64_decode($currentValue['Value']);
         }
         //Lock main key to block concurrent checks
         $this->lockKey();
@@ -164,7 +164,7 @@ 
         }
         //Release the lock on the main key and return machine ID.
         $this->releaseKey();
-        return (int)$machineId;
+        return (int) $machineId;
     }
     
     /**
@@ -181,10 +181,10 @@ 
             if ($currentValue['Key'] == $this->kvPrefix) {
                 continue;
             } elseif ($currentValue['Key'] == $this->sessionId) {
-                return (int)base64_decode($currentValue['Value']);
+                return (int) base64_decode($currentValue['Value']);
             }
             else {
-                $usedIds[] = (int)base64_decode($currentValue['Value']);
+                $usedIds[] = (int) base64_decode($currentValue['Value']);
             }
         }
         for ($k = 0; $k < 1024; $k++) {
@@ -201,7 +201,7 @@ 
     private function lockKey()
     {
         //try to acquire the lock on prefix during whole operation.
-        $tryCount=0;
+        $tryCount = 0;
         do {
             $acquired = $this->curl->performPutRequest('/kv/'.$this->kvPrefix.'?acquire='.$this->sessionId."&flags=".$tryCount, $this->sessionId);
             if (!$acquired) {
@@ -226,12 +226,12 @@ 
      */
     private function createSession()
     {
-        $url ='/session/create';
+        $url = '/session/create';
         //We create new session with given TTL and with lock delay equal to half of TTL.
         $payload = array(
             'TTL' => $this->sessionTTL.'s',
             "Behavior" => "delete",
-            'LockDelay' => floor($this->sessionTTL/2).'s',
+            'LockDelay' => floor($this->sessionTTL / 2).'s',
         );
         $returnData = $this->curl->performPutRequest($url, json_encode($payload));
         if (empty($returnData['ID'])) {