andela-tolotin / Potato-ORM

src/Model/BaseModel.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use Laztopaz\potatoORM\NoRecordFoundException;
 use Laztopaz\potatoORM\NoRecordInsertionException;
 use Laztopaz\potatoORM\NullArgumentPassedToFunction;
-use Laztopaz\potatoORM\WrongArgumentException;
 use Laztopaz\potatoORM\NoArgumentPassedToFunctionException;
 use Laztopaz\potatoORM\EmptyArrayException;
 

Doc Comments +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
     /**
      * This method find a record by id
      * @params int id
-     * @return Object
+     * @return BaseModel
      * @throws NoArgumentPassedToFunctionException
      */
     public static function find($id)
@@ -168,7 +168,7 @@ 
    /**
     * This method return the current class name
     * $params void
-    * @return classname
+    * @return string|false
     */
    public static function getClassName()
    {

Indentation +135 added lines, -135 removed lines

@@ -20,150 +20,150 @@ 
 
 class BaseModel  implements InterfaceBaseClass
 {
-    protected $databaseModel; // Private variable that contains instance of database
-    protected $tableName; // Class variable holding class name pluralized
-    protected $properties = []; // Properties will later contain key, value pairs from the magic setter, getter methods
+	protected $databaseModel; // Private variable that contains instance of database
+	protected $tableName; // Class variable holding class name pluralized
+	protected $properties = []; // Properties will later contain key, value pairs from the magic setter, getter methods
 
-    use Inflector; // Inject the inflector trait
+	use Inflector; // Inject the inflector trait
 
-    public function  __construct()
-    {
-        $this->tableName = $this->getClassName();
+	public function  __construct()
+	{
+		$this->tableName = $this->getClassName();
 
-        $this->databaseModel = new DatabaseHandler($this->tableName);
+		$this->databaseModel = new DatabaseHandler($this->tableName);
 
-        $this->properties['id'] = 0;
-    }
+		$this->properties['id'] = 0;
+	}
     
-    /**
-     * The magic getter method
-     * @params key
-     * @return array key
-     */
-    public function __get($key)
-    {
-        $this->properties[$key];
-
-    }
+	/**
+	 * The magic getter method
+	 * @params key
+	 * @return array key
+	 */
+	public function __get($key)
+	{
+		$this->properties[$key];
+
+	}
     
-    /**
-     * The magic setter method
-     * @params property, key
-     * @return array associative array properties
-     */
-    public function  __set($property, $value)
-    {
-        $this->properties[$property] = $value;
-
-    }
+	/**
+	 * The magic setter method
+	 * @params property, key
+	 * @return array associative array properties
+	 */
+	public function  __set($property, $value)
+	{
+		$this->properties[$property] = $value;
+
+	}
     
-    /**
-     * This method gets all the record from a particular table
-     * @params void
-     * @return associative array
-     * @throws NoRecordFoundException
-     */
-    public static function getAll()
-    {
-        $allData = DatabaseHandler::read($id = false, self::getClassName());
+	/**
+	 * This method gets all the record from a particular table
+	 * @params void
+	 * @return associative array
+	 * @throws NoRecordFoundException
+	 */
+	public static function getAll()
+	{
+		$allData = DatabaseHandler::read($id = false, self::getClassName());
 
-        if (count($allData) > 0) {
-            return $allData;
+		if (count($allData) > 0) {
+			return $allData;
 
-        }
+		}
 
-        throw NoRecordFoundException::checkNoRecordFoundException("There is no record to display");
+		throw NoRecordFoundException::checkNoRecordFoundException("There is no record to display");
 
-    }
+	}
     
-    /**
-     * This method create or update record in a database table
-     * @params void
-     * @return bool true or false;
-     * @throws EmptyArrayException
-     * @throws NoRecordInsertionException
-     * @throws NoRecordUpdateException
-     */
-    public function save()
-    {
-        $boolCommit = false;
-
-        if ($this->properties['id']) {
-            $allData = DatabaseHandler::read($id = $this->properties['id'], self::getClassName());
-
-            if ($this->checkIfRecordIsEmpty($allData)) {
-                $boolCommit = $this->databaseModel->update(['id' => $this->properties['id']], $this->tableName, $this->properties);
-
-                if ($boolCommit) {
-                    return true;
-
-                }
-
-                throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
-            }
-
-            throw EmptyArrayException::checkEmptyArrayException("Value passed didn't match any record");
-        }
-
-        $boolCommit = $this->databaseModel->create($this->properties, $this->tableName);
-
-        if ($boolCommit) {
-            return true;
-        }
-
-        throw NoRecordInsertionException::checkNoRecordAddedException("Record not created successfully");
-    }
-
-    /**
-     * This method find a record by id
-     * @params int id
-     * @return Object
-     * @throws NoArgumentPassedToFunctionException
-     */
-    public static function find($id)
-    {
-        $num_args = (int) func_num_args(); // get number of arguments passed to
-
-        if ($num_args == 0 || $num_args > 1) {
-            throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
-        }
-
-        if ($id == "") {
-            throw NullArgumentPassedToFunction::checkNullArgumentPassedToFunction("This function expect a value");
-        }
-
-        $staticFindInstance = new static();
-        $staticFindInstance->id = $id == "" ? false : $id;
-
-        return $staticFindInstance;
+	/**
+	 * This method create or update record in a database table
+	 * @params void
+	 * @return bool true or false;
+	 * @throws EmptyArrayException
+	 * @throws NoRecordInsertionException
+	 * @throws NoRecordUpdateException
+	 */
+	public function save()
+	{
+		$boolCommit = false;
+
+		if ($this->properties['id']) {
+			$allData = DatabaseHandler::read($id = $this->properties['id'], self::getClassName());
+
+			if ($this->checkIfRecordIsEmpty($allData)) {
+				$boolCommit = $this->databaseModel->update(['id' => $this->properties['id']], $this->tableName, $this->properties);
+
+				if ($boolCommit) {
+					return true;
+
+				}
+
+				throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
+			}
+
+			throw EmptyArrayException::checkEmptyArrayException("Value passed didn't match any record");
+		}
+
+		$boolCommit = $this->databaseModel->create($this->properties, $this->tableName);
+
+		if ($boolCommit) {
+			return true;
+		}
+
+		throw NoRecordInsertionException::checkNoRecordAddedException("Record not created successfully");
+	}
+
+	/**
+	 * This method find a record by id
+	 * @params int id
+	 * @return Object
+	 * @throws NoArgumentPassedToFunctionException
+	 */
+	public static function find($id)
+	{
+		$num_args = (int) func_num_args(); // get number of arguments passed to
+
+		if ($num_args == 0 || $num_args > 1) {
+			throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
+		}
+
+		if ($id == "") {
+			throw NullArgumentPassedToFunction::checkNullArgumentPassedToFunction("This function expect a value");
+		}
+
+		$staticFindInstance = new static();
+		$staticFindInstance->id = $id == "" ? false : $id;
+
+		return $staticFindInstance;
         
-    }
+	}
     
-    /**
-     * This method delete a row from the table by the row id
-     * @params int id
-     * @return boolean true or false
-     * @throws NoRecordDeletionException;
-     */
-    public static function destroy($id)
-    {
-        $boolDeleted = false;
-
-        $num_args = (int) func_num_args(); // get number of arguments passed to
+	/**
+	 * This method delete a row from the table by the row id
+	 * @params int id
+	 * @return boolean true or false
+	 * @throws NoRecordDeletionException;
+	 */
+	public static function destroy($id)
+	{
+		$boolDeleted = false;
+
+		$num_args = (int) func_num_args(); // get number of arguments passed to
         
-        if ($num_args == 0 || $num_args > 1) {
-            throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
-        }
+		if ($num_args == 0 || $num_args > 1) {
+			throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
+		}
 
-        $boolDeleted = DatabaseHandler::delete($id, self::getClassName());
+		$boolDeleted = DatabaseHandler::delete($id, self::getClassName());
 
-        if ($boolDeleted) {
-            return true;
+		if ($boolDeleted) {
+			return true;
 
-        }
+		}
 
-        throw NoRecordDeletionException::checkNoRecordUpdateException("Record deletion unsuccessful because id does not match any record");
-    }
+		throw NoRecordDeletionException::checkNoRecordUpdateException("Record deletion unsuccessful because id does not match any record");
+	}
 
    /**
     * This method return the current class name
@@ -172,11 +172,11 @@ 
     */
    public static function getClassName()
    {
-       $tableName = preg_split('/(?=[A-Z])/', get_called_class());
+	   $tableName = preg_split('/(?=[A-Z])/', get_called_class());
        
-       $className = end($tableName);
+	   $className = end($tableName);
 
-       return self::pluralize(strtolower($className));
+	   return self::pluralize(strtolower($className));
 
    }
    
@@ -185,14 +185,14 @@ 
     * @param $arrayOfRecord
     * @return bool
     */
-    public function checkIfRecordIsEmpty($arrayOfRecord)
-    {
-        if (count($arrayOfRecord) > 0) {
-            return true;
+	public function checkIfRecordIsEmpty($arrayOfRecord)
+	{
+		if (count($arrayOfRecord) > 0) {
+			return true;
 
-        }
+		}
         
-        return false;
-    }
+		return false;
+	}
 
 }

src/Database/DatabaseHandler.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 namespace Laztopaz\potatoORM;
 
 use PDO;
-use Laztopaz\potatoORM\DatabaseHelper;
 use Laztopaz\potatoORM\TableFieldUndefinedException;
 use Laztopaz\potatoORM\EmptyArrayException;
 

Doc Comments +7 added lines, -1 removed lines

@@ -21,6 +21,7 @@ 
     
     /**
      * This is a constructor; a default method  that will be called automatically during class instantiation
+     * @param string|false $modelClassName
      */
      public function __construct($modelClassName, $dbConn = Null)
      {
@@ -35,6 +36,7 @@ 
     /**
      * This method create a record and store it in a table row
      * @params associative array, string tablename
+     * @param string|false $tableName
      * @return boolean true or false
      */
     public function create($associative1DArray, $tableName, $dbConn = Null)
@@ -69,6 +71,7 @@ 
     /**
      * This method updates any table by supplying 3 parameter
      * @params: $updateParams, $tableName, $associative1DArray
+     * @param string|false $tableName
      * @return boolean true or false
      */
     public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = Null)
@@ -101,6 +104,7 @@ 
   /**
    * This method retrieves record from a table
    * @params int id, string tableName
+   * @param string|false $tableName
    * @return array
    */
    public static function read($id, $tableName, $dbConn = Null)
@@ -131,6 +135,7 @@ 
   /**
    * This method deletes a record  from a table row
    * @params int id, string tableName
+   * @param string|false $tableName
    * @return boolean true or false
    */
   public static function delete($id, $tableName, $dbConn = Null)
@@ -163,7 +168,7 @@ 
   
   /**
    * This method returns sql query
-   * @param $sql
+   * @param string $sql
    * @return string
    */
   public function prepareUpdateQuery($sql)
@@ -204,6 +209,7 @@ 
    * This method returns column fields of a particular table
    * @param $table
    * @param $conn
+   * @param DatabaseConnection $dbConn
    * @return array
    */
  public function getColumnNames($table, $dbConn = Null) {

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
         $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields, $associative1DArray);
       
         if (count($unexpectedFields) > 0) {
-            throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields,"needs to be created as a table field");
+            throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields, "needs to be created as a table field");
         }
 
         unset($associative1DArray[0]);
