| @@ -14,7 +14,6 @@ | ||
| 14 | 14 | use Laztopaz\potatoORM\NoRecordFoundException; | 
| 15 | 15 | use Laztopaz\potatoORM\NoRecordInsertionException; | 
| 16 | 16 | use Laztopaz\potatoORM\NullArgumentPassedToFunction; | 
| 17 | -use Laztopaz\potatoORM\WrongArgumentException; | |
| 18 | 17 | use Laztopaz\potatoORM\NoArgumentPassedToFunctionException; | 
| 19 | 18 | use Laztopaz\potatoORM\EmptyArrayException; | 
| 20 | 19 | |
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 | |
| 39 | 39 |  			$sql = 'CREATE TABLE IF NOT EXISTS '.$tableName.'('; | 
| 40 | 40 | |
| 41 | - $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 ) )'; | |
| 41 | + $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 ) )'; | |
| 42 | 42 | |
| 43 | 43 | return $conn->exec($sql); | 
| 44 | 44 | |
| @@ -53,7 +53,7 @@ discard block | ||
| 53 | 53 | * @param $table | 
| 54 | 54 | * @return array | 
| 55 | 55 | */ | 
| 56 | -	public function getColumnNames($table, $conn = Null){ | |
| 56 | +	public function getColumnNames($table, $conn = Null) { | |
| 57 | 57 | |
| 58 | 58 | $tableFields = []; | 
| 59 | 59 | |
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | |
| 73 | 73 | $results = $stmt->fetchAll(PDO::FETCH_ASSOC); | 
| 74 | 74 | |
| 75 | -			foreach($results as $result) { | |
| 75 | +			foreach ($results as $result) { | |
| 76 | 76 | array_push($tableFields, $result['Field']); | 
| 77 | 77 | } | 
| 78 | 78 | |
| @@ -80,7 +80,7 @@ discard block | ||
| 80 | 80 | |
| 81 | 81 |  		} catch (PDOException $e) { | 
| 82 | 82 | |
| 83 | -			trigger_error('Could not connect to MySQL database. ' . $e->getMessage() , E_USER_ERROR); | |
| 83 | +			trigger_error('Could not connect to MySQL database. '.$e->getMessage(), E_USER_ERROR); | |
| 84 | 84 | } | 
| 85 | 85 | } | 
| 86 | 86 | |
| @@ -74,14 +74,14 @@ discard block | ||
| 74 | 74 | 'sex' => 'sexes', | 
| 75 | 75 | 'move' => 'moves'); | 
| 76 | 76 | $lowercased_word = strtolower($word); | 
| 77 | -		foreach ($uncountable as $_uncountable){ | |
| 78 | -			if(substr($lowercased_word,(-1*strlen($_uncountable))) == $_uncountable){ | |
| 77 | +		foreach ($uncountable as $_uncountable) { | |
| 78 | +			if (substr($lowercased_word, (-1*strlen($_uncountable))) == $_uncountable) { | |
| 79 | 79 | return $word; | 
| 80 | 80 | } | 
| 81 | 81 | } | 
| 82 | -		foreach ($irregular as $_plural=> $_singular){ | |
| 82 | +		foreach ($irregular as $_plural=> $_singular) { | |
| 83 | 83 |  			if (preg_match('/('.$_plural.')$/i', $word, $arr)) { | 
| 84 | -				return preg_replace('/('.$_plural.')$/i', substr($arr[0],0,1).substr($_singular,1), $word); | |
| 84 | +				return preg_replace('/('.$_plural.')$/i', substr($arr[0], 0, 1).substr($_singular, 1), $word); | |
| 85 | 85 | } | 
| 86 | 86 | } | 
| 87 | 87 |  		foreach ($plural as $rule => $replacement) { | 
| @@ -101,7 +101,7 @@ discard block | ||
| 101 | 101 | */ | 
| 102 | 102 | public function singularize($word) | 
| 103 | 103 |  	{ | 
| 104 | - $singular = array ( | |
| 104 | + $singular = array( | |
| 105 | 105 | '/(quiz)zes$/i' => "$1", | 
| 106 | 106 | '/(matr)ices$/i' => "$1ix", | 
| 107 | 107 | '/(vert|ind)ices$/i' => "$1ex", | 
| @@ -139,14 +139,14 @@ discard block | ||
| 139 | 139 | 'sex' => 'sexes', | 
| 140 | 140 | 'move' => 'moves'); | 
| 141 | 141 | $lowercased_word = strtolower($word); | 
| 142 | -		foreach ($uncountable as $_uncountable){ | |
| 143 | -			if(substr($lowercased_word,(-1*strlen($_uncountable))) == $_uncountable){ | |
| 142 | +		foreach ($uncountable as $_uncountable) { | |
| 143 | +			if (substr($lowercased_word, (-1*strlen($_uncountable))) == $_uncountable) { | |
| 144 | 144 | return $word; | 
| 145 | 145 | } | 
| 146 | 146 | } | 
| 147 | -		foreach ($irregular as $_plural=> $_singular){ | |
| 147 | +		foreach ($irregular as $_plural=> $_singular) { | |
| 148 | 148 |  			if (preg_match('/('.$_singular.')$/i', $word, $arr)) { | 
| 149 | -				return preg_replace('/('.$_singular.')$/i', substr($arr[0],0,1).substr($_plural,1), $word); | |
| 149 | +				return preg_replace('/('.$_singular.')$/i', substr($arr[0], 0, 1).substr($_plural, 1), $word); | |
| 150 | 150 | } | 
| 151 | 151 | } | 
| 152 | 152 |  		foreach ($singular as $rule => $replacement) { | 
| @@ -6,7 +6,7 @@ | ||
| 6 | 6 | * @license <https://opensource.org/license/MIT> MIT | 
| 7 | 7 | */ | 
| 8 | 8 | |
| 9 | -namespace Laztopaz\potatoORM ; | |
| 9 | +namespace Laztopaz\potatoORM; | |
| 10 | 10 | |
| 11 | 11 | use Exception; | 
| 12 | 12 | |
| @@ -42,11 +42,11 @@ discard block | ||
| 42 | 42 | */ | 
| 43 | 43 | public function create($associative1DArray, $tableName, $dbConn = Null) | 
| 44 | 44 |  	{ | 
| 45 | - $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->tableFields,$associative1DArray); | |
| 45 | + $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->tableFields, $associative1DArray); | |
| 46 | 46 | |
| 47 | 47 | if (count($unexpectedFields) > 0) | 
| 48 | 48 |  		{ | 
| 49 | - throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields,"needs to be created as table field"); | |
| 49 | + throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields, "needs to be created as table field"); | |
| 50 | 50 | } | 
| 51 | 51 | |
| 52 | 52 | unset($this->tableFields[0]); | 
| @@ -57,7 +57,7 @@ discard block | ||
| 57 | 57 | |
| 58 | 58 | $insertQuery = 'INSERT INTO '.$tableName; | 
| 59 | 59 | |
| 60 | -		$TableValues = implode(',',array_keys($associative1DArray)); | |
| 60 | +		$TableValues = implode(',', array_keys($associative1DArray)); | |
| 61 | 61 | |
| 62 | 62 |  		foreach ($associative1DArray as $field => $value) { | 
| 63 | 63 | |
| @@ -65,13 +65,13 @@ discard block | ||
| 65 | 65 | } | 
| 66 | 66 |  		$splittedTableValues = implode(',', $FormValues); | 
| 67 | 67 | |
| 68 | -		$insertQuery.= ' ('.$TableValues.')'; | |
| 68 | +		$insertQuery .= ' ('.$TableValues.')'; | |
| 69 | 69 | |
| 70 | -		$insertQuery.= ' VALUES ('.$splittedTableValues.')'; | |
| 70 | +		$insertQuery .= ' VALUES ('.$splittedTableValues.')'; | |
| 71 | 71 | |
| 72 | 72 | $executeQuery = $dbConn->exec($insertQuery); | 
| 73 | 73 | |
| 74 | - return $executeQuery ? : false; | |
| 74 | + return $executeQuery ?: false; | |
| 75 | 75 | } | 
| 76 | 76 | |
| 77 | 77 | /* | 
| @@ -92,15 +92,15 @@ discard block | ||
| 92 | 92 | |
| 93 | 93 | unset($associative1DArray['id']); | 
| 94 | 94 | |
| 95 | - $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->tableFields,$associative1DArray); | |
| 95 | + $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->tableFields, $associative1DArray); | |
| 96 | 96 | |
| 97 | 97 |  		if (count($unexpectedFields) > 0) { | 
| 98 | 98 | |
| 99 | - throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields,"needs to be created as table field"); | |
| 99 | + throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields, "needs to be created as table field"); | |
| 100 | 100 | } | 
| 101 | 101 | |
| 102 | 102 | |
| 103 | - foreach($associative1DArray as $field => $value) | |
| 103 | + foreach ($associative1DArray as $field => $value) | |
| 104 | 104 |  		{ | 
| 105 | 105 | $sql .= "`$field` = '$value'".","; | 
| 106 | 106 | } | 
| @@ -116,7 +116,7 @@ discard block | ||
| 116 | 116 | |
| 117 | 117 | $boolResponse = $stmt->execute(); | 
| 118 | 118 | |
| 119 | - return $boolResponse ? : false; | |
| 119 | + return $boolResponse ?: false; | |
| 120 | 120 | } | 
| 121 | 121 | |
| 122 | 122 | /** | 
| @@ -134,7 +134,7 @@ discard block | ||
| 134 | 134 | |
| 135 | 135 | } | 
| 136 | 136 | |
| 137 | - $sql = $id ? 'SELECT * FROM '.$tableName.' WHERE id = '.$id : 'SELECT * FROM '.$tableName; | |
| 137 | + $sql = $id ? 'SELECT * FROM '.$tableName.' WHERE id = '.$id : 'SELECT * FROM '.$tableName; | |
| 138 | 138 | |
| 139 | 139 |  		try { | 
| 140 | 140 | $stmt = $dbConn->prepare($sql); | 
| @@ -148,7 +148,7 @@ discard block | ||
| 148 | 148 | } | 
| 149 | 149 | $results = $stmt->fetchAll(PDO::FETCH_ASSOC); | 
| 150 | 150 | |
| 151 | -		foreach($results as $result) { | |
| 151 | +		foreach ($results as $result) { | |
| 152 | 152 | |
| 153 | 153 | array_push($tableData, $result); | 
| 154 | 154 | } | 
| @@ -173,7 +173,7 @@ discard block | ||
| 173 | 173 | |
| 174 | 174 | $boolResponse = $dbConn->exec($sql); | 
| 175 | 175 | |
| 176 | - return $boolResponse ? : false; | |
| 176 | + return $boolResponse ?: false; | |
| 177 | 177 | } | 
| 178 | 178 | |
| 179 | 179 | /** | 
| @@ -188,7 +188,7 @@ discard block | ||
| 188 | 188 | |
| 189 | 189 | foreach ($userSetterArray as $key => $val) | 
| 190 | 190 |  		{ | 
| 191 | -			if (!in_array($key,$tableColumn)) { | |
| 191 | +			if (!in_array($key, $tableColumn)) { | |
| 192 | 192 | |
| 193 | 193 | $unexpectedFields[] = $key; | 
| 194 | 194 | } | 
| @@ -204,11 +204,11 @@ discard block | ||
| 204 | 204 | */ | 
| 205 | 205 | private function prepareUpdateQuery($sql) | 
| 206 | 206 |  	{ | 
| 207 | -		$splittedQuery = explode(",",$sql); | |
| 207 | +		$splittedQuery = explode(",", $sql); | |
| 208 | 208 | |
| 209 | 209 | array_pop($splittedQuery); | 
| 210 | 210 | |
| 211 | -		$mergeData = implode(",",$splittedQuery); | |
| 211 | +		$mergeData = implode(",", $splittedQuery); | |
| 212 | 212 | |
| 213 | 213 | return $mergeData; | 
| 214 | 214 | } | 
| @@ -244,7 +244,7 @@ discard block | ||
| 244 | 244 | |
| 245 | 245 | $returnedRowNumbers = $statement->rowCount(); | 
| 246 | 246 | |
| 247 | - return $returnedRowNumbers ? true : false; | |
| 247 | + return $returnedRowNumbers ? true : false; | |
| 248 | 248 | } | 
| 249 | 249 | |
| 250 | 250 |  		throw EmptyArrayException::checkEmptyArrayException("Array Expected: parameter passed to this function is not an array"); | 
| @@ -24,11 +24,11 @@ discard block | ||
| 24 | 24 |  	{ | 
| 25 | 25 | self::loadEnv(); // load the environment variables | 
| 26 | 26 | |
| 27 | -		$this->databaseName     =  getenv('databaseName'); | |
| 28 | -		$this->databaseHost     =  getenv('databaseHost'); | |
| 29 | -		$this->databaseDriver   =  getenv('databaseDriver'); | |
| 30 | -		$this->databaseUsername =  getenv('databaseUsername'); | |
| 31 | -		$this->databasePassword =  getenv('databasePassword'); | |
| 27 | +		$this->databaseName     = getenv('databaseName'); | |
| 28 | +		$this->databaseHost     = getenv('databaseHost'); | |
| 29 | +		$this->databaseDriver   = getenv('databaseDriver'); | |
| 30 | +		$this->databaseUsername = getenv('databaseUsername'); | |
| 31 | +		$this->databasePassword = getenv('databasePassword'); | |
| 32 | 32 | |
| 33 | 33 |  		try { | 
| 34 | 34 | |
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 | ]; | 
| 41 | 41 | parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options); | 
| 42 | 42 | |
| 43 | -			} catch(PDOException $e) { | |
| 43 | +			} catch (PDOException $e) { | |
| 44 | 44 | |
| 45 | 45 | return $e->getMessage(); | 
| 46 | 46 | } | 
| @@ -61,21 +61,21 @@ discard block | ||
| 61 | 61 | case 'mysql': | 
| 62 | 62 | |
| 63 | 63 | // Set DSN | 
| 64 | - $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName; | |
| 64 | + $dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName; | |
| 65 | 65 | break; | 
| 66 | 66 | case 'sqlite': | 
| 67 | 67 | |
| 68 | 68 | // Set DSN | 
| 69 | - $dsn = 'sqlite:host='.$this->databaseHost.';dbname='. $this->databaseName; | |
| 69 | + $dsn = 'sqlite:host='.$this->databaseHost.';dbname='.$this->databaseName; | |
| 70 | 70 | break; | 
| 71 | 71 | case 'pgsql': | 
| 72 | 72 | |
| 73 | 73 | // Set DSN | 
| 74 | - $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='. $this->databaseName; | |
| 74 | + $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='.$this->databaseName; | |
| 75 | 75 | break; | 
| 76 | 76 | default: | 
| 77 | 77 | // Set DSN | 
| 78 | - $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName; | |
| 78 | + $dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName; | |
| 79 | 79 | } | 
| 80 | 80 | return $dsn; | 
| 81 | 81 | } |