andela-joyebanji / PotatoORM

potatoTest.php

Doc Comments +2 added lines, -1 removed lines

@@ -371,6 +371,7 @@ 
     /**
      * Delete model with the specified id.
      * 
+     * @return boolean
      */
     static function destroy($id);
 }
@@ -445,7 +446,7 @@ 
      * Determine if a given string contains a given substring.
      *
      * @param  string  $haystack
-     * @param  string|array  $needles
+     * @param  string[]  $needles
      * @return bool
      */
     public static function contains($haystack, $needles)

Indentation +44 added lines, -44 removed lines

@@ -146,28 +146,28 @@ 
 
     /**
      * Store instance of database connection used.
-    * @var [type]
-    */
+     * @var [type]
+     */
     protected  $databaseConnection;
 
-     public function __construct()
+        public function __construct()
     {
         $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;
         //$databaseConnection->databaseConnection->connect();
     }
     /**
-    * @param string $key rep column name
-    * @param string $val rep column value
-    * sets into $propertie the $key => $value pairs
-    */
+     * @param string $key rep column name
+     * @param string $val rep column value
+     * sets into $propertie the $key => $value pairs
+     */
     public  function __set($key, $val)
     {
         $this->properties[$key] = $val;
     }
     /**
-    * @param string $key reps the column name
-    * @return $key and $value
-    */
+     * @param string $key reps the column name
+     * @return $key and $value
+     */
     public function __get($key)
     {
         return $this->properties[$key];
@@ -177,17 +177,17 @@ 
      *
      * @return array
      */
-     public function getProperties()
-     {
-         return $this->properties;
-     }
+        public function getProperties()
+        {
+            return $this->properties;
+        }
     /**
-    * Gets the name of the child class only
-    * without the namespace
-    * @var $className
-    * @var $table
-    * @return $table
-    */
+     * Gets the name of the child class only
+     * without the namespace
+     * @var $className
+     * @var $table
+     * @return $table
+     */
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
@@ -195,22 +195,22 @@ 
         return $table;
     }
     /**
-    * returns a particular record
-    * @param $id reps the record id
-    * @param $connection initialised to null
-    * @return object
-    */
+     * returns a particular record
+     * @param $id reps the record id
+     * @param $connection initialised to null
+     * @return object
+     */
     public static function find($id)
     {
         $model = new static;
         return $model->get($id); 
     }
     /**
-    * returns a particular record
-    * @param $id reps the record id
-    * @param $connection initialised to null
-    * @return object
-    */
+     * returns a particular record
+     * @param $id reps the record id
+     * @param $connection initialised to null
+     * @return object
+     */
     public function get($id)
     {
         $sql = "SELECT * FROM {$this->getTableName()} WHERE id={$id}";
@@ -239,8 +239,8 @@ 
 
     }
     /** update table with instance properties
-    *
-    */
+     *
+     */
     private function update()
     {
         $connection = $this->getConnection();
@@ -266,8 +266,8 @@ 
         return $stmt->rowCount();
     }
     /**
-    * insert instance data into the table
-    */
+     * insert instance data into the table
+     */
     private function create()
     {
         $connection = $this->getConnection();
@@ -299,8 +299,8 @@ 
         return $stmt->rowCount();
     }
     /**
-    * get db connection
-    */
+     * get db connection
+     */
     public function getConnection($connection = null)
     {
         if(is_null($connection))
@@ -309,10 +309,10 @@ 
         }
     }
     /**
-    * checks if the id exists
-    * update if exist
-    * create if not exist
-    */
+     * checks if the id exists
+     * update if exist
+     * create if not exist
+     */
     public function save()
     {
         if ($this->id) {
@@ -322,10 +322,10 @@ 
         }
     }
     /**
-    * @param row reps record id
-    * @param $connection initialised to null
-    * @return boolean
-    */
+     * @param row reps record id
+     * @param $connection initialised to null
+     * @return boolean
+     */
     public static function destroy($id)
     {
         

Spacing +17 added lines, -17 removed lines

@@ -191,7 +191,7 @@ 
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
-        $table = strtolower(end($className) .'s');
+        $table = strtolower(end($className) . 's');
         return $table;
     }
     /**
@@ -217,7 +217,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();
@@ -247,20 +247,20 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $update = "UPDATE " . $this->getTableName() . " SET " ;
+        $update = "UPDATE " . $this->getTableName() . " SET ";
         foreach ($this->properties as $key => $val) {
             $count++;
-            if(($key == 'id')) continue;
+            if (($key == 'id')) continue;
             $update .= "$key = '$val'";
-            if ($count < count($this->properties) )
+            if ($count < count($this->properties))
             {
-                $update .=",";
+                $update .= ",";
             }
         }
         $update .= " WHERE id = " . $this->properties['id'];
         $stmt = $connection->prepare($update);
             foreach ($this->properties as $key => $val) {
-                if($key == 'id') continue;
+                if ($key == 'id') continue;
             }
         $stmt->execute();
         return $stmt->rowCount();
@@ -274,7 +274,7 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $create = "INSERT" . " INTO " . $this->getTableName()." (";
+        $create = "INSERT" . " INTO " . $this->getTableName() . " (";
             foreach ($this->properties as $key => $val) {
                 $columnNames .= $key;
                 $columnValues .= ':' . $key;
@@ -285,15 +285,15 @@ 
                     $columnValues .= ', ';
                 }
             }
-        $create .= $columnNames.') VALUES (' .$columnValues.')';
+        $create .= $columnNames . ') VALUES (' . $columnValues . ')';
         $stmt = $connection->prepare($create);
             foreach ($this->properties as $key => $val) {
-                $stmt->bindValue(':'.$key, $val);
+                $stmt->bindValue(':' . $key, $val);
             }
             try {
                 // if prop returned and props from db differ throw exception
                 $stmt->execute();
-            } catch(PDOException $e){
+            } catch (PDOException $e) {
                 return $e->getExceptionMessage();
             }
         return $stmt->rowCount();
@@ -303,7 +303,7 @@ 
     */
     public function getConnection($connection = null)
     {
-        if(is_null($connection))
+        if (is_null($connection))
         {
             return new Connection();
         }
@@ -329,7 +329,7 @@ 
     public static function destroy($id)
     {
         
-        $sql = "DELETE" . " FROM " . self::getTableName()." WHERE id = ". $id;
+        $sql = "DELETE" . " FROM " . self::getTableName() . " WHERE id = " . $id;
         $delete = $connection->prepare($sql);
         $delete->execute();
         $count = $delete->rowCount();
@@ -391,13 +391,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 +12 added lines, -4 removed lines

@@ -250,7 +250,9 @@ 
         $update = "UPDATE " . $this->getTableName() . " SET " ;
         foreach ($this->properties as $key => $val) {
             $count++;
-            if(($key == 'id')) continue;
+            if(($key == 'id')) {
+                continue;
+            }
             $update .= "$key = '$val'";
             if ($count < count($this->properties) )
             {
@@ -260,7 +262,9 @@ 
         $update .= " WHERE id = " . $this->properties['id'];
         $stmt = $connection->prepare($update);
             foreach ($this->properties as $key => $val) {
-                if($key == 'id') continue;
+                if($key == 'id') {
+                    continue;
+                }
             }
         $stmt->execute();
         return $stmt->rowCount();
@@ -395,9 +399,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/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 +44 added lines, -44 removed lines

@@ -10,28 +10,28 @@ 
 
     /**
      * Store instance of database connection used.
-    * @var [type]
-    */
+     * @var [type]
+     */
     protected  $databaseConnection;
 
-     public function __construct()
+        public function __construct()
     {
         $this->databaseConnection = DatabaseConnection::getInstance()->databaseConnection;
         //$databaseConnection->databaseConnection->connect();
     }
     /**
-    * @param string $key rep column name
-    * @param string $val rep column value
-    * sets into $propertie the $key => $value pairs
-    */
+     * @param string $key rep column name
+     * @param string $val rep column value
+     * sets into $propertie the $key => $value pairs
+     */
     public  function __set($key, $val)
     {
         $this->properties[$key] = $val;
     }
     /**
-    * @param string $key reps the column name
-    * @return $key and $value
-    */
+     * @param string $key reps the column name
+     * @return $key and $value
+     */
     public function __get($key)
     {
         return $this->properties[$key];
@@ -41,17 +41,17 @@ 
      *
      * @return array
      */
-     public function getProperties()
-     {
-         return $this->properties;
-     }
+        public function getProperties()
+        {
+            return $this->properties;
+        }
     /**
-    * Gets the name of the child class only
-    * without the namespace
-    * @var $className
-    * @var $table
-    * @return $table
-    */
+     * Gets the name of the child class only
+     * without the namespace
+     * @var $className
+     * @var $table
+     * @return $table
+     */
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
@@ -59,22 +59,22 @@ 
         return $table;
     }
     /**
-    * returns a particular record
-    * @param $id reps the record id
-    * @param $connection initialised to null
-    * @return object
-    */
+     * returns a particular record
+     * @param $id reps the record id
+     * @param $connection initialised to null
+     * @return object
+     */
     public static function find($id)
     {
         $model = new static;
         return $model->get($id); 
     }
     /**
-    * returns a particular record
-    * @param $id reps the record id
-    * @param $connection initialised to null
-    * @return object
-    */
+     * returns a particular record
+     * @param $id reps the record id
+     * @param $connection initialised to null
+     * @return object
+     */
     public function get($id)
     {
         $sql = "SELECT * FROM {$this->getTableName()} WHERE id={$id}";
@@ -103,8 +103,8 @@ 
 
     }
     /** update table with instance properties
-    *
-    */
+     *
+     */
     private function update()
     {
         $connection = $this->getConnection();
@@ -130,8 +130,8 @@ 
         return $stmt->rowCount();
     }
     /**
-    * insert instance data into the table
-    */
+     * insert instance data into the table
+     */
     private function create()
     {
         $connection = $this->getConnection();
@@ -163,8 +163,8 @@ 
         return $stmt->rowCount();
     }
     /**
-    * get db connection
-    */
+     * get db connection
+     */
     public function getConnection($connection = null)
     {
         if(is_null($connection))
@@ -173,10 +173,10 @@ 
         }
     }
     /**
-    * checks if the id exists
-    * update if exist
-    * create if not exist
-    */
+     * checks if the id exists
+     * update if exist
+     * create if not exist
+     */
     public function save()
     {
         if ($this->id) {
@@ -186,10 +186,10 @@ 
         }
     }
     /**
-    * @param row reps record id
-    * @param $connection initialised to null
-    * @return boolean
-    */
+     * @param row reps record id
+     * @param $connection initialised to null
+     * @return boolean
+     */
     public static function destroy($id)
     {
         

Spacing +13 added lines, -13 removed lines

@@ -55,7 +55,7 @@ 
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
-        $table = strtolower(end($className) .'s');
+        $table = strtolower(end($className) . 's');
         return $table;
     }
     /**
@@ -81,7 +81,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();
@@ -111,20 +111,20 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $update = "UPDATE " . $this->getTableName() . " SET " ;
+        $update = "UPDATE " . $this->getTableName() . " SET ";
         foreach ($this->properties as $key => $val) {
             $count++;
-            if(($key == 'id')) continue;
+            if (($key == 'id')) continue;
             $update .= "$key = '$val'";
-            if ($count < count($this->properties) )
+            if ($count < count($this->properties))
             {
-                $update .=",";
+                $update .= ",";
             }
         }
         $update .= " WHERE id = " . $this->properties['id'];
         $stmt = $connection->prepare($update);
             foreach ($this->properties as $key => $val) {
-                if($key == 'id') continue;
+                if ($key == 'id') continue;
             }
         $stmt->execute();
         return $stmt->rowCount();
@@ -138,7 +138,7 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $create = "INSERT" . " INTO " . $this->getTableName()." (";
+        $create = "INSERT" . " INTO " . $this->getTableName() . " (";
             foreach ($this->properties as $key => $val) {
                 $columnNames .= $key;
                 $columnValues .= ':' . $key;
@@ -149,15 +149,15 @@ 
                     $columnValues .= ', ';
                 }
             }
-        $create .= $columnNames.') VALUES (' .$columnValues.')';
+        $create .= $columnNames . ') VALUES (' . $columnValues . ')';
         $stmt = $connection->prepare($create);
             foreach ($this->properties as $key => $val) {
-                $stmt->bindValue(':'.$key, $val);
+                $stmt->bindValue(':' . $key, $val);
             }
             try {
                 // if prop returned and props from db differ throw exception
                 $stmt->execute();
-            } catch(PDOException $e){
+            } catch (PDOException $e) {
                 return $e->getExceptionMessage();
             }
         return $stmt->rowCount();
@@ -167,7 +167,7 @@ 
     */
     public function getConnection($connection = null)
     {
-        if(is_null($connection))
+        if (is_null($connection))
         {
             return new Connection();
         }
@@ -193,7 +193,7 @@ 
     public static function destroy($id)
     {
         
-        $sql = "DELETE" . " FROM " . self::getTableName()." WHERE id = ". $id;
+        $sql = "DELETE" . " FROM " . self::getTableName() . " WHERE id = " . $id;
         $delete = $connection->prepare($sql);
         $delete->execute();
         $count = $delete->rowCount();

Braces +6 added lines, -2 removed lines

@@ -114,7 +114,9 @@ 
         $update = "UPDATE " . $this->getTableName() . " SET " ;
         foreach ($this->properties as $key => $val) {
             $count++;
-            if(($key == 'id')) continue;
+            if(($key == 'id')) {
+                continue;
+            }
             $update .= "$key = '$val'";
             if ($count < count($this->properties) )
             {
@@ -124,7 +126,9 @@ 
         $update .= " WHERE id = " . $this->properties['id'];
         $stmt = $connection->prepare($update);
             foreach ($this->properties as $key => $val) {
-                if($key == 'id') continue;
+                if($key == 'id') {
+                    continue;
+                }
             }
         $stmt->execute();
         return $stmt->rowCount();

test.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 abstract class A {
-	function __construct()
-	{
-		echo "Here\n";
-	}
+    function __construct()
+    {
+        echo "Here\n";
+    }
 
 }
 

test/DatabaseConnectionStringFactoryTest.php

Indentation +5 added lines, -5 removed lines

@@ -4,11 +4,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 $openSourceEvangelistFactory;
 
     /**

indexPDO.php

Indentation +35 added lines, -35 removed lines

@@ -2,28 +2,28 @@ 
 
 
 interface ModelInterface {
-	/**
-	 * Get all models from database.
-	 *
-	 * @return array
-	 */
-	function static getAll();
-
-	/**
-	 * Find model with the specified id.
-	 */
-	function static find($id);
-
-	/**
-	 * Delete model with the specified id.
-	 * 
-	 */
-	function static destroy($id);
+    /**
+     * Get all models from database.
+     *
+     * @return array
+     */
+    function static getAll();
+
+    /**
+     * Find model with the specified id.
+     */
+    function static find($id);
+
+    /**
+     * Delete model with the specified id.
+     * 
+     */
+    function static destroy($id);
 }
 
 abstract Model {
 
-	/**
+    /**
      * The connection name for the model.
      *
      * @var string
@@ -43,7 +43,7 @@ 
 
 class Connection {
 
-	/**
+    /**
      * The current globally used instance.
      *
      * @var object
@@ -59,7 +59,7 @@ 
     private $error;
  
     public function __construct(){
-    	$config = parse_ini_file('config.ini');
+        $config = parse_ini_file('config.ini');
         // Set DSN
         $dsn = 'mysql:host=' . $this->host . ';dbname=' . $this->dbname;
         // Set options
@@ -81,10 +81,10 @@ 
 
 try {
 	 
-	$dbh = new PDO('mysql:host=localhost;dbname=potatoORM', 'homestead', 'secret');
-	foreach($dbh->query('SELECT * from test') as $row) {
-	        print_r($row);
-	    }
+    $dbh = new PDO('mysql:host=localhost;dbname=potatoORM', 'homestead', 'secret');
+    foreach($dbh->query('SELECT * from test') as $row) {
+            print_r($row);
+        }
 } catch (PDOException $e) {
     print "Error!: " . $e->getMessage() . "<br/>";
     die();
@@ -109,12 +109,12 @@ 
 
 
 
-	function __construct()
-	{
-		/**
-        * Load the environment variables
-        * @return connection object
-        */
+    function __construct()
+    {
+        /**
+         * Load the environment variables
+         * @return connection object
+         */
         $this->loadDotenv();
 
         $this->database = getenv('DB_DATABASE');
@@ -123,10 +123,10 @@ 
         $this->password = getenv('DB_PASSWORD');
         $this->driver = getenv('DB_CONNECTION');
 
-	}
-	/**
-    * use vlucas dotenv to access the .env file
-    **/
+    }
+    /**
+     * use vlucas dotenv to access the .env file
+     **/
     protected function loadDotenv()
     {
         if(getenv('APP_ENV') !== 'production')
@@ -391,7 +391,7 @@ 
 
 class Helpers {
 
-	/**
+    /**
      * Determine if a given string contains a given substring.
      *
      * @param  string  $haystack

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
     private $dbh;
     private $error;
  
-    public function __construct(){
+    public function __construct() {
     	$config = parse_ini_file('config.ini');
         // Set DSN
         $dsn = 'mysql:host=' . $this->host . ';dbname=' . $this->dbname;
@@ -68,11 +68,11 @@ 
             PDO::ATTR_ERRMODE       => PDO::ERRMODE_EXCEPTION
         );
         // Create a new PDO instanace
-        try{
+        try {
             $this->dbh = new PDO($dsn, $this->user, $this->pass, $options);
         }
         // Catch any errors
-        catch(PDOException $e){
+        catch (PDOException $e) {
             $this->error = $e->getMessage();
         }
     }
@@ -82,7 +82,7 @@ 
 try {
 	 
 	$dbh = new PDO('mysql:host=localhost;dbname=potatoORM', 'homestead', 'secret');
-	foreach($dbh->query('SELECT * from test') as $row) {
+	foreach ($dbh->query('SELECT * from test') as $row) {
 	        print_r($row);
 	    }
 } catch (PDOException $e) {
@@ -129,7 +129,7 @@ 
     **/
     protected function loadDotenv()
     {
-        if(getenv('APP_ENV') !== 'production')
+        if (getenv('APP_ENV') !== 'production')
         {
             $dotenv = new Dotenv(__DIR__);
             $dotenv->load();
@@ -179,8 +179,8 @@ 
         // is set on the server but needs to be set here on this client objects.
         $charset = $config['charset'];
 
-        $names = "set names '$charset'".
-            (! is_null($collation) ? " collate '$collation'" : '');
+        $names = "set names '$charset'" .
+            (!is_null($collation) ? " collate '$collation'" : '');
 
         $connection->prepare($names)->execute();
 
@@ -208,7 +208,7 @@ 
      */
     protected function configHasSocket(array $config)
     {
-        return isset($config['unix_socket']) && ! empty($config['unix_socket']);
+        return isset($config['unix_socket']) && !empty($config['unix_socket']);
     }
 
     /**