andela-iadeniyi / Potato-ORM

src/Database/DBConfig.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
             {
                 parent::__construct($this->mysqlConnectionString(), $this->user, $this->password);
             }
-            elseif($this->driver === 'sqlite')
+            elseif ($this->driver === 'sqlite')
             {
                 parent::__construct($this->sqlitConnectionString());
             }
@@ -63,7 +63,7 @@ 
      */
     protected function pgsqlConnectionString()
     {
-        return $this->driver . ':host=' . $this->host . ';port=' . $this->port . ';dbname=' . $this->dbname . ';user=' . $this->user . ';password=' . $this->password;
+        return $this->driver.':host='.$this->host.';port='.$this->port.';dbname='.$this->dbname.';user='.$this->user.';password='.$this->password;
     }
 
     /**
@@ -73,7 +73,7 @@ 
      */
     protected function mysqlConnectionString()
     {
-        return $this->driver . ':host=' . $this->host . ';dbname=' . $this->dbname . ';charset=utf8mb4';
+        return $this->driver.':host='.$this->host.';dbname='.$this->dbname.';charset=utf8mb4';
     }
 
     /**
@@ -83,7 +83,7 @@ 
      */
     protected function sqlitConnectionString()
     {
-        return $this->driver . ':' . $this->sqlitePath;
+        return $this->driver.':'.$this->sqlitePath;
     }
 
     /**
@@ -91,9 +91,9 @@ 
      */
     protected function loadEnv()
     {
-        if( ! getenv("APP_ENV" !== "production"))
+        if ( ! getenv("APP_ENV" !== "production"))
         {
-            $dotenv = new Dotenv(__DIR__ . "/../../");
+            $dotenv = new Dotenv(__DIR__."/../../");
             $dotenv->load();
         }
     }

src/Database/DatabaseQuery.php

Spacing +26 added lines, -26 removed lines

