andela-iadeniyi / Potato-ORM

src/Database/DatabaseQuery.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use PDOException;
 use Ibonly\PotatoORM\DatabaseQueryInterface;
 use Ibonly\PotatoORM\ColumnNotExistExeption;
-use Ibonly\PotatoORM\InvalidConnectionException;
 use Ibonly\PotatoORM\TableDoesNotExistException;
 
 class DatabaseQuery implements DatabaseQueryInterface

Doc Comments +11 added lines, -4 removed lines

@@ -82,6 +82,7 @@ 
     /**
      * getTableName()
      *
+     * @param string $connection
      * @return string
      */
     protected function getTableName($connection)
@@ -122,7 +123,7 @@ 
      * @param  $tablename
      * @param  $con
      *
-     * @return bool
+     * @return boolean|null
      */
     public function checkTableExist($table, $con=NULL)
     {
@@ -137,7 +138,7 @@ 
     /**
      * checkTableName Return the table name
      *
-     * @param  $tablename
+     * @param  string $tablename
      * @param  $con
      *
      * @return string
@@ -158,7 +159,7 @@ 
      * checkColumn Check if column exist in table
      *
      * @param  $tableName
-     * @param  $columnName
+     * @param  string $columnName
      * @param  $con
      *
      * @return string
@@ -315,6 +316,9 @@ 
     /**
      * selectQuery
      *
+     * @param string $tableName
+     * @param string $fields
+     * @param string $connection
      * @return string
      */
     public static function selectQuery($tableName, $fields, $data, $condition, $connection)
@@ -342,6 +346,7 @@ 
     /**
      * insertQuery
      *
+     * @param string $tableName
      * @return string
      */
     public function insertQuery($tableName)
@@ -358,6 +363,7 @@ 
     /**
      * updateQuery
      *
+     * @param string $tableName
      * @return string
      */
     public function updateQuery($tableName)
@@ -375,7 +381,8 @@ 
      * query($query, $dbCOnnection)
      * Raw sql query
      *
-     * @return object
+     * @param string $query
+     * @return GetData
      */
     public function query($query, $con = NULL)
     {

Spacing +16 added lines, -16 removed lines

@@ -124,11 +124,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;
         }
@@ -142,12 +142,12 @@ 
      *
      * @return string
      */
-    protected static function checkTableName($tableName, $con=NULL)
+    protected static function checkTableName($tableName, $con = NULL)
     {
         $connection = self::checkConnection($con);
 
         $query = $connection->query("SELECT 1 FROM {$tableName} LIMIT 1");
-        if($query !== false)
+        if ($query !== false)
         {
             return $tableName;
         }
@@ -163,13 +163,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();
             }
@@ -216,7 +216,7 @@ 
         {
             $counter++;
             $insertQuery .= self::sanitize($key);
-            if($arraySize > $counter)
+            if ($arraySize > $counter)
                 $insertQuery .= ", ";
         }
 
@@ -240,8 +240,8 @@ 
         foreach ($columnNames as $key => $value)
         {
             $counter++;
-            $insertQuery .= "'".self::sanitize($value) ."'";
-            if($arraySize > $counter)
+            $insertQuery .= "'".self::sanitize($value)."'";
+            if ($arraySize > $counter)
                 $insertQuery .= ", ";
         }
         return $insertQuery;
@@ -264,7 +264,7 @@ 
         {
             $counter++;
             $columnName = self::checkColumn($tableName, self::sanitize($key));
-            $updateQuery .= $columnName ." = '".self::sanitize($value)."'";
+            $updateQuery .= $columnName." = '".self::sanitize($value)."'";
             if ($arraySize > $counter)
             {
                 $updateQuery .= ", ";
@@ -299,10 +299,10 @@ 
             {
                 $counter++;
                 $columnName = self::checkColumn($tableName, self::sanitize($key));
-                $where .= $tableName.'.'.$columnName ." = '".self::sanitize($value)."'";
+                $where .= $tableName.'.'.$columnName." = '".self::sanitize($value)."'";
                 if ($arraySize > $counter)
                 {
-                    $where .= " " . $condition . " ";
+                    $where .= " ".$condition." ";
                 }
             }
         } else {
@@ -323,14 +323,14 @@ 
         try
         {
             $arraySize = count($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 $fields FROM $tableName WHERE $columnName";
+                $query = "SELECT $fields FROM $tableName WHERE $columnName";
             }
         } catch (PDOException $e) {
             $query = $e->getMessage();
@@ -362,11 +362,11 @@ 
      */
     public function updateQuery($tableName)
     {
-        $data = (array) $this;
+        $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;
     }

Braces +7 added lines, -6 removed lines

@@ -216,8 +216,9 @@ 
         {
             $counter++;
             $insertQuery .= self::sanitize($key);
-            if($arraySize > $counter)
-                $insertQuery .= ", ";
+            if($arraySize > $counter) {
+                            $insertQuery .= ", ";
+            }
         }
 
         return $insertQuery;
@@ -241,8 +242,9 @@ 
         {
             $counter++;
             $insertQuery .= "'".self::sanitize($value) ."'";
-            if($arraySize > $counter)
-                $insertQuery .= ", ";
+            if($arraySize > $counter) {
+                            $insertQuery .= ", ";
+            }
         }
         return $insertQuery;
     }
@@ -326,8 +328,7 @@ 
             if($arraySize > 1 && $condition == NULL)
             {
                 $query = "Please Supply the condition";
-            }
-            else
+            } else
             {
                 $columnName = self::whereAndClause($tableName, $data, $condition);
                 $query =  "SELECT $fields FROM $tableName WHERE $columnName";

src/Database/DBConfig.php

Braces +2 added lines, -4 removed lines

@@ -42,12 +42,10 @@
             if ($this->driver === 'pgsql' || $this->driver === 'postgres')
             {
                 parent::__construct($this->pgsqlConnectionString());
-            }
-            elseif ($this->driver === 'mysql')
+            } elseif ($this->driver === 'mysql')
             {
                 parent::__construct($this->mysqlConnectionString(), $this->user, $this->password);
-            }
-            elseif($this->driver === 'sqlite')
+            } elseif($this->driver === 'sqlite')
             {
                 parent::__construct($this->sqlitConnectionString());
             }

Spacing +5 added lines, -5 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,7 +91,7 @@ 
      */
     protected function loadEnv()
     {
-        if( ! getenv("APP_ENV"))
+        if ( ! getenv("APP_ENV"))
         {
             $dotenv = new Dotenv($_SERVER['DOCUMENT_ROOT']);
             $dotenv->load();

src/Helper/Inflector.php

Indentation +14 added lines, -14 removed lines

@@ -39,13 +39,13 @@ 
 trait Inflector
 {
     /**
-    * Pluralizes English nouns.
-    *
-    * @access public
-    * @static
-    * @param    string    $word    English noun to pluralize
-    * @return string Plural noun
-    */
+     * Pluralizes English nouns.
+     *
+     * @access public
+     * @static
+     * @param    string    $word    English noun to pluralize
+     * @return string Plural noun
+     */
     public static function pluralize($word)
     {
         $plural = array(
@@ -102,13 +102,13 @@ 
     }
 
     /**
-    * Singularizes English nouns.
-    *
-    * @access public
-    * @static
-    * @param    string    $word    English noun to singularize
-    * @return string Singular noun.
-    */
+     * Singularizes English nouns.
+     *
+     * @access public
+     * @static
+     * @param    string    $word    English noun to singularize
+     * @return string Singular noun.
+     */
     public function singularize($word)
     {
         $singular = array (

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/Schema.php

Braces +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
     {
         if(is_null($length)){
              $this->fieldDescription[] = $type ." ".$fieldName;
-        }else
+        } else
         {
          $this->fieldDescription[] = $type ." ".$fieldName." ".$length;
         }
@@ -52,7 +52,7 @@ 
             if(sizeof($e) == 2)
             {
                 $query .= $this->$e[0]($e[1], 20) .", ".PHP_EOL;
-            }else
+            } else
             {
                     $query .= $this->$e[0]($e[1], $e[2]) .", ".PHP_EOL;
             }
@@ -94,7 +94,7 @@ 
             {
                 return true;
             }
-        }catch(PDOException $e){
+        } catch(PDOException $e){
             return $e->getMessage();
         }
     }

Spacing +13 added lines, -13 removed lines

@@ -25,13 +25,13 @@ 
      *
      * @return array
      */
-    public function field($type, $fieldName, $length=NULL)
+    public function field($type, $fieldName, $length = NULL)
     {
-        if($length === null){
-             $this->fieldDescription[] = $type ." ".$fieldName;
-        }else
+        if ($length === null) {
+             $this->fieldDescription[] = $type." ".$fieldName;
+        } else
         {
-         $this->fieldDescription[] = $type ." ".$fieldName." ".$length;
+         $this->fieldDescription[] = $type." ".$fieldName." ".$length;
         }
 
     }
@@ -51,12 +51,12 @@ 
             $fields = explode(" ", $fieldName);
          
             $constrain = $fields[0];
-            if(count($fields) == 2)
+            if (count($fields) == 2)
             {
-                $query .= $this->$constrain($fields[1], 20) .", ".PHP_EOL;
-            }else
+                $query .= $this->$constrain($fields[1], 20).", ".PHP_EOL;
+            } else
             {
-                    $query .= $this->$constrain($fields[1], $fields[2]) .", ".PHP_EOL;
+                    $query .= $this->$constrain($fields[1], $fields[2]).", ".PHP_EOL;
             }
         };
         array_walk($this->fieldDescription, $callback);
@@ -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";
     }
 
     /**
@@ -202,6 +202,6 @@ 
                     $apend = 'timestamp';
                 break;
         }
-        return $value . " " . $apend . " NOT NULL";
+        return $value." ".$apend." NOT NULL";
     }
 }
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
     public function field($type, $fieldName, $length=NULL)
     {
         if($length === null){
-             $this->fieldDescription[] = $type ." ".$fieldName;
+                $this->fieldDescription[] = $type ." ".$fieldName;
         }else
         {
-         $this->fieldDescription[] = $type ." ".$fieldName." ".$length;
+            $this->fieldDescription[] = $type ." ".$fieldName." ".$length;
         }
 
     }

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/Helper/Model.php

Unused Use Statements -5 removed lines

@@ -9,17 +9,12 @@
 
 namespace Ibonly\PotatoORM;
 
-use PDO;
-use Exception;
-use PDOException;
 use Ibonly\PotatoORM\GetData;
 use Ibonly\PotatoORM\DatabaseQuery;
 use Ibonly\PotatoORM\ModelInterface;
 use Ibonly\PotatoORM\UserNotFoundException;
 use Ibonly\PotatoORM\EmptyDatabaseException;
 use Ibonly\PotatoORM\SaveUserExistException;
-use Ibonly\PotatoORM\ColumnNotExistExeption;
-use Ibonly\PotatoORM\InvalidConnectionException;
 
 class Model extends DatabaseQuery implements ModelInterface
 {

Doc Comments +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
      * getALL()
      * Get all record from the database
      *
-     * @return object
+     * @return GetData
      */
     public function getAll($dbConnection = NULL)
     {
@@ -44,7 +44,7 @@ 
      * where($data, $condition)
      * Get data from database where $data = $condition
      *
-     * @return object
+     * @return GetData
      */
     public function where($data, $condition = NULL, $dbConnection = NULL)
     {
@@ -64,7 +64,7 @@ 
      * find($value)
      * Find data from database where id = $value
      *
-     * @return array
+     * @return Model
      */
     public static function find($value, $dbConnection = NULL)
     {

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 
         $query = $this->insertQuery(self::getTableName($connection));
         $statement = $connection->prepare($query);
-        if($statement->execute()) {
+        if ($statement->execute()) {
             return true;
         }
         throw new  DataAlreadyExistException();
@@ -129,7 +129,7 @@ 
     {
         $connection = DatabaseQuery::checkConnection($dbConnection);
 
-        $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) {

src/Exceptions/DataAlreadyExistException.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/DataNotFoundException.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