Pleets / dronephp

src/Network/Socket/Server.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
     public function listen(Array $eventHandlers = array())
     {
         $event = $eventHandlers;
-        $clousure = function(){};
+        $clousure = function() {};
 
         if (!array_key_exists('success', $event))
             $event["success"] = $clousure;

Braces +10 added lines, -8 removed lines

@@ -76,11 +76,13 @@ 
         $event = $eventHandlers;
         $clousure = function(){};
 
-        if (!array_key_exists('success', $event))
-            $event["success"] = $clousure;
+        if (!array_key_exists('success', $event)) {
+                    $event["success"] = $clousure;
+        }
 
-        if (!array_key_exists('error', $event))
-            $event["error"] = $clousure;
+        if (!array_key_exists('error', $event)) {
+                    $event["error"] = $clousure;
+        }
 
         $listener = false;
 
@@ -90,8 +92,7 @@ 
             $this->error($errno, socket_strerror($errno));
 
             throw new \RuntimeException("Could not set socket to listen");
-        }
-        else {
+        } else {
 
             echo "\n";
             echo "Server Started : " . date('Y-m-d H:i:s') . "\n";
@@ -114,8 +115,9 @@ 
             socket_close($spawn);
         }
 
-        if (!$listener)
-            call_user_func($event["error"], $this->getLastError());
+        if (!$listener) {
+                    call_user_func($event["error"], $this->getLastError());
+        }
 
         return $listener;
     }

test/Db/Driver/MySQLTest.php

Braces +9 added lines, -18 removed lines