@@ -49,7 +49,7 @@ 
      */
     protected static function checkConnection($con)
     {
-        if( is_null($con) )
+        if (is_null($con))
         {
             $con = self::connect();
         }
@@ -64,11 +64,11 @@ 
      *
      * @return bool
      */
-    public function checkTableExist($table, $con=NULL)
+    public function checkTableExist($table, $con = NULL)
     {
         $connection = $this->checkConnection($con);
         $query = $connection->query("SELECT 1 FROM {$table} LIMIT 1");
-        if( $query !== false )
+        if ($query !== false)
         {
             return true;
         }
@@ -82,13 +82,13 @@ 
      *
      * @return string
      */
-    public static function checkTableName($tableName, $con=NULL)
+    public static function checkTableName($tableName, $con = NULL)
     {
         $connection = self::checkConnection($con);
         // if( ! is_null($connection) )
         // {
             $query = $connection->query("SELECT 1 FROM {$tableName} LIMIT 1");
-            if( $query !== false )
+            if ($query !== false)
             {
                 return $tableName;
             }
@@ -106,13 +106,13 @@ 
      *
      * @return string
      */
-    protected static function checkColumn($tableName, $columnName, $con=NULL)
+    protected static function checkColumn($tableName, $columnName, $con = NULL)
     {
         $connection = self::checkConnection($con);
 
             $result = $connection->prepare("SELECT {$columnName} FROM {$tableName}");
             $result->execute();
-            if ( ! $result->columnCount() )
+            if ( ! $result->columnCount())
             {
                 throw new ColumnNotExistExeption();
             }
@@ -132,11 +132,11 @@ 
         $insertQuery = "";
         $arraySize = sizeof($data);
 
-        foreach ( $data as $key => $value )
+        foreach ($data as $key => $value)
         {
             $counter++;
             $insertQuery .= self::sanitize($key);
-            if( $arraySize > $counter )
+            if ($arraySize > $counter)
                 $insertQuery .= ", ";
         }
         return $insertQuery;
@@ -155,11 +155,11 @@ 
         $insertQuery = "";
         $arraySize = sizeof($data);
 
-        foreach ( $data as $key => $value )
+        foreach ($data as $key => $value)
         {
             $counter++;
-            $insertQuery .= "'".self::sanitize($value) ."'";
-            if( $arraySize > $counter )
+            $insertQuery .= "'".self::sanitize($value)."'";
+            if ($arraySize > $counter)
                 $insertQuery .= ", ";
         }
         return $insertQuery;
@@ -178,12 +178,12 @@ 
         $updateQuery = "";
         $arraySize = sizeof($data);
 
-        foreach ( $data as $key => $value )
+        foreach ($data as $key => $value)
         {
             $counter++;
             $columnName = self::checkColumn($tableName, self::sanitize($key));
-            $updateQuery .= $columnName ." = '".self::sanitize($value)."'";
-            if ( $arraySize > $counter )
+            $updateQuery .= $columnName." = '".self::sanitize($value)."'";
+            if ($arraySize > $counter)
             {
                 $updateQuery .= ", ";
             }
@@ -212,14 +212,14 @@ 
         $counter = 0;
         $arraySize = sizeof($data);
 
-        foreach ( $data as $key => $value )
+        foreach ($data as $key => $value)
         {
             $counter++;
             $columnName = self::checkColumn($tableName, self::sanitize($key));
-            $where .= $columnName ." = '".self::sanitize($value)."'";
-            if ( $arraySize > $counter )
+            $where .= $columnName." = '".self::sanitize($value)."'";
+            if ($arraySize > $counter)
             {
-                $where .= " " . $condition . " ";
+                $where .= " ".$condition." ";
             }
         }
 
@@ -237,16 +237,16 @@ 
         try
         {
             $arraySize = sizeof($data);
-            if( $arraySize > 1 && $condition == NULL)
+            if ($arraySize > 1 && $condition == NULL)
             {
                 $query = "Please Supply the condition";
             }
             else
             {
                 $columnName = self::whereAndClause($tableName, $data, $condition);
-                $query =  "SELECT * FROM $tableName WHERE $columnName";
+                $query = "SELECT * FROM $tableName WHERE $columnName";
             }
-        } catch ( PDOException $e ) {
+        } catch (PDOException $e) {
             $query = $e->getMessage();
         }
 
@@ -260,7 +260,7 @@ 
      */
     public function insertQuery($tableName)
     {
-        $data = ( array )$this;
+        $data = (array)$this;
         array_shift($data);
 
         $columnNames = self::buildColumn($data);
@@ -277,11 +277,11 @@ 
      */
     public function updateQuery($tableName)
     {
-        $data = ( array ) $this;
-        $data = array_slice ($data, 2);
+        $data = (array)$this;
+        $data = array_slice($data, 2);
 
         $values = self::buildClause($tableName, $data);
-        $updateQuery = "UPDATE $tableName SET {$values} WHERE id = ". self::sanitize($this->id);
+        $updateQuery = "UPDATE $tableName SET {$values} WHERE id = ".self::sanitize($this->id);
 
         return $updateQuery;
     }

src/Exceptions/EmptyDatabaseException.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
      */
     public function errorMessage()
     {
-        return "Error: " . $this->getMessage();
+        return "Error: ".$this->getMessage();
     }
 }
\ No newline at end of file

src/Exceptions/ErrorInsertingException.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
      */
     public function errorMessage()
     {
-        return "Error: " . $this->getMessage();
+        return "Error: ".$this->getMessage();
     }
 }
\ No newline at end of file

src/Exceptions/SaveUserExistException.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
      */
     public function errorMessage()
     {
-        return "Error: " . $this->getMessage();
+        return "Error: ".$this->getMessage();
     }
 }
\ No newline at end of file

src/Exceptions/UserNotFoundException.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
      */
     public function errorMessage()
     {
-        return "Error: " . $this->getMessage();
+        return "Error: ".$this->getMessage();
     }
 }
\ No newline at end of file

src/Helper/Inflector.php

Spacing +9 added lines, -9 removed lines

@@ -81,15 +81,15 @@ 
 
         $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);
             }
         }
 
