andela-joyebanji / PotatoORM

src/Model.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
      */
      public function __construct(DatabaseConnectionInterface $databaseConnection = null)
     {
-        if($databaseConnection == null){
+        if ($databaseConnection == null) {
             $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;    
         }
         $this->databaseConnection = $databaseConnection;
@@ -80,7 +80,7 @@ 
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
-        $table = strtolower(end($className) .'s');
+        $table = strtolower(end($className) . 's');
         return $table;
     }
     /**
@@ -109,7 +109,7 @@ 
         $sqlStatement = $this->databaseConnection->prepare($sql);
         $sqlStatement->setFetchMode(PDO::FETCH_CLASS, get_called_class());
         $sqlStatement->execute();
-        if($sqlStatement->rowCount() < 1){
+        if ($sqlStatement->rowCount() < 1) {
             throw new ModelNotFoundException($id);
         }
         return $sqlStatement->fetch();
@@ -149,15 +149,15 @@ 
     {
        
         $bindNameParameters = [];
-        $sqlUpdate = "UPDATE " . $this->getTableName() . " SET " ;
+        $sqlUpdate = "UPDATE " . $this->getTableName() . " SET ";
         foreach ($this->properties as $columnName => $columnValue) {
-            if($columnName == 'id') continue;
+            if ($columnName == 'id') continue;
             $bindColumnName = ':' . $columnName;
             $sqlUpdate .= "$columnName = $bindColumnName,";
             $bindNameParameters[$bindColumnName] = $columnValue;
         }
         //Remove the last comma in sql command then join it to the other query part.
-        $sqlUpdate = substr($sqlUpdate, 0, -1)." WHERE id = :id";
+        $sqlUpdate = substr($sqlUpdate, 0, -1) . " WHERE id = :id";
         $sqlStatement = $this->databaseConnection->prepare($sqlUpdate);
         $bindNameParameters[":id"] = $this->properties['id'];
         $sqlStatement->execute($bindNameParameters);
@@ -175,19 +175,19 @@ 
         $columnNames = "";
         $columnValues = "";
         $bindNameParameters = [];
-        $sqlCreate = "INSERT" . " INTO " . $this->getTableName()." (";
+        $sqlCreate = "INSERT" . " INTO " . $this->getTableName() . " (";
         foreach ($this->properties as $columnName => $columnValue) {
 
             $bindColumnName = ':' . $columnName;
-            $columnNames .= $columnName.",";
-            $columnValues .= $bindColumnName.",";
+            $columnNames .= $columnName . ",";
+            $columnValues .= $bindColumnName . ",";
             $bindNameParameters[$bindColumnName] = $columnValue;
         }
         // Remove ending comma and whitespace.
         $columnNames = substr($columnNames, 0, -1);
         $columnValues = substr($columnValues, 0, -1);
 
-        $sqlCreate .= $columnNames.') VALUES (' .$columnValues.')';
+        $sqlCreate .= $columnNames . ') VALUES (' . $columnValues . ')';
         $sqlStatement = $this->databaseConnection->prepare($sqlCreate);
         $sqlStatement->execute($bindNameParameters);
         return $sqlStatement->rowCount();
@@ -222,7 +222,7 @@ 
      */
     public function delete($id)
     {
-        $sql = "DELETE" . " FROM " . self::getTableName()." WHERE id = ". $id;
+        $sql = "DELETE" . " FROM " . self::getTableName() . " WHERE id = " . $id;
         $sqlStatment = $this->databaseConnection->prepare($sql);
         $sqlStatment->execute();
         return ($sqlStatment->rowCount() > 0) ? true : false;

test/ModelTest.php

Spacing +7 added lines, -7 removed lines

@@ -14,7 +14,7 @@ 
 
 	protected $sqlStatement;
 
-	public function setUp(){
+	public function setUp() {
 		
 
 		$databaseConnectionStringFactory =
@@ -28,7 +28,7 @@ 
         $this->sqlStatement = m::mock('\PDOStatement');
 
         /*$this->databaseConnection = m::mock('Pyjac\ORM\DatabaseConnection[getInstance,createConnection]',array($databaseConnectionStringFactory));*/
-        $this->model =  $this->getMockForAbstractClass('Pyjac\ORM\Model',[$this->databaseConnection]);
+        $this->model = $this->getMockForAbstractClass('Pyjac\ORM\Model', [$this->databaseConnection]);
         //= new DatabaseConnection($databaseConnectionStringFactory);
 	}
 
@@ -37,9 +37,9 @@ 
     	$this->databaseConnection->shouldReceive('createConnection')->with('sqlite::memory:')->once()->andReturn("");
         $this->model->expects($this->any())
              ->method('getTableName')
-             ->will($this->returnValue(strtolower(get_class($this->model).'s')));
+             ->will($this->returnValue(strtolower(get_class($this->model) . 's')));
 
-        $this->assertEquals($this->model->getTableName(), strtolower(get_class($this->model).'s'));
+        $this->assertEquals($this->model->getTableName(), strtolower(get_class($this->model) . 's'));
     }
 
     public function testGetReturnsAnObjectWhenIdIsFoundInDatabase()
@@ -69,7 +69,7 @@ 
     {
     	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
     	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass,new stdClass]);
+    	$this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass, new stdClass]);
     	$this->assertContainsOnlyInstancesOf('stdClass', $this->model->all());
     }
 
@@ -78,7 +78,7 @@ 
     	$this->model->setProperties(['id' => 2, 'name' => 'pyjac', 'age' => '419']);
     	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
     	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass,new stdClass]);
+    	$this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass, new stdClass]);
     	$this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(1);
     
     	$this->assertEquals(1, $this->model->update());
@@ -89,7 +89,7 @@ 
     	$this->model->setProperties(['id' => 2, 'name' => 'pyjac', 'age' => '419']);
     	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
     	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass,new stdClass]);
+    	$this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass, new stdClass]);
     	$this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(1);
     
     	$this->assertEquals(1, $this->model->create());