andela-joyebanji / PotatoORM

potatoTest.php

Doc Comments +2 added lines, -1 removed lines

@@ -371,6 +371,7 @@ 
     /**
      * Delete model with the specified id.
      * 
+     * @return boolean
      */
     static function destroy($id);
 }
@@ -445,7 +446,7 @@ 
      * Determine if a given string contains a given substring.
      *
      * @param  string  $haystack
-     * @param  string|array  $needles
+     * @param  string[]  $needles
      * @return bool
      */
     public static function contains($haystack, $needles)

Spacing +17 added lines, -17 removed lines

@@ -191,7 +191,7 @@ 
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
-        $table = strtolower(end($className) .'s');
+        $table = strtolower(end($className) . 's');
         return $table;
     }
     /**
@@ -217,7 +217,7 @@ 
         $sqlStatement = $this->databaseConnection->prepare($sql);
         $sqlStatement->setFetchMode(PDO::FETCH_CLASS, get_called_class());
         $sqlStatement->execute();
-        if($sqlStatement->rowCount() < 1){
+        if ($sqlStatement->rowCount() < 1) {
             throw new ModelNotFoundException($id);
         }
         return $sqlStatement->fetch();
@@ -247,20 +247,20 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $update = "UPDATE " . $this->getTableName() . " SET " ;
+        $update = "UPDATE " . $this->getTableName() . " SET ";
         foreach ($this->properties as $key => $val) {
             $count++;
-            if(($key == 'id')) continue;
+            if (($key == 'id')) continue;
             $update .= "$key = '$val'";
-            if ($count < count($this->properties) )
+            if ($count < count($this->properties))
             {
-                $update .=",";
+                $update .= ",";
             }
         }
         $update .= " WHERE id = " . $this->properties['id'];
         $stmt = $connection->prepare($update);
             foreach ($this->properties as $key => $val) {
-                if($key == 'id') continue;
+                if ($key == 'id') continue;
             }
         $stmt->execute();
         return $stmt->rowCount();
@@ -274,7 +274,7 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $create = "INSERT" . " INTO " . $this->getTableName()." (";
+        $create = "INSERT" . " INTO " . $this->getTableName() . " (";
             foreach ($this->properties as $key => $val) {
                 $columnNames .= $key;
                 $columnValues .= ':' . $key;
@@ -285,15 +285,15 @@ 
                     $columnValues .= ', ';
                 }
             }
-        $create .= $columnNames.') VALUES (' .$columnValues.')';
+        $create .= $columnNames . ') VALUES (' . $columnValues . ')';
         $stmt = $connection->prepare($create);
             foreach ($this->properties as $key => $val) {
-                $stmt->bindValue(':'.$key, $val);
+                $stmt->bindValue(':' . $key, $val);
             }
             try {
                 // if prop returned and props from db differ throw exception
                 $stmt->execute();
-            } catch(PDOException $e){
+            } catch (PDOException $e) {
                 return $e->getExceptionMessage();
             }
         return $stmt->rowCount();
@@ -303,7 +303,7 @@ 
     */
     public function getConnection($connection = null)
     {
-        if(is_null($connection))
+        if (is_null($connection))
         {
             return new Connection();
         }
@@ -329,7 +329,7 @@ 
     public static function destroy($id)
     {
         
-        $sql = "DELETE" . " FROM " . self::getTableName()." WHERE id = ". $id;
+        $sql = "DELETE" . " FROM " . self::getTableName() . " WHERE id = " . $id;
         $delete = $connection->prepare($sql);
         $delete->execute();
         $count = $delete->rowCount();
@@ -391,13 +391,13 @@ 
 
         switch ($driver) {
             case 'sqlite':
-                $dsn = $driver.'::memory:';
+                $dsn = $driver . '::memory:';
                 break;
             case 'mysql':
             case 'postgres':
-                if(strcasecmp($driver, 'postgres') == 0) $driver="pgsql";
-                $dsn = $driver.':host='.$config['HOSTNAME'].';dbname='.$config['DBNAME'];
-                if(isset($config['PORT'])) $dsn .= ';port='.$config['PORT'];
+                if (strcasecmp($driver, 'postgres') == 0) $driver = "pgsql";
+                $dsn = $driver . ':host=' . $config['HOSTNAME'] . ';dbname=' . $config['DBNAME'];
+                if (isset($config['PORT'])) $dsn .= ';port=' . $config['PORT'];
                 break;
             default:
                 throw new DatabaseDriverNotSupportedException;

src/DatabaseConnectionStringFactory.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@
 
         switch ($driver) {
             case 'sqlite':
-                $dsn = $driver.'::memory:';
+                $dsn = $driver . '::memory:';
                 break;
             case 'mysql':
             case 'postgres':
-                if(strcasecmp($driver, 'postgres') == 0) $driver="pgsql";
-                $dsn = $driver.':host='.$config['HOSTNAME'].';dbname='.$config['DBNAME'];
-                if(isset($config['PORT'])) $dsn .= ';port='.$config['PORT'];
+                if (strcasecmp($driver, 'postgres') == 0) $driver = "pgsql";
+                $dsn = $driver . ':host=' . $config['HOSTNAME'] . ';dbname=' . $config['DBNAME'];
+                if (isset($config['PORT'])) $dsn .= ';port=' . $config['PORT'];
                 break;
             default:
                 throw new DatabaseDriverNotSupportedException;

src/Model.php

Spacing +13 added lines, -13 removed lines

@@ -55,7 +55,7 @@ 
     public function getTableName()
     {
         $className = explode('\\', get_called_class());
-        $table = strtolower(end($className) .'s');
+        $table = strtolower(end($className) . 's');
         return $table;
     }
     /**
@@ -81,7 +81,7 @@ 
         $sqlStatement = $this->databaseConnection->prepare($sql);
         $sqlStatement->setFetchMode($this->databaseConnection::FETCH_CLASS, get_called_class());
         $sqlStatement->execute();
-        if($sqlStatement->rowCount() < 1){
+        if ($sqlStatement->rowCount() < 1) {
             throw new ModelNotFoundException($id);
         }
         return $sqlStatement->fetch();
@@ -111,20 +111,20 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $update = "UPDATE " . $this->getTableName() . " SET " ;
+        $update = "UPDATE " . $this->getTableName() . " SET ";
         foreach ($this->properties as $key => $val) {
             $count++;
-            if(($key == 'id')) continue;
+            if (($key == 'id')) continue;
             $update .= "$key = '$val'";
-            if ($count < count($this->properties) )
+            if ($count < count($this->properties))
             {
-                $update .=",";
+                $update .= ",";
             }
         }
         $update .= " WHERE id = " . $this->properties['id'];
         $stmt = $connection->prepare($update);
             foreach ($this->properties as $key => $val) {
-                if($key == 'id') continue;
+                if ($key == 'id') continue;
             }
         $stmt->execute();
         return $stmt->rowCount();
@@ -138,7 +138,7 @@ 
         $columnNames = "";
         $columnValues = "";
         $count = 0;
-        $create = "INSERT" . " INTO " . $this->getTableName()." (";
+        $create = "INSERT" . " INTO " . $this->getTableName() . " (";
             foreach ($this->properties as $key => $val) {
                 $columnNames .= $key;
                 $columnValues .= ':' . $key;
@@ -149,15 +149,15 @@ 
                     $columnValues .= ', ';
                 }
             }
-        $create .= $columnNames.') VALUES (' .$columnValues.')';
+        $create .= $columnNames . ') VALUES (' . $columnValues . ')';
         $stmt = $connection->prepare($create);
             foreach ($this->properties as $key => $val) {
-                $stmt->bindValue(':'.$key, $val);
+                $stmt->bindValue(':' . $key, $val);
             }
             try {
                 // if prop returned and props from db differ throw exception
                 $stmt->execute();
-            } catch(PDOException $e){
+            } catch (PDOException $e) {
                 return $e->getExceptionMessage();
             }
         return $stmt->rowCount();
@@ -167,7 +167,7 @@ 
     */
     public function getConnection($connection = null)
     {
-        if(is_null($connection))
+        if (is_null($connection))
         {
             return new Connection();
         }
@@ -193,7 +193,7 @@ 
     public static function destroy($id)
     {
         
-        $sql = "DELETE" . " FROM " . self::getTableName()." WHERE id = ". $id;
+        $sql = "DELETE" . " FROM " . self::getTableName() . " WHERE id = " . $id;
         $delete = $connection->prepare($sql);
         $delete->execute();
         $count = $delete->rowCount();

indexPDO.php

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
     private $dbh;
     private $error;
  
-    public function __construct(){
+    public function __construct() {
     	$config = parse_ini_file('config.ini');
         // Set DSN
         $dsn = 'mysql:host=' . $this->host . ';dbname=' . $this->dbname;
@@ -68,11 +68,11 @@ 
             PDO::ATTR_ERRMODE       => PDO::ERRMODE_EXCEPTION
         );
         // Create a new PDO instanace
-        try{
+        try {
             $this->dbh = new PDO($dsn, $this->user, $this->pass, $options);
         }
         // Catch any errors
-        catch(PDOException $e){
+        catch (PDOException $e) {
             $this->error = $e->getMessage();
         }
     }
@@ -82,7 +82,7 @@ 
 try {
 	 
 	$dbh = new PDO('mysql:host=localhost;dbname=potatoORM', 'homestead', 'secret');
-	foreach($dbh->query('SELECT * from test') as $row) {
+	foreach ($dbh->query('SELECT * from test') as $row) {
 	        print_r($row);
 	    }
 } catch (PDOException $e) {
@@ -129,7 +129,7 @@ 
     **/
     protected function loadDotenv()
     {
-        if(getenv('APP_ENV') !== 'production')
+        if (getenv('APP_ENV') !== 'production')
         {
             $dotenv = new Dotenv(__DIR__);
             $dotenv->load();
@@ -179,8 +179,8 @@ 
         // is set on the server but needs to be set here on this client objects.
         $charset = $config['charset'];
 
-        $names = "set names '$charset'".
-            (! is_null($collation) ? " collate '$collation'" : '');
+        $names = "set names '$charset'" .
+            (!is_null($collation) ? " collate '$collation'" : '');
 
         $connection->prepare($names)->execute();
 
@@ -208,7 +208,7 @@ 
      */
     protected function configHasSocket(array $config)
     {
-        return isset($config['unix_socket']) && ! empty($config['unix_socket']);
+        return isset($config['unix_socket']) && !empty($config['unix_socket']);
     }
 
     /**