andela-joyebanji / PotatoORM

src/DatabaseConnectionStringFactory.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@
 
         switch ($driver) {
             case 'sqlite':
-                $dsn = $driver.'::memory:';
+                $dsn = $driver . '::memory:';
                 break;
             case 'mysql':
             case 'postgres':
-                if(strcasecmp($driver, 'postgres') == 0) $driver="pgsql";
-                $dsn = $driver.':host='.$config['HOSTNAME'].';dbname='.$config['DBNAME'];
-                if(isset($config['PORT'])) $dsn .= ';port='.$config['PORT'];
+                if (strcasecmp($driver, 'postgres') == 0) $driver = "pgsql";
+                $dsn = $driver . ':host=' . $config['HOSTNAME'] . ';dbname=' . $config['DBNAME'];
+                if (isset($config['PORT'])) $dsn .= ';port=' . $config['PORT'];
                 break;
             default:
                 throw new DatabaseDriverNotSupportedException;

Braces +6 added lines, -2 removed lines

@@ -22,9 +22,13 @@
                 break;
             case 'mysql':
             case 'postgres':
-                if(strcasecmp($driver, 'postgres') == 0) $driver="pgsql";
+                if(strcasecmp($driver, 'postgres') == 0) {
+                    $driver="pgsql";
+                }
                 $dsn = $driver.':host='.$config['HOSTNAME'].';dbname='.$config['DBNAME'];
-                if(isset($config['PORT'])) $dsn .= ';port='.$config['PORT'];
+                if(isset($config['PORT'])) {
+                    $dsn .= ';port='.$config['PORT'];
+                }
                 break;
             default:
                 throw new DatabaseDriverNotSupportedException;

src/Model.php

Indentation +50 added lines, -50 removed lines

@@ -10,21 +10,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()
+        public function __construct()
     {
         $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;
        
@@ -32,19 +32,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];
@@ -54,15 +54,15 @@ 
      *
      * @return array
      */
-     public function getProperties()
-     {
-         return $this->properties;
-     }
+        public function getProperties()
+        {
+            return $this->properties;
+        }
     /**
-    * Gets the name of the child class with a 's'.
-    *
-    * @return string
-    */
+     * Gets the name of the child class with a 's'.
+     *
+     * @return string
+     */
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
@@ -70,12 +70,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;
@@ -83,12 +83,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}";
@@ -102,10 +102,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;
@@ -113,10 +113,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()}";
@@ -130,7 +130,7 @@ 
      * Update the model in the database.
      * 
      * @return int
