andela-joyebanji / PotatoORM

src/Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
     /**
      * Save the model data to the database.
      *
-     * @return bool
+     * @return integer
      */
     public function save()
     {

Indentation +33 added lines, -33 removed lines

@@ -17,22 +17,22 @@ 
      */
     protected $databaseConnection;
 
-     /**
-      *  The id of the model.
-      *
-      * @property string $id
-      */
-
-     /**
-      * Create a model instance.
-      */
-     public function __construct(DatabaseConnectionInterface $databaseConnection = null)
-     {
-         if ($databaseConnection == null) {
-             $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;
-         }
-         $this->databaseConnection = $databaseConnection;
-     }
+        /**
+         *  The id of the model.
+         *
+         * @property string $id
+         */
+
+        /**
+         * Create a model instance.
+         */
+        public function __construct(DatabaseConnectionInterface $databaseConnection = null)
+        {
+            if ($databaseConnection == null) {
+                $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;
+            }
+            $this->databaseConnection = $databaseConnection;
+        }
 
     /**
      * Sets into $properties the $key => $value pairs.
@@ -55,23 +55,23 @@ 
         return $this->properties[$key];
     }
 
-     /**
-      * Get all the model properties.
-      *
-      * @return array
-      */
-     public function getProperties()
-     {
-         return $this->properties;
-     }
-
-     /**
-      * Set model properties.
-      */
-     public function setProperties(array $properties)
-     {
-         $this->properties = $properties;
-     }
+        /**
+         * Get all the model properties.
+         *
+         * @return array
+         */
+        public function getProperties()
+        {
+            return $this->properties;
+        }
+
+        /**
+         * Set model properties.
+         */
+        public function setProperties(array $properties)
+        {
+            $this->properties = $properties;
+        }
 
     /**
      * Gets the name of the child class with a 's'.

Spacing +9 added lines, -9 removed lines

@@ -152,17 +152,17 @@ 
     public function update()
     {
         $bindNameParameters = [];
-        $sqlUpdate = 'UPDATE '.$this->getTableName().' SET ';
+        $sqlUpdate = 'UPDATE ' . $this->getTableName() . ' SET ';
         foreach ($this->properties as $columnName => $columnValue) {
             if ($columnName == 'id') {
                 continue;
             }
-            $bindColumnName = ':'.$columnName;
+            $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);
@@ -180,18 +180,18 @@ 
         $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.',';
+            $bindColumnName = ':' . $columnName;
+            $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);
 
@@ -231,7 +231,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();
 

test/DatabaseConnectionTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,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 +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $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);
     }

src/DatabaseConnectionStringFactory.php

Spacing +3 added lines, -3 removed lines

@@ -22,16 +22,16 @@
 
         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'];
+                $dsn = $driver . ':host=' . $config['HOSTNAME'] . ';dbname=' . $config['DBNAME'];
                 if (isset($config['PORT'])) {
-                    $dsn .= ';port='.$config['PORT'];
+                    $dsn .= ';port=' . $config['PORT'];
                 }
                 break;
             default:

src/Exception/ModelNotFoundException.php

Spacing +1 added lines, -1 removed lines

@@ -7,6 +7,6 @@
 {
     public function __construct($id)
     {
-        parent::__construct('The requested Model with '.$id.' does not exist');
+        parent::__construct('The requested Model with ' . $id . ' does not exist');
     }
 }

test/ModelTest.php

Indentation +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
                         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');
 
@@ -36,8 +36,8 @@ 
     {
         $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'));
     }

Spacing +2 added lines, -2 removed lines

@@ -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()