@@ -111,7 +111,7 @@ 
     */
     public function singularize($word)
     {
-        $singular = array (
+        $singular = array(
             '/(quiz)zes$/i'             => "$1",
             '/(matr)ices$/i'            => "$1ix",
             '/(vert|ind)ices$/i'        => "$1ex",
@@ -152,15 +152,15 @@ 
         '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);
             }
         }
 

src/Helper/Model.php

Spacing +31 added lines, -31 removed lines

@@ -72,16 +72,16 @@ 
             $sqlQuery = DatabaseQuery::selectAllQuery(self::getTableName($connection));
             $query = $connection->prepare($sqlQuery);
             $query->execute();
-            if ( $query->rowCount() )
+            if ($query->rowCount())
             {
                 return new GetData($query->fetchAll($connection::FETCH_ASSOC));
             }
             throw new EmptyDatabaseException();
-        } catch ( EmptyDatabaseException $e ){
+        } catch (EmptyDatabaseException $e) {
             echo $e->errorMessage();
-        } catch ( TableDoesNotExistException $e ){
+        } catch (TableDoesNotExistException $e) {
             echo $e->errorMessage();
-        } catch ( InvalidConnectionException $e ){
+        } catch (InvalidConnectionException $e) {
             echo $e->errorMessage();
         }
     }
@@ -101,18 +101,18 @@ 
             $sqlQuery = $databaseQuery->selectQuery(self::getTableName($connection), $data, $condition, $connection);
             $query = $connection->prepare($sqlQuery);
             $query->execute();
-            if ( $query->rowCount() )
+            if ($query->rowCount())
             {
                 return new GetData($query->fetchAll($connection::FETCH_ASSOC));
             }
             throw new UserNotFoundException();
-        } catch ( UserNotFoundException $e ){
+        } catch (UserNotFoundException $e) {
             echo $e->errorMessage();
-        } catch ( TableDoesNotExistException $e ){
+        } catch (TableDoesNotExistException $e) {
             echo $e->errorMessage();
-        }  catch ( InvalidConnectionException $e ){
+        } catch (InvalidConnectionException $e) {
             echo $e->errorMessage();
-        }  catch ( ColumnNotExistExeption $e ){
+        } catch (ColumnNotExistExeption $e) {
             echo $e->errorMessage();
         }
     }
@@ -131,7 +131,7 @@ 
             $sqlQuery = DatabaseQuery::selectQuery(self::getTableName($connection), 'id', $value, $connection);
             $query = $connection->prepare($sqlQuery);
             $query->execute();
-            if ( $query->rowCount() )
+            if ($query->rowCount())
             {
                 $found = new static;
                 $found->id = $value;
@@ -139,13 +139,13 @@ 
                 return $found;
             }
             throw new UserNotFoundException();
-        } catch ( UserNotFoundException $e ){
+        } catch (UserNotFoundException $e) {
             echo $e->errorMessage();
-        } catch ( TableDoesNotExistException $e ){
+        } catch (TableDoesNotExistException $e) {
             echo $e->errorMessage();
-        }  catch ( InvalidConnectionException $e ){
+        } catch (InvalidConnectionException $e) {
             echo $e->errorMessage();
-        }  catch ( ColumnNotExistExeption $e ){
+        } catch (ColumnNotExistExeption $e) {
             echo $e->errorMessage();
         }
     }
@@ -163,21 +163,21 @@ 
         {
             $query = $this->insertQuery(self::getTableName($connection));
             $statement = $connection->prepare($query);
-            if( $statement->execute() )
+            if ($statement->execute())
             {
                 return true;
             }
             throw new  SaveUserExistException();
 
-        } catch ( PDOException $e ){
+        } catch (PDOException $e) {
             throw new  SaveUserExistException($e->getMessage());
-        } catch( SaveUserExistException $e ) {
+        } catch (SaveUserExistException $e) {
             return $e->getMessage();
-        } catch ( TableDoesNotExistException $e ){
+        } catch (TableDoesNotExistException $e) {
             echo $e->errorMessage();
-        }  catch ( InvalidConnectionException $e ){
+        } catch (InvalidConnectionException $e) {
             echo $e->errorMessage();
-        }  catch ( ColumnNotExistExeption $e ){
+        } catch (ColumnNotExistExeption $e) {
             echo $e->errorMessage();
         }
     }