@@ -76,7 +76,7 @@ 
     {
         $insertQuery = 'INSERT INTO '.$tableName;
 
-        $TableValues = implode(',',array_keys($associative1DArray));
+        $TableValues = implode(',', array_keys($associative1DArray));
 
         foreach ($associative1DArray as $field => $value) {
             $FormValues[] = "'".trim(addslashes($value))."'";
@@ -84,8 +84,8 @@ 
 
         $splittedTableValues = implode(',', $FormValues);
 
-        $insertQuery.= ' ('.$TableValues.')';
-        $insertQuery.= ' VALUES ('.$splittedTableValues.')';
+        $insertQuery .= ' ('.$TableValues.')';
+        $insertQuery .= ' VALUES ('.$splittedTableValues.')';
 
         $executeQuery = $dbConn->exec($insertQuery);
 
@@ -216,7 +216,7 @@ 
       $unexpectedFields = [];
 
       foreach ($userSetterArray as $key => $val) {
-          if (!in_array($key,$tableColumn)) {
+          if (!in_array($key, $tableColumn)) {
               $unexpectedFields[] = $key;
           }
       }
@@ -232,11 +232,11 @@ 
    */
   public function prepareUpdateQuery($sql)
   {
-      $splittedQuery = explode(",",$sql);
+      $splittedQuery = explode(",", $sql);
 
       array_pop($splittedQuery);
 
-      $mergeData = implode(",",$splittedQuery);
+      $mergeData = implode(",", $splittedQuery);
 
       return $mergeData;
 

Indentation +154 added lines, -154 removed lines

@@ -18,133 +18,133 @@ 
 
 class DatabaseHandler {
 
-    private $tableFields;
-    private $dbHelperInstance;
-    private $dbConnection;
-    private $model;
+	private $tableFields;
+	private $dbHelperInstance;
+	private $dbConnection;
+	private $model;
     
-    /**
-     * This is a constructor; a default method  that will be called automatically during class instantiation
-     */
-    public function __construct($modelClassName, $dbConn = Null) 
-    {
-        if (is_null($dbConn)) {
-            $this->dbConnection = new DatabaseConnection();
-
-        } else {
-            $this->dbConnection = $dbConn;
-
-        }
+	/**
+	 * This is a constructor; a default method  that will be called automatically during class instantiation
+	 */
+	public function __construct($modelClassName, $dbConn = Null) 
+	{
+		if (is_null($dbConn)) {
+			$this->dbConnection = new DatabaseConnection();
+
+		} else {
+			$this->dbConnection = $dbConn;
+
+		}
         
-        $this->model = $modelClassName;
-     }
+		$this->model = $modelClassName;
+	 }
      
-    /**
-     * This method create a record and store it in a table row
-     * @params associative array, string tablename
-     * @return boolean true or false
-     */
-    public function create($associative1DArray, $tableName, $dbConn = Null) 
-    {
-        $tableFields = $this->getColumnNames($this->model, $this->dbConnection);
-
-        $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields, $associative1DArray);
+	/**
+	 * This method create a record and store it in a table row
+	 * @params associative array, string tablename
+	 * @return boolean true or false
+	 */
+	public function create($associative1DArray, $tableName, $dbConn = Null) 
+	{
+		$tableFields = $this->getColumnNames($this->model, $this->dbConnection);
+
+		$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields, $associative1DArray);
       
-        if (count($unexpectedFields) > 0) {
-            throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields,"needs to be created as a table field");
-        }
+		if (count($unexpectedFields) > 0) {
+			throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields,"needs to be created as a table field");
+		}
 
-        unset($associative1DArray[0]);
+		unset($associative1DArray[0]);
 
-        if (is_null($dbConn)) {
-            $dbConn = $this->dbConnection;
+		if (is_null($dbConn)) {
+			$dbConn = $this->dbConnection;
 
-        }
+		}
 
-        return $this->insertRecord($dbConn, $tableName, $associative1DArray);
+		return $this->insertRecord($dbConn, $tableName, $associative1DArray);
 
-    }
+	}
     
-    /**
-     * This method runs the insertion query
-     * @param  $dbConn           
-     * @param  $tableName          
-     * @param  $associative1DArray 
-     * @return boolean true         
-     */
-    private function  insertRecord($dbConn, $tableName, $associative1DArray) 
-    {
-        $insertQuery = 'INSERT INTO '.$tableName;
+	/**
+	 * This method runs the insertion query
+	 * @param  $dbConn           
+	 * @param  $tableName          
+	 * @param  $associative1DArray 
+	 * @return boolean true         
+	 */
+	private function  insertRecord($dbConn, $tableName, $associative1DArray) 
+	{
+		$insertQuery = 'INSERT INTO '.$tableName;
 
-        $TableValues = implode(',',array_keys($associative1DArray));
+		$TableValues = implode(',',array_keys($associative1DArray));
 
-        foreach ($associative1DArray as $field => $value) {
-            $FormValues[] = "'".trim(addslashes($value))."'";
-        }
+		foreach ($associative1DArray as $field => $value) {
+			$FormValues[] = "'".trim(addslashes($value))."'";
+		}
 
-        $splittedTableValues = implode(',', $FormValues);
+		$splittedTableValues = implode(',', $FormValues);
 
-        $insertQuery.= ' ('.$TableValues.')';
-        $insertQuery.= ' VALUES ('.$splittedTableValues.')';
+		$insertQuery.= ' ('.$TableValues.')';
+		$insertQuery.= ' VALUES ('.$splittedTableValues.')';
 
-        $executeQuery = $dbConn->exec($insertQuery);
+		$executeQuery = $dbConn->exec($insertQuery);
 
-        if ($executeQuery) {
-            return true;
-        }
+		if ($executeQuery) {
+			return true;
+		}
 
-        return false;
+		return false;
 
-        throw NoRecordInsertionException::checkNoRecordAddedException("Record not inserted successfully");
-      }
+		throw NoRecordInsertionException::checkNoRecordAddedException("Record not inserted successfully");
+	  }
 
-    /**
-     * This method updates any table by supplying 3 parameter
-     * @params: $updateParams, $tableName, $associative1DArray
-     * @return boolean true or false
-     */
-    public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = null)
-    {
-        $sql = "";
+	/**
+	 * This method updates any table by supplying 3 parameter
+	 * @params: $updateParams, $tableName, $associative1DArray
+	 * @return boolean true or false
+	 */
+	public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = null)
+	{
+		$sql = "";
 
-        if (is_null($dbConn)) {
-            $dbConn = $this->dbConnection;
+		if (is_null($dbConn)) {
+			$dbConn = $this->dbConnection;
 
-        }
+		}
 
-        $updateSql = "UPDATE `$tableName` SET ";
+		$updateSql = "UPDATE `$tableName` SET ";
 
-        unset($associative1DArray['id']);
+		unset($associative1DArray['id']);
 
-        $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->getColumnNames($this->model, $this->dbConnection), $associative1DArray);
+		$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->getColumnNames($this->model, $this->dbConnection), $associative1DArray);
 
