andela-tolotin / Potato-ORM

src/Database/DatabaseConnection.php

Indentation +3 added lines, -3 removed lines

@@ -21,8 +21,8 @@ 
 
 	public  function  __construct() 
 	{
-	    $this->loadEnv(); // load the environment variables
-	    $this->databaseName     =  getenv('databaseName');
+		$this->loadEnv(); // load the environment variables
+		$this->databaseName     =  getenv('databaseName');
 		$this->databaseHost     =  getenv('databaseHost');
 		$this->databaseDriver   =  getenv('databaseDriver');
 		$this->databaseUsername =  getenv('databaseUsername');
@@ -78,7 +78,7 @@ 
 	{
 		if (!getenv("APP_ENV")) {
 			$dotenv = new Dotenv(__DIR__.'/../../');
-		    $dotenv->load();
+			$dotenv->load();
 		}
 
 	}

Spacing +10 added lines, -10 removed lines

@@ -22,11 +22,11 @@ 
 	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 = [
@@ -34,7 +34,7 @@ 
 			PDO::ATTR_ERRMODE       => PDO::ERRMODE_EXCEPTION
 			];
 			parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 
 			return $e->getMessage();
 		}
@@ -53,20 +53,20 @@ 
 		{
 			case 'mysql':
 				// Set DSN
-				$dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;
+				$dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName;
 				break;
 			case 'sqlite':
 				// Set DSN
-				$dsn = 'sqlite:host='.$this->databaseHost.';dbname='. $this->databaseName;
+				$dsn = 'sqlite:host='.$this->databaseHost.';dbname='.$this->databaseName;
 				break;
 			case 'pgsql':
 
 				// Set DSN
-				$dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='. $this->databaseName;
+				$dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='.$this->databaseName;
 				break;
 			default:
 				// Set DSN
-				$dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;
+				$dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName;
 		}
 		return $dsn;
 	}

src/Database/DatabaseHandler.php

Spacing +17 added lines, -17 removed lines

@@ -42,10 +42,10 @@ 
 	{
 		$tableFields = $this->getColumnNames($this->model, $this->dbConnection);
 
-		$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields,$associative1DArray);
+		$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields, $associative1DArray);
 
 		if (count($unexpectedFields) > 0) {
-			throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields,"needs to be created as table field");
+			throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields, "needs to be created as table field");
 		}
 		unset($tableFields[0]);
 
@@ -60,17 +60,17 @@ 
 	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))."'";
 		}
 		$splittedTableValues = implode(',', $FormValues);
-		$insertQuery.= ' ('.$TableValues.')';
-		$insertQuery.= ' VALUES ('.$splittedTableValues.')';
+		$insertQuery .= ' ('.$TableValues.')';
+		$insertQuery .= ' VALUES ('.$splittedTableValues.')';
 		$executeQuery = $dbConn->exec($insertQuery);
 
-		return $executeQuery ? : false;
+		return $executeQuery ?: false;
 	}
 
 	/*
@@ -87,13 +87,13 @@ 
 
 		$updateSql = "UPDATE `$tableName` SET ";
 		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::fieldsNotDefinedException($unexpectedFields, "needs to be created as table field");
 		}
 
-		foreach($associative1DArray as $field => $value) {
+		foreach ($associative1DArray as $field => $value) {
 			$sql .= "`$field` = '$value'".",";
 		}
 
@@ -105,7 +105,7 @@ 
 		$stmt = $dbConn->prepare($updateSql);
 		$boolResponse = $stmt->execute();
 
-		return $boolResponse ?  : false;
+		return $boolResponse ?: false;
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 		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;
 
 		try {
 			$stmt = $dbConn->prepare($sql);
@@ -132,7 +132,7 @@ 
 		}
 		$results = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
-		foreach($results as $result) {
+		foreach ($results as $result) {
 			array_push($tableData, $result);
 		}
 
@@ -152,7 +152,7 @@ 
 		$sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id;
 		$boolResponse = $dbConn->exec($sql);
 
-		return $boolResponse ? : false;
+		return $boolResponse ?: false;
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 		$unexpectedFields = [];
 
 		foreach ($userSetterArray as $key => $val) {
-			if (!in_array($key,$tableColumn)) {
+			if (!in_array($key, $tableColumn)) {
 
 				$unexpectedFields[] = $key;
 			}
@@ -181,9 +181,9 @@ 
 	 */
 	public function prepareUpdateQuery($sql)
 	{
-		$splittedQuery = explode(",",$sql);
+		$splittedQuery = explode(",", $sql);
 		array_pop($splittedQuery);
-		$mergeData = implode(",",$splittedQuery);
+		$mergeData = implode(",", $splittedQuery);
 
 		return $mergeData;
 	}
@@ -208,7 +208,7 @@ 
 			$statement = $dbConn->prepare($sql);
 			$statement->execute();
 			$returnedRowNumbers = $statement->rowCount();
-			return $returnedRowNumbers  ? true : false;
+			return $returnedRowNumbers ? true : false;
 		}
 
 		throw EmptyArrayException::checkEmptyArrayException("Array Expected: parameter passed to this function is not an array");
@@ -234,7 +234,7 @@ 
 		$stmt->execute();
 		$results = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
-		foreach($results as $result) {
+		foreach ($results as $result) {
 			array_push($tableFields, $result['Field']);
 		}
 			return $tableFields;