@@ -195,21 +195,21 @@ 
         {
             $updateQuery = $this->updateQuery(self::getTableName($connection));
             $statement = $connection->prepare($updateQuery);
-            if( $statement->execute() )
+            if ($statement->execute())
             {
                 return true;
             }
             throw new  SaveUserExistException();
 
-        } catch ( PDOException $e ){
+        } catch (PDOException $e) {
             throw new  SaveUserExistException($e->getMessage());
-        } catch( SaveUserExistException $e ) {
+        } catch (SaveUserExistException $e) {
             return $e->getMessage();
-        } catch ( TableDoesNotExistException $e ){
+        } catch (TableDoesNotExistException $e) {
             echo $e->errorMessage();
-        }  catch ( InvalidConnectionException $e ){
+        } catch (InvalidConnectionException $e) {
             echo $e->errorMessage();
-        }  catch ( ColumnNotExistExeption $e ){
+        } catch (ColumnNotExistExeption $e) {
             echo $e->errorMessage();
         }
     }
@@ -225,7 +225,7 @@ 
         $connection = DatabaseQuery::checkConnection($dbConnection);
         try
         {
-            $query = $connection->prepare('DELETE FROM ' . self::getTableName($connection) . ' WHERE id = '.$value);
+            $query = $connection->prepare('DELETE FROM '.self::getTableName($connection).' WHERE id = '.$value);
             $query->execute();
             $check = $query->rowCount();
             if ($check)
@@ -233,13 +233,13 @@ 
                 return true;
             }
             throw new UserNotFoundException;
-        } catch ( UserNotFoundException $e ) {
+        } catch (UserNotFoundException $e) {
             return $e->errorMessage();
-        } catch ( TableDoesNotExistException $e ){
+        } catch (TableDoesNotExistException $e) {
             echo $e->errorMessage();
-        }  catch ( InvalidConnectionException $e ){
+        } catch (InvalidConnectionException $e) {
             echo $e->errorMessage();
-        }  catch ( ColumnNotExistExeption $e ){
+        } catch (ColumnNotExistExeption $e) {
             echo $e->errorMessage();
         }
     }

src/Helper/Schema.php

Spacing +14 added lines, -14 removed lines

@@ -25,13 +25,13 @@ 
      *
      * @return array
      */
-    public function field($type, $fieldName, $length=NULL)
+    public function field($type, $fieldName, $length = NULL)
     {
-        if(is_null($length)){
-             $this->fieldDescription[] = $type ." ".$fieldName;
-        }else
+        if (is_null($length)) {
+             $this->fieldDescription[] = $type." ".$fieldName;
+        } else
         {
-         $this->fieldDescription[] = $type ." ".$fieldName." ".$length;
+         $this->fieldDescription[] = $type." ".$fieldName." ".$length;
         }
 
     }
@@ -49,12 +49,12 @@ 
         $callback = function($fieldName) use (&$query)
         {
             $e = explode(" ", $fieldName);
-            if(sizeof($e) == 2)
+            if (sizeof($e) == 2)
             {
-                $query .= $this->$e[0]($e[1], 20) .", ".PHP_EOL;
-            }else
+                $query .= $this->$e[0]($e[1], 20).", ".PHP_EOL;
+            } else
             {
-                    $query .= $this->$e[0]($e[1], $e[2]) .", ".PHP_EOL;
+                    $query .= $this->$e[0]($e[1], $e[2]).", ".PHP_EOL;
             }
         };
         array_walk($this->fieldDescription, $callback);
@@ -82,7 +82,7 @@ 
      */
     public function createTable($tablename, $connection = NULL)
     {
-        if(is_null($connection))
+        if (is_null($connection))
         {
             $connection = DatabaseQuery::connect();
         }
@@ -90,11 +90,11 @@ 
         {
             $sqlQuery = self::sanitizeQuery($tablename);
             $query = $connection->prepare($sqlQuery);
-            if($query->execute())
+            if ($query->execute())
             {
                 return true;
             }
-        }catch(PDOException $e){
+        } catch (PDOException $e) {
             return $e->getMessage();
         }
     }
@@ -116,7 +116,7 @@ 
      */
     public function strings($value, $length)
     {
-        return $value ." varchar (".$length.") NOT NULL";
+        return $value." varchar (".$length.") NOT NULL";
     }
 
     /**
@@ -201,6 +201,6 @@ 
                     $apend = 'timestamp';
                 break;
         }
-        return $value . " " . $apend . " NOT NULL";
+        return $value." ".$apend." NOT NULL";
     }
 }
\ No newline at end of file