Pleets / dronephp

src/Mvc/Router.php

Spacing +5 added lines, -7 removed lines

@@ -263,11 +263,10 @@ 
         {
             foreach ($this->routes as $key => $route)
             {
-                if
-                (
-                    $route["module"]     == $this->identifiers["module"]     &&
+                if (
+                    $route["module"] == $this->identifiers["module"] &&
                     $route["controller"] == $this->identifiers["controller"] &&
-                    $route["view"]       == $this->identifiers["view"]
+                    $route["view"] == $this->identifiers["view"]
                 )
                 {
                     $module     = $route["module"];
@@ -282,9 +281,8 @@ 
 
         if (count($this->defaults) && !$match)
         {
-            if
-            (
-                !empty($this->defaults["module"])     &&
+            if (
+                !empty($this->defaults["module"]) &&
                 !empty($this->defaults["controller"]) &&
                 !empty($this->defaults["view"])
             )

src/Mvc/Application.php

Spacing +4 added lines, -4 removed lines

@@ -190,17 +190,17 @@
      */
     public function run()
     {
-        $module     = isset($_GET["module"])     ? $_GET["module"]     : null;
+        $module     = isset($_GET["module"]) ? $_GET["module"] : null;
         $controller = isset($_GET["controller"]) ? $_GET["controller"] : null;
-        $view       = isset($_GET["view"])       ? $_GET["view"]       : null;
+        $view       = isset($_GET["view"]) ? $_GET["view"] : null;
 
         $request = new  \Zend\Http\Request();
 
         # build URI
         $uri = '';
-        $uri .= !empty($module)     ? '/' . $module : "";
+        $uri .= !empty($module) ? '/' . $module : "";
         $uri .= !empty($controller) ? '/' . $controller : "";
-        $uri .= !empty($view)       ? '/' . $view : "";
+        $uri .= !empty($view) ? '/' . $view : "";
 
         if (empty($uri))
             $uri = "/";

test/Db/Driver/MySQLTest.php

Spacing +19 added lines, -19 removed lines

@@ -132,7 +132,7 @@ 
     public function testCannotEstablishConnection()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $conn = new MySQL($options);
 
@@ -259,7 +259,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);
@@ -286,12 +286,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());
 
@@ -300,7 +300,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available
+        $this->assertTrue(($rowcount === 1)); # the row is available
     }
 
     /**
@@ -323,12 +323,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());
 
@@ -337,7 +337,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
     }
 
     /**
@@ -369,12 +369,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());
 
@@ -383,7 +383,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available
+        $this->assertTrue(($rowcount === 4)); # the rows are available
     }
 
     /**
@@ -415,12 +415,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());
 
@@ -429,7 +429,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
         $this->assertTrue(($rowcount === 0));
     }
 
@@ -461,12 +461,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();
@@ -476,7 +476,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the row is available
+        $this->assertTrue(($rowcount === 2)); # the row is available
     }
 
     /**
@@ -503,7 +503,7 @@ 
             $conn->execute($sql);
 
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
-            $conn->execute($sql);    # this throws the exception
+            $conn->execute($sql); # this throws the exception
         }
         catch (InvalidQueryException $e)
         {
@@ -519,7 +519,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");

test/Db/TableGateway/TableGatewayTest.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
     public function testCannotEstablishConnectionWhenExists()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $entity = new MyEntity();
         new TableGateway($entity, ["default" => $options]);
@@ -80,7 +80,7 @@ 
     public function testCannotEstablishConnection()
     {
         $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]);