andela-tolotin / Potato-ORM

src/Helper/Inflector.php

Spacing +9 added lines, -9 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) {
@@ -101,7 +101,7 @@ 
 	 */
 	public function singularize($word)
 	{
-		$singular = array (
+		$singular = array(
 			'/(quiz)zes$/i'             => "$1",
 			'/(matr)ices$/i'            => "$1ix",
 			'/(vert|ind)ices$/i'        => "$1ex",
@@ -139,14 +139,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('/('.$_singular.')$/i', $word, $arr)) {
-				return preg_replace('/('.$_singular.')$/i', substr($arr[0],0,1).substr($_plural,1), $word);
+				return preg_replace('/('.$_singular.')$/i', substr($arr[0], 0, 1).substr($_plural, 1), $word);
 			}
 		}
 		foreach ($singular as $rule => $replacement) {

src/Exceptions/NoRecordInsertionException.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @license  <https://opensource.org/license/MIT> MIT
  */
 
-namespace Laztopaz\potatoORM	;
+namespace Laztopaz\potatoORM;
 
 use Exception;
 

src/Database/DatabaseConnection.php

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();
 	    }
 	}
@@ -51,20 +51,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

@@ -41,9 +41,9 @@ 
     {
     	$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]);
     	if (is_null($dbConn)) {
@@ -55,15 +55,15 @@ 
     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;
     	
 	}
 
@@ -80,12 +80,12 @@ 
     	}
     	$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'".",";
     	}
     	
@@ -96,7 +96,7 @@ 
     	}
     	$stmt = $dbConn->prepare($updateSql);
     	$boolResponse = $stmt->execute();
-    	return $boolResponse ?  : false;
+    	return $boolResponse ?: false;
     }
     
   /**
@@ -111,7 +111,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);
@@ -123,7 +123,7 @@ 
    	}
    	$results = $stmt->fetchAll(PDO::FETCH_ASSOC);
    	
-   	foreach($results as $result) {
+   	foreach ($results as $result) {
    	    array_push($tableData, $result);
    	}
    	return $tableData;
@@ -142,7 +142,7 @@ 
       
       $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id;
       $boolResponse = $dbConn->exec($sql);
-      return $boolResponse ? : false;
+      return $boolResponse ?: false;
   }
   
   /**
@@ -155,7 +155,7 @@ 
   {
       $unexpectedFields = [];
       foreach ($userSetterArray as $key => $val) {
-          if (!in_array($key,$tableColumn)) {
+          if (!in_array($key, $tableColumn)) {
               $unexpectedFields[] = $key;
           }
       }
@@ -169,9 +169,9 @@ 
     */
   public function prepareUpdateQuery($sql)
   {
-      $splittedQuery = explode(",",$sql);
+      $splittedQuery = explode(",", $sql);
       array_pop($splittedQuery);
-      $mergeData = implode(",",$splittedQuery);
+      $mergeData = implode(",", $splittedQuery);
       return $mergeData;
   }
   
@@ -197,7 +197,7 @@ 
           $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");
   }
@@ -221,7 +221,7 @@ 
      $stmt->execute();
      $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
      
-     foreach($results as $result) {
+     foreach ($results as $result) {
          array_push($tableFields, $result['Field']);
      }
      return $tableFields;

src/Database/DatabaseHelper.php

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);
    	throw TableNotCreatedException::tableNotCreatedException("Check your database connection");