@@ -84,12 +84,10 @@ 
 
         try {
             $conn->disconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertNotTrue($conn->isConnected());
             $this->assertTrue($errorObject, $e->getMessage());
@@ -125,12 +123,10 @@ 
 
         try {
             $conn->reconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $e->getMessage());
             $this->assertNotTrue($conn->isConnected());
@@ -156,13 +152,11 @@ 
         try
         {
             $conn->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof ConnectionException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
             $this->assertNotTrue($conn->isConnected());
@@ -242,13 +236,11 @@ 
         {
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('Hello world!')";
             $conn->execute($sql);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof InvalidQueryException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -517,8 +509,7 @@ 
 
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
             $conn->execute($sql);
-        }
-        catch (InvalidQueryException $e)
+        } catch (InvalidQueryException $e)
         {
             $message = $e->getMessage();
             #·not necessary!

Spacing +18 added lines, -18 removed lines

@@ -145,7 +145,7 @@ 
     public function testCannotStablishConnection()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $conn = new MySQL($options);
 
@@ -274,7 +274,7 @@ 
         $this->assertEquals(2, $conn->getNumFields());
         $this->assertEquals(0, $conn->getRowsAffected());
 
-        $rowset = $conn->getArrayResult();    # array with results
+        $rowset = $conn->getArrayResult(); # array with results
         $row = array_shift($rowset);
 
         $this->assertArrayHasKey("ID", $row);
@@ -301,12 +301,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -315,7 +315,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available
+        $this->assertTrue(($rowcount === 1)); # the row is available
     }
 
     /**
@@ -338,12 +338,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -352,7 +352,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 1));    # the row is not available
+        $this->assertNotTrue(($rowcount === 1)); # the row is not available
     }
 
     /**
@@ -384,12 +384,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -398,7 +398,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available
+        $this->assertTrue(($rowcount === 4)); # the rows are available
     }
 
     /**
@@ -430,12 +430,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -444,7 +444,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 4));    # the rows are not available
+        $this->assertNotTrue(($rowcount === 4)); # the rows are not available
     }
 
     /**
@@ -475,12 +475,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the rows are available for now
+        $this->assertTrue(($rowcount === 2)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(2, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         # ends the transaction
         $conn->endTransaction();
@@ -490,7 +490,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the row is available
+        $this->assertTrue(($rowcount === 2)); # the row is available
     }
 
     /**
@@ -534,7 +534,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 0));    # the rows are not available
+        $this->assertNotTrue(($rowcount === 0)); # the rows are not available
 
         # remove all work
         $conn->execute("DROP TABLE MYTABLE");

src/Network/Http.php

Braces +3 added lines, -2 removed lines

@@ -127,8 +127,9 @@
     {
         $codes = $this->httpStatusCodes;
 
-        if (!in_array($code, array_keys($codes)))
-            throw new \RuntimeException("Status code not supported");
+        if (!in_array($code, array_keys($codes))) {
+                    throw new \RuntimeException("Status code not supported");
+        }
 
         return $this->httpStatusCodes[$code];
     }

test/Network/HttpTest.php

Braces +2 added lines, -4 removed lines

@@ -56,13 +56,11 @@
         try
         {
             $text = $http->getStatusText(65431);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \RuntimeException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }

src/Util/DateTime.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
                 break;
 
             case self::LAST_YEAR:
-                $year = ((int) date('Y'))- 1;
+                $year = ((int) date('Y')) - 1;
                 break;
 
             default:
@@ -142,7 +142,7 @@ 
                 $d->setDate($year, (int) $d->format('m'), (int) $d->format('d'));
             }
 
-            $d->add(new \DateInterval('P'.($day - 1).'D'));
+            $d->add(new \DateInterval('P' . ($day - 1) . 'D'));
         }
 
         return $d;

Braces +18 added lines, -14 removed lines

@@ -63,8 +63,9 @@ 
      */
     public static function getMonth($month_number)
     {
-        if (!array_key_exists($month_number, self::MONTHS))
-            throw new Exception\MonthOutOfRange("Invalid Month");
+        if (!array_key_exists($month_number, self::MONTHS)) {
+                    throw new Exception\MonthOutOfRange("Invalid Month");
+        }
 
         return self::MONTHS[$month_number];
     }
@@ -78,14 +79,17 @@ 
      */
     public static function create(array $date = [])
     {
-        if (!array_key_exists('day', $date))
-            $date["day"] = self::TODAY;
+        if (!array_key_exists('day', $date)) {
+                    $date["day"] = self::TODAY;
+        }
 
-        if (!array_key_exists('month', $date))
-            $date["month"] = self::THIS_MONTH;
+        if (!array_key_exists('month', $date)) {
+                    $date["month"] = self::THIS_MONTH;
+        }
 
-        if (!array_key_exists('year', $date))
-            $date["year"] = self::THIS_YEAR;
+        if (!array_key_exists('year', $date)) {
+                    $date["year"] = self::THIS_YEAR;
+        }
 
         switch ($date['year'])
         {
@@ -130,13 +134,13 @@ 
                 break;
         }
 
-        if (is_string($day))
-            $d = new \DateTime("$day $month $year");
-        else
+        if (is_string($day)) {
+                    $d = new \DateTime("$day $month $year");
+        } else
         {
-            if (in_array($month, self::MONTHS))
-                $d = new \DateTime("first day of $month $year");
-            else
+            if (in_array($month, self::MONTHS)) {
+                            $d = new \DateTime("first day of $month $year");
+            } else
             {
                 $d = new \DateTime("first day of $month");
                 $d->setDate($year, (int) $d->format('m'), (int) $d->format('d'));

test/Error/ErrorTraitTest.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
     public function getContentsFromUrl($filename)
     {
         $headers = get_headers($url);
-        $exists = stripos($headers[0],"200 OK") ? true : false;
+        $exists = stripos($headers[0], "200 OK") ? true : false;
 
         if ($exists)
             return file_get_contents($filename);

Braces +17 added lines, -16 removed lines

@@ -90,13 +90,11 @@ 
         try
         {
             $ctrl->addNonExistingError();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -109,18 +107,20 @@ 
 
     public function getContentsFromFile($filename)
     {
-        if (file_exists($filename))
-            return file_get_contents($filename);
-        else
-            $this->error(Errno::FILE_NOT_FOUND, $filename);
+        if (file_exists($filename)) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error(Errno::FILE_NOT_FOUND, $filename);
+        }
     }
 
     public function getContentsFromFileWithoutFilenameOnError($filename)
     {
-        if (file_exists($filename))
-            return file_get_contents($filename);
-        else
-            $this->error(Errno::FILE_NOT_FOUND);
+        if (file_exists($filename)) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error(Errno::FILE_NOT_FOUND);
+        }
     }
 
     public function getContentsFromUrl($filename)
@@ -128,10 +128,11 @@ 
         $headers = get_headers($url);
         $exists = stripos($headers[0],"200 OK") ? true : false;
 
-        if ($exists)
-            return file_get_contents($filename);
-        else
-            $this->error("URL not found");
+        if ($exists) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error("URL not found");
+        }
     }
 
     public function addNonExistingError()

test/Util/DateTimeTest.php

Braces +2 added lines, -4 removed lines

@@ -39,13 +39,11 @@
         try
         {
             $this->assertEquals('June', Dt::getMonth(13));
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof MonthOutOfRange);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }

test/Db/TableGateway/TableGatewayTest.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function testCannotStablishConnectionWhenExists()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $errorObject = null;
 
@@ -98,7 +98,7 @@ 
     public function testCannotStablishConnection()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $entity = new MyEntity();
         $gateway = new TableGateway($entity, ["other" => $options]);

Braces +8 added lines, -16 removed lines

@@ -78,13 +78,11 @@ 
         {
             $entity = new MyEntity();
             $gateway = new TableGateway($entity, ["default" => $options]);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \RuntimeException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -110,13 +108,11 @@ 
         try
         {
             $gateway->getDb()->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof ConnectionException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
             $this->assertNotTrue($gateway->getDb()->isConnected());
@@ -145,13 +141,11 @@ 
         try
         {
             AbstractTableGateway::getDriver('other3');
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \RuntimeException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -250,13 +244,11 @@ 
         try
         {
             $gateway->wrongDML();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof InvalidQueryException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }

Indentation +1 added lines, -1 removed lines

@@ -440,7 +440,7 @@
     {
         parent::__construct($data);
         $this->setTableName("MYTABLE");
-   }
+    }
 }
 
 class MyEntityGateway extends TableGateway

src/Db/TableGateway/AbstractTableGateway.php

Braces +18 added lines, -15 removed lines

@@ -87,24 +87,25 @@ 
         {
             $this->currentConnection = $connection;
             $this->getDriver($connection);
-        }
-        else if (is_array($connection))
+        } else if (is_array($connection))
         {
             $identifier = key($connection);
             $connection_options = $connection[$identifier];
 
             $this->currentConnection = $identifier;
 
-            if (!array_key_exists('driver', $connection_options))
-                throw new \RuntimeException("The database driver key has not been declared");
-
-            if (!isset(self::$drivers[$identifier]))
-                self::$drivers[$identifier] = DriverFactory::create($connection_options);
-            else
-                throw new \RuntimeException("The database connection already exists");
+            if (!array_key_exists('driver', $connection_options)) {
+                            throw new \RuntimeException("The database driver key has not been declared");
+            }
+
+            if (!isset(self::$drivers[$identifier])) {
+                            self::$drivers[$identifier] = DriverFactory::create($connection_options);
+            } else {
+                            throw new \RuntimeException("The database connection already exists");
+            }
+        } else {
+                    throw new \InvalidArgumentException("Invalid type given. Array or string expected");
         }
-        else
-            throw new \InvalidArgumentException("Invalid type given. Array or string expected");
     }
 
     /**
@@ -118,8 +119,9 @@ 
      */
     public static function getDriver($identifier)
     {
-        if (!array_key_exists($identifier, self::$drivers))
-            throw new \RuntimeException("The database connection does not exists");
+        if (!array_key_exists($identifier, self::$drivers)) {
+                    throw new \RuntimeException("The database connection does not exists");
+        }
 
         return self::$drivers[$identifier];
     }
@@ -135,8 +137,9 @@ 
      */
     public static function hasDriver($identifier)
     {
-        if (!array_key_exists($identifier, self::$drivers))
-            return false;
+        if (!array_key_exists($identifier, self::$drivers)) {
+                    return false;
+        }
 
         return true;
     }