andela-joyebanji / PotatoORM

src/Model.php

Indentation +57 added lines, -57 removed lines

@@ -13,21 +13,21 @@ 
 
     /**
      * Store instance of database connection used.
-    * @var [type]
-    */
+     * @var [type]
+     */
     protected  $databaseConnection;
 
     /**
      *  The id of the model.
      *  
      * @property string $id
-    */
+     */
      
     /**
      * Create a model instance.
      * 
      */
-     public function __construct(DatabaseConnectionInterface $databaseConnection = null)
+        public function __construct(DatabaseConnectionInterface $databaseConnection = null)
     {
         if($databaseConnection == null){
             $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;    
@@ -37,19 +37,19 @@ 
     /**
      * Sets into $properties the $key => $value pairs
      * 
-    * @param string $key 
-    * @param string $val 
-    *
-    */
+     * @param string $key 
+     * @param string $val 
+     *
+     */
     public  function __set($key, $val)
     {
         $this->properties[$key] = $val;
     }
     /**
-    * @param string $key
-    * 
-    * @return array
-    */
+     * @param string $key
+     * 
+     * @return array
+     */
     public function __get($key)
     {
         return $this->properties[$key];
@@ -59,24 +59,24 @@ 
      *
      * @return array
      */
-     public function getProperties()
-     {
-         return $this->properties;
-     }
+        public function getProperties()
+        {
+            return $this->properties;
+        }
 
-     /**
-     * Set model properties.
+        /**
+         * Set model properties.
+         *
+         */
+        public function setProperties(array $properties)
+        {
+            $this->properties = $properties;
+        }
+    /**
+     * Gets the name of the child class with a 's'.
      *
+     * @return string
      */
-     public function setProperties(array $properties)
-     {
-         $this->properties = $properties;
-     }
-    /**
-    * Gets the name of the child class with a 's'.
-    *
-    * @return string
-    */
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
@@ -84,12 +84,12 @@ 
         return $table;
     }
     /**
-    * Find the particular model with the passed id.
-    * 
-    * @param int $id
-    * 
-    * @return object
-    */
+     * Find the particular model with the passed id.
+     * 
+     * @param int $id
+     * 
+     * @return object
+     */
     public static function find($id)
     {
         $model = new static;
@@ -97,12 +97,12 @@ 
     }
 
     /**
-    * Get the particular model with the passed id.
-    * 
-    * @param int $id
-    * 
-    * @return object
-    */
+     * Get the particular model with the passed id.
+     * 
+     * @param int $id
+     * 
+     * @return object
+     */
     public function get($id)
     {
         $sql = "SELECT * FROM {$this->getTableName()} WHERE id={$id}";
@@ -116,10 +116,10 @@ 
     }
 
     /**
-    * Get all the models from the database.
-    * 
-    * @return array
-    */
+     * Get all the models from the database.
+     * 
+     * @return array
+     */
     public static function getAll()
     {
         $model = new static;
@@ -127,10 +127,10 @@ 
     }
 
     /**
-    * Returns all the models from the database.
-    * 
-    * @return array
-    */
+     * Returns all the models from the database.
+     * 
+     * @return array
+     */
     public function all()
     {
         $sql = "SELECT * FROM {$this->getTableName()}";
@@ -144,7 +144,7 @@ 
      * Update the model in the database.
      * 
      * @return int
-    */
+     */
     public function update()
     {
        
@@ -165,10 +165,10 @@ 
     }
 
     /**
-    * Insert the model values into the database.
-    *
-    * @return int
-    */
+     * Insert the model values into the database.
+     *
+     * @return int
+     */
     public function create()
     {
         
@@ -203,11 +203,11 @@ 
         return isset($this->properties['id']) ? $this->update() : $this->create();
     }
 
-   /**
-    * Delete a model from the database. 
-    * @param  int $id 
-    * @return boolean
-    */
+    /**
+     * Delete a model from the database. 
+     * @param  int $id 
+     * @return boolean
+     */
     public static function destroy($id)
     {
         $model = new static;

test/DatabaseConnectionTest.php

Indentation +62 added lines, -62 removed lines

@@ -5,86 +5,86 @@
 
 class DatabaseConnectionTest extends PHPUnit_Framework_TestCase
 {
-	/**
-	 * Instance of DatabaseConnection used in test.
-	 */
-	protected $databaseConnection;
+    /**
+     * Instance of DatabaseConnection used in test.
+     */
+    protected $databaseConnection;
 
 
 
-	public function setUp(){
-		$databaseConnectionStringFactory =
+    public function setUp(){
+        $databaseConnectionStringFactory =
                         m::mock('Pyjac\ORM\DatabaseConnectionStringFactoryInterface');
         $databaseConnectionStringFactory->shouldReceive('createDatabaseSourceString')
-                                             ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
+                                                ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
 
         $this->databaseConnection = new DatabaseConnection($databaseConnectionStringFactory);
-	}
+    }
 
-	public function testCreateConnectionReturnsDatabaseConnection()
-	{
-		$dbInstance = $this->databaseConnection->createConnection('sqlite::memory:');
+    public function testCreateConnectionReturnsDatabaseConnection()
+    {
+        $dbInstance = $this->databaseConnection->createConnection('sqlite::memory:');
 
-		$this->assertInstanceOf('PDO', $dbInstance);
+        $this->assertInstanceOf('PDO', $dbInstance);
 
-	}
+    }
 
-	public function testGetInstanceReturnsCorrectInstance()
-	{
-		$dbInstance = DatabaseConnection::getInstance();
+    public function testGetInstanceReturnsCorrectInstance()
+    {
+        $dbInstance = DatabaseConnection::getInstance();
 
-		$this->assertInstanceOf('Pyjac\ORM\DatabaseConnection', $dbInstance);
+        $this->assertInstanceOf('Pyjac\ORM\DatabaseConnection', $dbInstance);
 
-	}
+    }
 
-	public function testSetOptionsAndGetOptionsReturnsCorrectValue()
-	{
-		$options = [
-	        PDO::ATTR_CASE => PDO::CASE_NATURAL,
-	        PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-	        PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
-	        PDO::ATTR_STRINGIFY_FETCHES => false,
-	        PDO::ATTR_EMULATE_PREPARES => false,
-	    ];
-		$this->databaseConnection->setDefaultOptions($options);
+    public function testSetOptionsAndGetOptionsReturnsCorrectValue()
+    {
+        $options = [
+            PDO::ATTR_CASE => PDO::CASE_NATURAL,
+            PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+            PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
+            PDO::ATTR_STRINGIFY_FETCHES => false,
+            PDO::ATTR_EMULATE_PREPARES => false,
+        ];
+        $this->databaseConnection->setDefaultOptions($options);
 
-		$this->assertEquals($this->databaseConnection->getDefaultOptions(), $options);
-	}
+        $this->assertEquals($this->databaseConnection->getDefaultOptions(), $options);
+    }
 
-	public function testTryAgainIfCausedByLostConnectionCreateNewConnectionWhenReasonForExceptionIsConnectionLoss()
-	{
-		 $e = new \Exception("Error while sending");
-		$result = $this->invokeMethod($this->databaseConnection, 'tryAgainIfCausedByLostConnection', [$e, 'sqlite::memory:', '', '', []]);
+    public function testTryAgainIfCausedByLostConnectionCreateNewConnectionWhenReasonForExceptionIsConnectionLoss()
+    {
+            $e = new \Exception("Error while sending");
+        $result = $this->invokeMethod($this->databaseConnection, 'tryAgainIfCausedByLostConnection', [$e, 'sqlite::memory:', '', '', []]);
 
-		$this->assertInstanceOf('PDO', $result);
-	}
+        $this->assertInstanceOf('PDO', $result);
+    }
 
-	/**
+    /**
      * @expectedException \Exception
      */
-	public function testTryAgainIfCausedByLostConnectionThrowsExceptionWhenReasonForExceptionIsNotConnectionLoss()
-	{
-		$e = new \Exception("PHP Rocks !!!");
-		$result = $this->invokeMethod($this->databaseConnection, 'tryAgainIfCausedByLostConnection', [$e, 'sqlite::memory:', '', '', []]);
-
-	}
-
-	/**
-	 * Reference: https://jtreminio.com/2013/03/unit-testing-tutorial-part-3-testing-protected-private-methods-coverage-reports-and-crap/
-	* Call protected/private method of a class.
-	*
-	* @param object &$object    Instantiated object that we will run method on.
-	* @param string $methodName Method name to call
-	* @param array  $parameters Array of parameters to pass into method.
-	*
-	* @return mixed Method return.
-	*/
-	public function invokeMethod(&$object, $methodName, array $parameters = array())
-	{
-		$reflection = new \ReflectionClass(get_class($object));
-		$method = $reflection->getMethod($methodName);
-		$method->setAccessible(true);
-
-		return $method->invokeArgs($object, $parameters);
-	}
+    public function testTryAgainIfCausedByLostConnectionThrowsExceptionWhenReasonForExceptionIsNotConnectionLoss()
+    {
+        $e = new \Exception("PHP Rocks !!!");
+        $result = $this->invokeMethod($this->databaseConnection, 'tryAgainIfCausedByLostConnection', [$e, 'sqlite::memory:', '', '', []]);
+
+    }
+
+    /**
+     * Reference: https://jtreminio.com/2013/03/unit-testing-tutorial-part-3-testing-protected-private-methods-coverage-reports-and-crap/
+     * Call protected/private method of a class.
+     *
+     * @param object &$object    Instantiated object that we will run method on.
+     * @param string $methodName Method name to call
+     * @param array  $parameters Array of parameters to pass into method.
+     *
+     * @return mixed Method return.
+     */
+    public function invokeMethod(&$object, $methodName, array $parameters = array())
+    {
+        $reflection = new \ReflectionClass(get_class($object));
+        $method = $reflection->getMethod($methodName);
+        $method->setAccessible(true);
+
+        return $method->invokeArgs($object, $parameters);
+    }
 }
\ No newline at end of file

test/ModelTest.php

Indentation +49 added lines, -49 removed lines

@@ -5,23 +5,23 @@ 
 
 class ModelTest extends PHPUnit_Framework_TestCase
 {
-	/**
-	 * Instance of DatabaseConnection used in test.
-	 */
-	protected $databaseConnection;
+    /**
+     * Instance of DatabaseConnection used in test.
+     */
+    protected $databaseConnection;
 
-	protected $model;
+    protected $model;
 
-	protected $sqlStatement;
+    protected $sqlStatement;
 
-	public function setUp(){
+    public function setUp(){
 		
 
-		$databaseConnectionStringFactory =
+        $databaseConnectionStringFactory =
                         m::mock('Pyjac\ORM\DatabaseConnectionStringFactoryInterface');
 
         $databaseConnectionStringFactory->shouldReceive('createDatabaseSourceString')
-                                             ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
+                                                ->with(['DRIVER' => 'sqlite', 'HOSTNAME' => '127.0.0.1', 'USERNAME' => '', 'PASSWORD' => '', 'DBNAME' => 'potatoORM', 'PORT' => '54320'])->once()->andReturn('sqlite::memory:');
 
         $this->databaseConnection = m::mock('Pyjac\ORM\DatabaseConnection');
 
@@ -30,88 +30,88 @@ 
         /*$this->databaseConnection = m::mock('Pyjac\ORM\DatabaseConnection[getInstance,createConnection]',array($databaseConnectionStringFactory));*/
         $this->model =  $this->getMockForAbstractClass('Pyjac\ORM\Model',[$this->databaseConnection]);
         //= new DatabaseConnection($databaseConnectionStringFactory);
-	}
+    }
 
-	public function testGetTableNameReturnsCorrectTableName()
+    public function testGetTableNameReturnsCorrectTableName()
     {
-    	$this->databaseConnection->shouldReceive('createConnection')->with('sqlite::memory:')->once()->andReturn("");
+        $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')));
+                ->method('getTableName')
+                ->will($this->returnValue(strtolower(get_class($this->model).'s')));
 
         $this->assertEquals($this->model->getTableName(), strtolower(get_class($this->model).'s'));
     }
 
     public function testGetReturnsAnObjectWhenIdIsFoundInDatabase()
     {
-    	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
-    	$this->sqlStatement->shouldReceive('setFetchMode');
-    	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(1);
-    	$this->sqlStatement->shouldReceive('fetch')->once()->andReturn(new stdClass);
+        $this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
+        $this->sqlStatement->shouldReceive('setFetchMode');
+        $this->sqlStatement->shouldReceive('execute');
+        $this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(1);
+        $this->sqlStatement->shouldReceive('fetch')->once()->andReturn(new stdClass);
 
-    	$this->assertInstanceOf('stdClass', $this->model->get(1));
+        $this->assertInstanceOf('stdClass', $this->model->get(1));
     }
     /**
      * @expectedException Pyjac\ORM\Exception\ModelNotFoundException
      */
     public function testGetThrowsModelNotFoundExceptionWhenIdNotFoundInDatabase()
     {
-    	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
-    	$this->sqlStatement->shouldReceive('setFetchMode');
-    	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(0);
+        $this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
+        $this->sqlStatement->shouldReceive('setFetchMode');
+        $this->sqlStatement->shouldReceive('execute');
+        $this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(0);
     	
-    	$this->assertInstanceOf('stdClass', $this->model->get(1));
+        $this->assertInstanceOf('stdClass', $this->model->get(1));
     }
 
     public function testAllReturnsAnArrayOfObjectsWhenValuesAreInDatabase()
     {
-    	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
-    	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass,new stdClass]);
-    	$this->assertContainsOnlyInstancesOf('stdClass', $this->model->all());
+        $this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
+        $this->sqlStatement->shouldReceive('execute');
+        $this->sqlStatement->shouldReceive('fetchAll')->once()->andReturn([new stdClass,new stdClass]);
+        $this->assertContainsOnlyInstancesOf('stdClass', $this->model->all());
     }
 
     public function testUpdateChangesTheValueOfObjectInDatabase()
     {
-    	$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('rowCount')->once()->andReturn(1);
+        $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('rowCount')->once()->andReturn(1);
     
-    	$this->assertEquals(1, $this->model->update());
+        $this->assertEquals(1, $this->model->update());
     }
 
     public function testCreateObjectInDatabase()
     {
-    	$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('rowCount')->once()->andReturn(1);
+        $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('rowCount')->once()->andReturn(1);
     
-    	$this->assertEquals(1, $this->model->create());
+        $this->assertEquals(1, $this->model->create());
     }
 
 
     public function testDeleteReturnsTrueWhenModelIsSuccessfullyRemovedFromDatabase()
     {
-    	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
-    	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(1);
+        $this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
+        $this->sqlStatement->shouldReceive('execute');
+        $this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(1);
     	
-    	$this->assertEquals(true, $this->model->delete(1));
+        $this->assertEquals(true, $this->model->delete(1));
     }
 
     public function testDeleteReturnsFalseWhenModelWasNotDeletedFromDatabase()
     {
-    	$this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
-    	$this->sqlStatement->shouldReceive('execute');
-    	$this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(0);
+        $this->databaseConnection->shouldReceive('prepare')->once()->andReturn($this->sqlStatement);
+        $this->sqlStatement->shouldReceive('execute');
+        $this->sqlStatement->shouldReceive('rowCount')->once()->andReturn(0);
     	
-    	$this->assertEquals(false, $this->model->delete(1));
+        $this->assertEquals(false, $this->model->delete(1));
     }
 
 }
\ No newline at end of file