andela-iadeniyi / Potato-ORM

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/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/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

src/Database/DBConfig.php

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

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

src/Helper/Model.php

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

Doc Comments +3 added lines

@@ -41,6 +41,9 @@
         return $output;
     }
 
+    /**
+     * @param string $con
+     */
     public function whereClause($data = null, $condition = null, $con = null)
     {
     	$joinClause = self::joinClause();

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@ 
         $output = "";
         $i = 0;
 
-        if (! isset($data[0]) || $data[1]->REFERENCED_TABLE_NAME !== null) {
-            foreach($data as $key => $value) {
+        if ( ! isset($data[0]) || $data[1]->REFERENCED_TABLE_NAME !== null) {
+            foreach ($data as $key => $value) {
                 if ( ! empty($value->REFERENCED_TABLE_NAME)) {
                     $output .= ' JOIN '.$value->REFERENCED_TABLE_NAME;
                 }
             }
-            foreach($data as $key => $value) {
+            foreach ($data as $key => $value) {
                 $i++;
                 $whereAnd = $i > 1 ? 'AND' : 'WHERE';
-                if ( empty($value->REFERENCED_TABLE_NAME)) {
+                if (empty($value->REFERENCED_TABLE_NAME)) {
                     $value->REFERENCED_TABLE_NAME = self::getTableName($connection);
                     $value->REFERENCED_COLUMN_NAME = $value->COLUMN_NAME;
                 }
@@ -58,7 +58,7 @@ 
         } else if ($joinClause == false && $data !== null) {
             $query .= ' WHERE '.$columnName;
         } else {
-            $query .= ($data === null) ? $joinClause : $joinClause .' AND '.$columnName;
+            $query .= ($data === null) ? $joinClause : $joinClause.' AND '.$columnName;
         }
         return $query;
     }