-    */
+     */
     private function update()
     {
        
@@ -151,10 +151,10 @@ 
     }
 
     /**
-    * Insert the model values into the database.
-    *
-    * @return int
-    */
+     * Insert the model values into the database.
+     *
+     * @return int
+     */
     private function create()
     {
         
@@ -189,11 +189,11 @@ 
         return $this->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;

Spacing +10 added lines, -10 removed lines

@@ -66,7 +66,7 @@ 
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
-        $table = strtolower(end($className) .'s');
+        $table = strtolower(end($className) . 's');
         return $table;
     }
     /**
@@ -95,7 +95,7 @@ 
         $sqlStatement = $this->databaseConnection->prepare($sql);
         $sqlStatement->setFetchMode($this->databaseConnection::FETCH_CLASS, get_called_class());
         $sqlStatement->execute();
-        if($sqlStatement->rowCount() < 1){
+        if ($sqlStatement->rowCount() < 1) {
             throw new ModelNotFoundException($id);
         }
         return $sqlStatement->fetch();
@@ -135,15 +135,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);
         $sqlStatement->bindValue(":id", $this->properties['id']);
         $sqlStatement->execute($bindNameParameters);
@@ -161,19 +161,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();
@@ -208,7 +208,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;

Braces +3 added lines, -1 removed lines

@@ -137,7 +137,9 @@
         $bindNameParameters = [];
         $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;

test/DatabaseConnectionStringFactoryTest.php

Indentation +8 added lines, -8 removed lines

@@ -5,11 +5,11 @@ 
 
 class DatabaseConnectionStringFactoryTest extends PHPUnit_Framework_TestCase
 {
-     /**
-     * The instance of DatabaseConnectionStringFactory used in the test.
-     *
-     * @var Pyjac\ORM\DatabaseConnectionStringFactory
-     */
+        /**
+         * The instance of DatabaseConnectionStringFactory used in the test.
+         *
+         * @var Pyjac\ORM\DatabaseConnectionStringFactory
+         */
     protected $databaseConnectionStringFactoryTest;
 
     /**
@@ -45,9 +45,9 @@ 
         $this->assertEquals("sqlite::memory:", $dsn);
     }
 
-     /**
-     * @expectedException Pyjac\ORM\Exception\DatabaseDriverNotSupportedException
-     */
+        /**
+         * @expectedException Pyjac\ORM\Exception\DatabaseDriverNotSupportedException
+         */
     public function testCreateDatabaseSourceStringThrowsDatabaseDriverNotSupportedExceptionWhenUnknownDriverIsPassed()
     {
         $this->config['DRIVER']= 'pyjac';

Spacing +4 added lines, -4 removed lines

@@ -26,21 +26,21 @@ 
 
     public function testCreateDatabaseSourceStringReturnsCorrectPostgresDatabaseSourceString()
     {
-        $this->config['DRIVER']= 'postgres';
+        $this->config['DRIVER'] = 'postgres';
         $dsn = $this->databaseConnectionStringFactory->createDatabaseSourceString($this->config);
         $this->assertEquals("pgsql:host=localhost;dbname=Pyjac", $dsn);
     }
 
     public function testCreateDatabaseSourceStringReturnsCorrectMYSqlDatabaseSourceString()
     {
-        $this->config['DRIVER']= 'mysql';
+        $this->config['DRIVER'] = 'mysql';
         $dsn = $this->databaseConnectionStringFactory->createDatabaseSourceString($this->config);
         $this->assertEquals("mysql:host=localhost;dbname=Pyjac", $dsn);
     }
 
     public function testCreateDatabaseSourceStringReturnsCorrectSQLiteDatabaseSourceString()
     {
-        $this->config['DRIVER']= 'sqlite';
+        $this->config['DRIVER'] = 'sqlite';
         $dsn = $this->databaseConnectionStringFactory->createDatabaseSourceString($this->config);
         $this->assertEquals("sqlite::memory:", $dsn);
     }
@@ -50,7 +50,7 @@ 
      */
     public function testCreateDatabaseSourceStringThrowsDatabaseDriverNotSupportedExceptionWhenUnknownDriverIsPassed()
     {
-        $this->config['DRIVER']= 'pyjac';
+        $this->config['DRIVER'] = 'pyjac';
         $dsn = $this->databaseConnectionStringFactory->createDatabaseSourceString($this->config);
     }
 }
\ No newline at end of file

test/HelpersTest.php

Indentation +4 added lines, -4 removed lines

@@ -24,14 +24,14 @@
         ];
     }
     public function testContainsReturnsFalseWhenStringNotFoundInArray()
-     {
+        {
         $this->assertFalse(Helpers::contains("PHP rocks", $this->testArray));
 
-     }
+        }
 
     public function testContainsReturnsTrueWhenStringIsFoundInArray()
-     {
+        {
         $this->assertTrue(Helpers::contains("Error while sending", $this->testArray));
 
-     }
+        }
 }
\ No newline at end of file

test/DatabaseConnectionTest.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 
 
-	public function setUp(){
+	public function setUp() {
 		$databaseConnectionStringFactory =
                         m::mock('Pyjac\ORM\DatabaseConnectionStringFactoryInterface');
         $databaseConnectionStringFactory->shouldReceive('createDatabaseSourceString')

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 * 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 object DatabaseConnection    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.
 	*

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 +9 added lines, -9 removed lines

@@ -4,17 +4,17 @@ 
 
 class ModelTest extends PHPUnit_Framework_TestCase
 {
-	protected $model;
+    protected $model;
 
-	public function setUp(){
-		$this->model =  $this->getMockForAbstractClass('Pyjac\ORM\Model');
-	}
+    public function setUp(){
+        $this->model =  $this->getMockForAbstractClass('Pyjac\ORM\Model');
+    }
 
-	public function testGetTableNameReturnsCorrectTableName()
+    public function testGetTableNameReturnsCorrectTableName()
     {
         $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'));
     }
@@ -22,8 +22,8 @@ 
     public function testGetTableNameReturnsCorrectTableName2()
     {
         $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'));
     }

Spacing +6 added lines, -6 removed lines

@@ -6,26 +6,26 @@
 {
 	protected $model;
 
-	public function setUp(){
-		$this->model =  $this->getMockForAbstractClass('Pyjac\ORM\Model');
+	public function setUp() {
+		$this->model = $this->getMockForAbstractClass('Pyjac\ORM\Model');
 	}
 
 	public function testGetTableNameReturnsCorrectTableName()
     {
         $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 testGetTableNameReturnsCorrectTableName2()
     {
         $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'));
     }
 
 }
\ No newline at end of file

src/DatabaseConnectionInterface.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 interface DatabaseConnectionInterface 
 {
-	/**
+    /**
      * Get the instance of the class.
      *     
      * @return Pyjac\ORM\DatabaseConnection