-        if (count($unexpectedFields) > 0) {
-            throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields, "needs to be created as a table field");
-        }
+		if (count($unexpectedFields) > 0) {
+			throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields, "needs to be created as a table field");
+		}
 
-        foreach ($associative1DArray as $field => $value) {
-            $sql .= "`$field` = '$value'".",";
-        }
+		foreach ($associative1DArray as $field => $value) {
+			$sql .= "`$field` = '$value'".",";
+		}
 
-        $updateSql .= $this->prepareUpdateQuery($sql);
+		$updateSql .= $this->prepareUpdateQuery($sql);
 
-        foreach ($updateParams as $key => $val) {
-            $updateSql .= " WHERE $key = $val";
-        }
+		foreach ($updateParams as $key => $val) {
+			$updateSql .= " WHERE $key = $val";
+		}
 
-        $stmt = $dbConn->prepare($updateSql);
+		$stmt = $dbConn->prepare($updateSql);
 
-        $boolResponse = $stmt->execute();
+		$boolResponse = $stmt->execute();
 
-        if ($boolResponse) {
-            return true;
+		if ($boolResponse) {
+			return true;
 
-        }
+		}
 
-        return false;
+		return false;
 
-        throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
-    }
+		throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
+	}
     
   /**
    * This method retrieves record from a table
@@ -153,26 +153,26 @@ 
    */
    public static function read($id, $tableName, $dbConn = null)
    {
-       $tableData = [];
+	   $tableData = [];
 
-       if (is_null($dbConn)) {
-           $dbConn = new DatabaseConnection();
-       }
+	   if (is_null($dbConn)) {
+		   $dbConn = new DatabaseConnection();
+	   }
 
-       $sql = $id ? 'SELECT * FROM '.$tableName.' WHERE id = '.$id : 'SELECT * FROM '.$tableName;
+	   $sql = $id ? 'SELECT * FROM '.$tableName.' WHERE id = '.$id : 'SELECT * FROM '.$tableName;
 
-       $stmt = $dbConn->prepare($sql);
-       $stmt->bindValue(':table', $tableName);
-       $stmt->bindValue(':id', $id);
-       $stmt->execute();
+	   $stmt = $dbConn->prepare($sql);
+	   $stmt->bindValue(':table', $tableName);
+	   $stmt->bindValue(':id', $id);
+	   $stmt->execute();
 
-       $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+	   $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
-       foreach ($results as $result) {
-           array_push($tableData, $result);
-       }
+	   foreach ($results as $result) {
+		   array_push($tableData, $result);
+	   }
 
-       return $tableData;
+	   return $tableData;
 
    }
    
