maikees / moc-orm

lib/Config.php

Spacing +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
                 'password' => $this->_password[$connectionName],
                 'charset' => $this->_charset[$connectionName],
                 'schema' => $this->_schema[$connectionName]];
-        } else {
+        }else {
             throw new \Exception("The connection name $connectionName is not set.");
         }
 
@@ -183,7 +183,7 @@ 
 
         $connectionSettings = (object)$connectionSettings;
 
-        $this->_connectionString[$connectionName] = $this->_driver[$connectionName].":host=$connectionSettings->host;dbname=$connectionSettings->database;port=$connectionSettings->port;";
+        $this->_connectionString[$connectionName] = $this->_driver[$connectionName] . ":host=$connectionSettings->host;dbname=$connectionSettings->database;port=$connectionSettings->port;";
 
         return $this;
     }

Braces +24 added lines, -8 removed lines

@@ -79,15 +79,27 @@ 
         $defaultSchema = null)
     {
         #Begin: Verify if all parameters send is valid.
-        if (!is_string($driver) || !in_array($driver, self::DRIVERS)) throw new \Exception("The driver $driver don't supported.");
-        if (!is_string($username) || empty($username)) throw new \Exception("Invalid username.");
-        if (!is_string($password) || empty($password)) throw new \Exception("Invalid password.");
-        if (!is_string($host) || empty($host)) throw new \Exception("Invalid host.");
-        if (!is_string($database) || empty($database)) throw new \Exception("Invalid database name.");
+        if (!is_string($driver) || !in_array($driver, self::DRIVERS)) {
+         throw new \Exception("The driver $driver don't supported.");
+        }
+        if (!is_string($username) || empty($username)) {
+         throw new \Exception("Invalid username.");
+        }
+        if (!is_string($password) || empty($password)) {
+         throw new \Exception("Invalid password.");
+        }
+        if (!is_string($host) || empty($host)) {
+         throw new \Exception("Invalid host.");
+        }
+        if (!is_string($database) || empty($database)) {
+         throw new \Exception("Invalid database name.");
+        }
         $this->validatesConnectionName($connectionName);
 
         $port = is_null($port) ? '' : (int)$port;
-        if (!is_null($port) && !is_int($port)) throw new \Exception("Invalid port format.");
+        if (!is_null($port) && !is_int($port)) {
+         throw new \Exception("Invalid port format.");
+        }
         #Constructor of the connection string
         $this->_connectionString[$connectionName] = "$driver:host=$host;dbname=$database;port=$port;";
         $this->_username[$connectionName] = $username;
@@ -176,8 +188,12 @@ 
      */
     public function setSettings($connectionName, $connectionSettings)
     {
-        if (!is_array($connectionSettings)) throw new \Exception('Invalid format connectionSettings');
-        if (empty($this->_driver[$connectionName])) throw new \Exception('Driver not set.');
+        if (!is_array($connectionSettings)) {
+         throw new \Exception('Invalid format connectionSettings');
+        }
+        if (empty($this->_driver[$connectionName])) {
+         throw new \Exception('Driver not set.');
+        }
 
         $this->validatesConnectionName($connectionName);
 

lib/Model.php

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,7 @@ 
 
             $this->Result = new Result();
 
-            if($this->Result && !$this->Result->getResults()) {
+            if ($this->Result && !$this->Result->getResults()) {
                 $clone = clone $this;
                 $this->Result->setResults($clone);
             }
@@ -188,7 +188,7 @@ 
             $this->_newData[] = $this->{$key};
 
             $update = true;
-        } else {
+        }else {
             $logger = [
                 'function' => 'Save',
                 'next' => $this->_data,
@@ -212,7 +212,7 @@ 
         $insert = $this->Connection->getConnection()->prepare($sql);
         $this->burnError($insert);
 
-        $this->_newData = array_map(function ($data) {
+        $this->_newData = array_map(function($data) {
             if (is_bool($data) and $data === false) $data = 0;
 
             return $data;
@@ -287,7 +287,7 @@ 
 
         $instance = self::$_instance;
 
-        if (is_callable($this->triggerBefore)) ($this->triggerBefore)();;
+        if (is_callable($this->triggerBefore)) ($this->triggerBefore)(); ;
 
         $start = microtime(true);
 
@@ -310,7 +310,7 @@ 
 
             return true;
         }
-        else{ return false; };
+        else { return false; };
     }
 
     /**
@@ -455,7 +455,7 @@ 
 
         $done = $instance->done();
 
-        if(count($done) > 0) {
+        if (count($done) > 0) {
             $done = $done[0];
 
             $clone = clone $done;
@@ -557,7 +557,7 @@ 
 
         if ($match) {
             $this->_data = $objetos = $consulta->fetchAll(\PDO::FETCH_CLASS, get_called_class());
-        } else {
+        }else {
             $objetos = $consulta->rowCount();
         }
 

Braces +75 added lines, -27 removed lines

@@ -66,7 +66,9 @@ 
             }
 
             if (!is_null($object)) {
-                if (!is_array($object)) throw new \InvalidArgumentException('Accept only array from object');
+                if (!is_array($object)) {
+                 throw new \InvalidArgumentException('Accept only array from object');
+                }
 
                 $this->_data = $object;
                 $this->_newData = $object;
@@ -100,9 +102,13 @@ 
      */
     public function __get($name)
     {
-        if (strtolower($name) == 'errors') return Error::instance();
+        if (strtolower($name) == 'errors') {
+         return Error::instance();
+        }
 
-        if (!key_exists($name, $this->_data)) throw new \Exception("The attribute $name not found.");
+        if (!key_exists($name, $this->_data)) {
+         throw new \Exception("The attribute $name not found.");
+        }
 
         return $this->_data[$name];
     }
@@ -206,14 +212,18 @@ 
         }
 
 
-        if (is_callable($this->triggerBefore)) ($this->triggerBefore)();
+        if (is_callable($this->triggerBefore)) {
+         ($this->triggerBefore)();
+        }
 
         $start = microtime(true);
         $insert = $this->Connection->getConnection()->prepare($sql);
         $this->burnError($insert);
 
         $this->_newData = array_map(function ($data) {
-            if (is_bool($data) and $data === false) $data = 0;
+            if (is_bool($data) and $data === false) {
+             $data = 0;
+            }
 
             return $data;
         }, $this->_newData);
@@ -224,7 +234,9 @@ 
 
         $this->Connection->setPerformedQuery($insert->queryString, round(($end - $start), 5));
 
-        if (is_callable($this->triggerAfter)) ($this->triggerAfter)();
+        if (is_callable($this->triggerAfter)) {
+         ($this->triggerAfter)();
+        }
 
         if ($update) {
             $this->burnError($insert);
@@ -263,7 +275,9 @@ 
 
     private function burnError($statment)
     {
-        if (!is_null($statment->errorInfo()[1])) throw new \Exception($statment->errorInfo()[2], $statment->errorInfo()[1]);
+        if (!is_null($statment->errorInfo()[1])) {
+         throw new \Exception($statment->errorInfo()[2], $statment->errorInfo()[1]);
+        }
     }
 
     /**
@@ -278,16 +292,23 @@ 
             throw new \Exception($e->getMessage());
         }
 
-        if (!isset(static::$primary_key)) throw new \Exception('Primary key don\'t set');
+        if (!isset(static::$primary_key)) {
+         throw new \Exception('Primary key don\'t set');
+        }
 
-        if (!is_numeric($this->{static::$primary_key})) throw new \Exception('Primary key value don\'t is valid');
+        if (!is_numeric($this->{static::$primary_key})) {
+         throw new \Exception('Primary key value don\'t is valid');
+        }
 
         $sql = ' DELETE FROM ' . static::$table_name;
         $sql .= ' WHERE ' . static::$primary_key . ' = ? ';
 
         $instance = self::$_instance;
 
-        if (is_callable($this->triggerBefore)) ($this->triggerBefore)();;
+        if (is_callable($this->triggerBefore)) {
+         ($this->triggerBefore)();
+        }
+        ;
 
         $start = microtime(true);
 
@@ -298,7 +319,9 @@ 
 
         $instance->Connection->setPerformedQuery($insert->queryString, round(($end - $start), 5));
 
-        if (is_callable($this->triggerAfter)) ($this->triggerAfter)();
+        if (is_callable($this->triggerAfter)) {
+         ($this->triggerAfter)();
+        }
 
         if ($insert->rowCount() > 0) {
             $logger = [
@@ -309,8 +332,7 @@ 
             $this->saveLogger($logger);
 
             return true;
-        }
-        else{ return false; };
+        } else{ return false; };
     }
 
     /**
@@ -330,7 +352,9 @@ 
     {
         self::instance();
 
-        if (!isset(static::$table_name)) throw new \Exception('Don\'t set table name in model.');
+        if (!isset(static::$table_name)) {
+         throw new \Exception('Don\'t set table name in model.');
+        }
 
         $currentTable = static::$table_name;
 
@@ -358,8 +382,12 @@ 
     {
         self::instance();
 
-        if (!is_string($procedureName)) throw new \Exception("Procedure name is invalid.");
-        if (!is_array($param)) throw new \Exception("Tipo de parâmetros inválidos.");
+        if (!is_string($procedureName)) {
+         throw new \Exception("Procedure name is invalid.");
+        }
+        if (!is_array($param)) {
+         throw new \Exception("Tipo de parâmetros inválidos.");
+        }
 
         $currentTable = static::$table_name;
 
@@ -434,13 +462,17 @@ 
             throw new \Exception($e->getMessage());
         }
 
-        if (!is_array($parameters) and !is_numeric($parameters)) throw new \Exception('Invalid parameter type on model ' . get_called_class() . '.');
+        if (!is_array($parameters) and !is_numeric($parameters)) {
+         throw new \Exception('Invalid parameter type on model ' . get_called_class() . '.');
+        }
 
         $instance->_current_custom_query[] = 'SELECT * FROM ' . static::$table_name . ' ';
 
         switch ($parameters) {
             case is_numeric($parameters):
-                if (!isset(static::$primary_key)) throw new \Exception("Invalid parameter type.");
+                if (!isset(static::$primary_key)) {
+                 throw new \Exception("Invalid parameter type.");
+                }
 
                 $instance->_current_custom_query_values[] = $parameters;
                 $instance->_current_custom_query[] = ' WHERE ' . static::$primary_key . ' = ?';
@@ -463,7 +495,7 @@ 
             $done->Result->setResults($clone);
 
             return $done;
-        }else {
+        } else {
             return null;
         }
     }
@@ -484,11 +516,15 @@ 
             throw new \Exception($e->getMessage());
         }
 
-        if (!is_string($colunm)) throw new \Exception("Invalid parameter type.");
+        if (!is_string($colunm)) {
+         throw new \Exception("Invalid parameter type.");
+        }
 
         self::$_instance->_current_custom_query[] = "SELECT $colunm FROM " . static::$table_name . ' ';
 
-        if (!isset(static::$primary_key)) throw new \Exception("Invalid parameter type.");
+        if (!isset(static::$primary_key)) {
+         throw new \Exception("Invalid parameter type.");
+        }
 
         return self::$_instance;
     }
@@ -538,7 +574,9 @@ 
             throw new \Exception($e->getMessage());
         }
 
-        if (!is_array($param)) throw new \Exception('Tipo de parâmetro inválido.');
+        if (!is_array($param)) {
+         throw new \Exception('Tipo de parâmetro inválido.');
+        }
 
         $start = microtime(true);
 
@@ -583,7 +621,9 @@ 
             throw new \Exception($e->getMessage());
         }
 
-        if (!is_array($param)) throw new \Exception('Invalid parameter type.');
+        if (!is_array($param)) {
+         throw new \Exception('Invalid parameter type.');
+        }
 
         self::$_instance->_current_custom_query_values = $param;
 
@@ -622,7 +662,9 @@ 
      */
     final protected function setTriggerAfter($closure = null)
     {
-        if (!is_callable($closure)) throw new Exception('The parameter don\'t is an closure.');
+        if (!is_callable($closure)) {
+         throw new Exception('The parameter don\'t is an closure.');
+        }
 
         $this->triggerAfter = $closure;
 
@@ -637,7 +679,9 @@ 
      */
     final protected function setTriggerBefore($closure = null)
     {
-        if (!is_callable($closure)) throw new Exception('The parameter don\'t is an closure.');
+        if (!is_callable($closure)) {
+         throw new Exception('The parameter don\'t is an closure.');
+        }
 
         $this->triggerBefore = $closure;
 
@@ -651,7 +695,9 @@ 
      */
     final protected function changeSchema($schema)
     {
-        if (!is_string($schema)) throw new \Exception('The parameter don\'t is an String.');
+        if (!is_string($schema)) {
+         throw new \Exception('The parameter don\'t is an String.');
+        }
 
         $this->Connection->changeSchema($schema);
         return $this;
@@ -687,7 +733,9 @@ 
 
     final private function verifyConnection()
     {
-        if (is_null($this->Connection->getCurrentConnectionString())) throw new \Exception('Not set connection.');
+        if (is_null($this->Connection->getCurrentConnectionString())) {
+         throw new \Exception('Not set connection.');
+        }
     }
 
     protected function setTableName($tableName)

lib/support/Model.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     {
         if (!($data instanceof self)) throw new \Exception(" It's not a model.");
 
-        $data = array_map(function ($object) { return $object->toArray(); }, $data);
+        $data = array_map(function($object) { return $object->toArray(); }, $data);
 
         return $data;
     }
@@ -65,7 +65,7 @@ 
 
         if (is_null($offset)) {
             $data[] = $value;
-        } else {
+        }else {
             $data[$offset] = $value;
         }
     }

Braces +3 added lines, -1 removed lines

@@ -25,7 +25,9 @@
      */
     public static function toList($data)
     {
-        if (!($data instanceof self)) throw new \Exception(" It's not a model.");
+        if (!($data instanceof self)) {
+         throw new \Exception(" It's not a model.");
+        }
 
         $data = array_map(function ($object) { return $object->toArray(); }, $data);
 

lib/ConnectionManager.php

Spacing +2 added lines, -3 removed lines

@@ -101,8 +101,7 @@ 
             $default = $this->Config->getDefault();
 
             $name = is_null($default) ?
-                @end(array_keys($configs ?: [])) :
-                $default;
+                @end(array_keys($configs ?: [])) : $default;
 
             $this->open($name);
         }
@@ -133,7 +132,7 @@ 
                 } catch (\Exception $e) {
                     throw $e;
                 }
-            } else {
+            }else {
 
                 throw new \Exception("This connection isn't actived.");
             }