@@ -183,20 +183,20 @@ 
    */
   public static function delete($id, $tableName, $dbConn = null)
   {
-      if (is_null($dbConn)) {
-          $dbConn = new DatabaseConnection();
-      }
+	  if (is_null($dbConn)) {
+		  $dbConn = new DatabaseConnection();
+	  }
 
-      $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id;
+	  $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id;
 
-      $boolResponse = $dbConn->exec($sql);
+	  $boolResponse = $dbConn->exec($sql);
 
-      if ($boolResponse) {
-        return true;
+	  if ($boolResponse) {
+		return true;
 
-      }
+	  }
 
-      throw NoRecordDeletionException::checkNoRecordDeleteException("Record not deleted successfully");
+	  throw NoRecordDeletionException::checkNoRecordDeleteException("Record not deleted successfully");
   }
   
   /**
@@ -207,15 +207,15 @@ 
    */
   public static function checkIfMagicSetterContainsIsSameAsClassModel(array $tableColumn, array $userSetterArray)
   {
-      $unexpectedFields = [];
+	  $unexpectedFields = [];
 
-      foreach ($userSetterArray as $key => $val) {
-          if (!in_array($key,$tableColumn)) {
-              $unexpectedFields[] = $key;
-          }
-      }
+	  foreach ($userSetterArray as $key => $val) {
+		  if (!in_array($key,$tableColumn)) {
+			  $unexpectedFields[] = $key;
+		  }
+	  }
 
-      return $unexpectedFields;
+	  return $unexpectedFields;
 
   }
   
@@ -226,13 +226,13 @@ 
    */
   public function prepareUpdateQuery($sql)
   {
-      $splittedQuery = explode(",",$sql);
+	  $splittedQuery = explode(",",$sql);
 
-      array_pop($splittedQuery);
+	  array_pop($splittedQuery);
 
-      $mergeData = implode(",",$splittedQuery);
+	  $mergeData = implode(",",$splittedQuery);
 
-      return $mergeData;
+	  return $mergeData;
 
   }
   
@@ -245,27 +245,27 @@ 
    */
   public function findAndWhere($params, $tableName, $dbConn = null)
   {
-      if (is_null($dbConn)) {
-          $dbConn = $this->dbConnection;
-      }
+	  if (is_null($dbConn)) {
+		  $dbConn = $this->dbConnection;
+	  }
 
-      if (is_array($params) && !empty($params)) {
-          $sql = "SELECT * FROM ".$tableName;
+	  if (is_array($params) && !empty($params)) {
+		  $sql = "SELECT * FROM ".$tableName;
 
-          foreach ($params as $key => $val) {
-              $sql .= " WHERE `$key` = '$val'";
-          }
+		  foreach ($params as $key => $val) {
+			  $sql .= " WHERE `$key` = '$val'";
+		  }
 
-          $statement = $dbConn->prepare($sql);
-          $statement->execute();
+		  $statement = $dbConn->prepare($sql);
+		  $statement->execute();
 
-          $returnedRowNumbers = $statement->rowCount();
+		  $returnedRowNumbers = $statement->rowCount();
           
-          return $returnedRowNumbers ? true : false;
+		  return $returnedRowNumbers ? true : false;
 
-      }
+	  }
 
-      throw EmptyArrayException::checkEmptyArrayException("Record deletion unsuccessful because id does not match any record");
+	  throw EmptyArrayException::checkEmptyArrayException("Record deletion unsuccessful because id does not match any record");
   }
   
   /**
@@ -276,25 +276,25 @@ 
    */
  public function getColumnNames($table, $dbConn = null) 
  {
-     $tableFields = [];
+	 $tableFields = [];
      
-     if (is_null($dbConn)) {
-         $dbConn = $this->dbConnection;
-     }
+	 if (is_null($dbConn)) {
+		 $dbConn = $this->dbConnection;
+	 }
 
-     $sql = "SHOW COLUMNS FROM ".$table;
+	 $sql = "SHOW COLUMNS FROM ".$table;
      
-     $stmt = $dbConn->prepare($sql);
-     $stmt->bindValue(':table', $table, PDO::PARAM_STR);
-     $stmt->execute();
+	 $stmt = $dbConn->prepare($sql);
+	 $stmt->bindValue(':table', $table, PDO::PARAM_STR);
+	 $stmt->execute();
 
-     $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+	 $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
      
-     foreach ($results as $result) {
-         array_push($tableFields, $result['Field']);
-     }
+	 foreach ($results as $result) {
+		 array_push($tableFields, $result['Field']);
+	 }
 
-     return $tableFields;
+	 return $tableFields;
      
    }
 

src/Interface/InterfaceBaseClass.php

Indentation +6 added lines, -6 removed lines

@@ -10,12 +10,12 @@
 
 interface InterfaceBaseClass {
 
-    /**
-     * This method gets all the record from a particular table
-     * @params void
-     * @return associative array
-     */
-    public static function getAll();
+	/**
+	 * This method gets all the record from a particular table
+	 * @params void
+	 * @return associative array
+	 */
+	public static function getAll();
    
    /**
     * This method create or update record in a database table

src/Helper/Inflector.php

Spacing +4 added lines, -4 removed lines

@@ -74,14 +74,14 @@
 			'sex' => 'sexes',
 			'move' => 'moves');
 		$lowercased_word = strtolower($word);
-		foreach ($uncountable as $_uncountable){
-			if(substr($lowercased_word,(-1*strlen($_uncountable))) == $_uncountable){
+		foreach ($uncountable as $_uncountable) {
+			if (substr($lowercased_word, (-1*strlen($_uncountable))) == $_uncountable) {
 				return $word;
 			}
 		}
-		foreach ($irregular as $_plural=> $_singular){
+		foreach ($irregular as $_plural=> $_singular) {
 			if (preg_match('/('.$_plural.')$/i', $word, $arr)) {
-				return preg_replace('/('.$_plural.')$/i', substr($arr[0],0,1).substr($_singular,1), $word);
+				return preg_replace('/('.$_plural.')$/i', substr($arr[0], 0, 1).substr($_singular, 1), $word);
 			}
 		}
 		foreach ($plural as $rule => $replacement) {

src/Helper/InflectorClass.php

Indentation +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
 
 class Inflector {
 	
-    use Inflector;
+	use Inflector;
 }

src/Database/DatabaseConnection.php

Indentation +57 added lines, -57 removed lines

@@ -14,75 +14,75 @@
 
 class DatabaseConnection extends PDO {
     
-    private $databaseName;
-    private $databaseHost;
-    private $databaseDriver;
-    private $databaseUsername;
-    private $databasePassword;
+	private $databaseName;
+	private $databaseHost;
+	private $databaseDriver;
+	private $databaseUsername;
+	private $databasePassword;
     
-    public  function  __construct() 
-    {
-        $this->loadEnv(); // load the environment variables
+	public  function  __construct() 
+	{
+		$this->loadEnv(); // load the environment variables
 
-        $this->databaseName     =  getenv('databaseName');
-        $this->databaseHost     =  getenv('databaseHost');
-        $this->databaseDriver   =  getenv('databaseDriver');
-        $this->databaseUsername =  getenv('databaseUsername');
-        $this->databasePassword =  getenv('databasePassword');
+		$this->databaseName     =  getenv('databaseName');
+		$this->databaseHost     =  getenv('databaseHost');
+		$this->databaseDriver   =  getenv('databaseDriver');
+		$this->databaseUsername =  getenv('databaseUsername');
+		$this->databasePassword =  getenv('databasePassword');
         
-        try {
-            $options = [
-                PDO::ATTR_PERSISTENT => true,
-                PDO::ATTR_ERRMODE    => PDO::ERRMODE_EXCEPTION
-            ];
+		try {
+			$options = [
+				PDO::ATTR_PERSISTENT => true,
+				PDO::ATTR_ERRMODE    => PDO::ERRMODE_EXCEPTION
+			];
 
-        parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);
+		parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);
             
-        } catch(PDOException $e) {
-            return $e->getMessage();
+		} catch(PDOException $e) {
+			return $e->getMessage();
 
-        }
+		}
         
-    }
+	}
 
-    /**
-     * This method determines the driver to be used for appropriate database server
-     * @params void
-     * @return string dsn
-     */
-     public function getDatabaseDriver()
-     {
-        $dsn = "";
+	/**
+	 * This method determines the driver to be used for appropriate database server
+	 * @params void
+	 * @return string dsn
+	 */
+	 public function getDatabaseDriver()
+	 {
+		$dsn = "";
 
-        switch ($this->databaseDriver) {
-            case 'mysql':
-                $dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName; // Set DSN
-                break;
-            case 'sqlite':
-                $dsn = 'sqlite:host='.$this->databaseHost.';dbname='.$this->databaseName;
-                break;
-            case 'pgsql':
-                $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='.$this->databaseName;
-                break;
-            default:
-                $dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName;
-                break;
-        }
+		switch ($this->databaseDriver) {
+			case 'mysql':
+				$dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName; // Set DSN
+				break;
+			case 'sqlite':
+				$dsn = 'sqlite:host='.$this->databaseHost.';dbname='.$this->databaseName;
+				break;
+			case 'pgsql':
+				$dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='.$this->databaseName;
+				break;
+			default:
+				$dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName;
+				break;
+		}
 
-        return $dsn;
+		return $dsn;
 
-     }
+	 }
 
-     /**
-      * Load Dotenv to grant getenv() access to environment variables in .env file
-      */
-     public function loadEnv()
-     {
-        if (! getenv("APP_ENV")) {
-            $dotenv = new Dotenv(__DIR__.'/../../');
-            $dotenv->load();
-        }
+	 /**
+	  * Load Dotenv to grant getenv() access to environment variables in .env file
+	  */
+	 public function loadEnv()
+	 {
+		if (! getenv("APP_ENV")) {
+			$dotenv = new Dotenv(__DIR__.'/../../');
+			$dotenv->load();
+		}
         
-     }
+	 }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -24,11 +24,11 @@ 
     {
         $this->loadEnv(); // load the environment variables
 
-        $this->databaseName     =  getenv('databaseName');
-        $this->databaseHost     =  getenv('databaseHost');
-        $this->databaseDriver   =  getenv('databaseDriver');
-        $this->databaseUsername =  getenv('databaseUsername');
-        $this->databasePassword =  getenv('databasePassword');
+        $this->databaseName     = getenv('databaseName');
+        $this->databaseHost     = getenv('databaseHost');
+        $this->databaseDriver   = getenv('databaseDriver');
+        $this->databaseUsername = getenv('databaseUsername');
+        $this->databasePassword = getenv('databasePassword');
         
         try {
             $options = [
@@ -38,7 +38,7 @@ 
 
         parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);
             
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             return $e->getMessage();
 
         }
@@ -78,7 +78,7 @@ 
       */
      public function loadEnv()
      {
-        if (! getenv("APP_ENV")) {
+        if (!getenv("APP_ENV")) {
             $dotenv = new Dotenv(__DIR__.'/../../');
             $dotenv->load();
         }

src/Database/DatabaseHelper.php

Indentation +26 added lines, -26 removed lines

@@ -12,34 +12,34 @@
 
 class DatabaseHelper {
   
-    public $dbConn;
+	public $dbConn;
     
-    /**
-     * This is a constructor; a default method  that will be called automatically during class instantiation
-     */
-    public function __construct($dbConnect)
-    {
-        $this->dbConn = $dbConnect;
-
-    }
+	/**
+	 * This is a constructor; a default method  that will be called automatically during class instantiation
+	 */
+	public function __construct($dbConnect)
+	{
+		$this->dbConn = $dbConnect;
+
+	}
     
-    /**
-     * This method creates a particular table
-     * @param tableName
-     * $return boolean true or false
-     */
-    public function createTable($tableName, $conn = NULL)
-    {
-        if (is_null($conn)) {
-            $conn = $this->dbConn;
-        }
-
-        $sql = 'CREATE TABLE IF NOT EXISTS '.$tableName.'(';
-        $sql.= ' id INT( 11 ) AUTO_INCREMENT PRIMARY KEY, name VARCHAR( 100 ), gender VARCHAR( 10 ), alias VARCHAR( 150 ) NOT NULL, class VARCHAR( 150 ), stack VARCHAR( 50 ) )';
-
-        return $conn->exec($sql);
-
-        throw TableNotCreatedException::checkTableNotCreatedException("Check your database connection");
+	/**
+	 * This method creates a particular table
+	 * @param tableName
+	 * $return boolean true or false
+	 */
+	public function createTable($tableName, $conn = NULL)
+	{
+		if (is_null($conn)) {
+			$conn = $this->dbConn;
+		}
+
+		$sql = 'CREATE TABLE IF NOT EXISTS '.$tableName.'(';
+		$sql.= ' id INT( 11 ) AUTO_INCREMENT PRIMARY KEY, name VARCHAR( 100 ), gender VARCHAR( 10 ), alias VARCHAR( 150 ) NOT NULL, class VARCHAR( 150 ), stack VARCHAR( 50 ) )';
+
+		return $conn->exec($sql);
+
+		throw TableNotCreatedException::checkTableNotCreatedException("Check your database connection");
    }
   
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         }
 
         $sql = 'CREATE TABLE IF NOT EXISTS '.$tableName.'(';
-        $sql.= ' id INT( 11 ) AUTO_INCREMENT PRIMARY KEY, name VARCHAR( 100 ), gender VARCHAR( 10 ), alias VARCHAR( 150 ) NOT NULL, class VARCHAR( 150 ), stack VARCHAR( 50 ) )';
+        $sql .= ' id INT( 11 ) AUTO_INCREMENT PRIMARY KEY, name VARCHAR( 100 ), gender VARCHAR( 10 ), alias VARCHAR( 150 ) NOT NULL, class VARCHAR( 150 ), stack VARCHAR( 50 ) )';
 
         return $conn->exec($sql);
 

src/Exceptions/NullArgumentPassedToFunctionException.php

Indentation +4 added lines, -4 removed lines

@@ -12,10 +12,10 @@
 
 class NullArgumentPassedToFunction extends Exception {
 
-    public static function checkNullArgumentPassedToFunction($message)
-    {
-        return new static ($message);
+	public static function checkNullArgumentPassedToFunction($message)
+	{
+		return new static ($message);
 
-    }
+	}
 
 }

src/Exceptions/NoRecordFoundException.php

Indentation +4 added lines, -4 removed lines

@@ -12,10 +12,10 @@
 
 class NoRecordFoundException extends Exception {
 
-    public static function checkNoRecordFoundException($message)
-    {
-        return new static($message);
+	public static function checkNoRecordFoundException($message)
+	{
+		return new static($message);
         
-    }
+	}
 
 }