| @@ -9,11 +9,11 @@ | ||
| 9 | 9 | * @property string $email | 
| 10 | 10 | * @property string $password | 
| 11 | 11 | */ | 
| 12 | -class User extends Datamanager{ | |
| 12 | +class User extends Datamanager { | |
| 13 | 13 | |
| 14 | 14 | public function __construct() | 
| 15 | 15 |      { | 
| 16 | -        parent::create('user','id'); | |
| 16 | +        parent::create('user', 'id'); | |
| 17 | 17 | } | 
| 18 | 18 | |
| 19 | 19 | } | 
| 20 | 20 | \ No newline at end of file | 
| @@ -2,7 +2,7 @@ discard block | ||
| 2 | 2 | |
| 3 | 3 | namespace HnrAzevedo\Datamanager; | 
| 4 | 4 | |
| 5 | -trait SynchronizeTrait{ | |
| 5 | +trait SynchronizeTrait { | |
| 6 | 6 | use CrudTrait; | 
| 7 | 7 | |
| 8 | 8 | protected ?string $table = null; | 
| @@ -42,10 +42,10 @@ discard block | ||
| 42 | 42 |      { | 
| 43 | 43 | $type = $value; | 
| 44 | 44 | |
| 45 | -        if(strpos($value,'(')){ | |
| 46 | -            $type = (in_array( substr($value, 0, strpos($value,'(')) , ['varchar','char','text'])) ? 'string' : $type; | |
| 47 | -            $type = (in_array( substr($value, 0, strpos($value,'(')) , ['tinyint','mediumint','smallint','bigtint','int'])) ? 'int' : $type; | |
| 48 | -            $type = (in_array( substr($value, 0, strpos($value,'(')) , ['decimal','float','double','real'])) ? 'float' : $type; | |
| 45 | +        if (strpos($value, '(')) { | |
| 46 | +            $type = (in_array(substr($value, 0, strpos($value, '(')), ['varchar', 'char', 'text'])) ? 'string' : $type; | |
| 47 | +            $type = (in_array(substr($value, 0, strpos($value, '(')), ['tinyint', 'mediumint', 'smallint', 'bigtint', 'int'])) ? 'int' : $type; | |
| 48 | +            $type = (in_array(substr($value, 0, strpos($value, '(')), ['decimal', 'float', 'double', 'real'])) ? 'float' : $type; | |
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 | $this->mountTable_Maxlength($field, $type, $value); | 
| @@ -54,10 +54,10 @@ discard block | ||
| 54 | 54 | |
| 55 | 55 | protected function mountTable_Maxlength(string $field, string $type, $default = null) | 
| 56 | 56 |      { | 
| 57 | -        $maxlength = (in_array( $type , ['string','float','int'])) ? substr($default,(strpos($default,'(')+1),-1) : 0; | |
| 58 | - $maxlength = (in_array( $type , ['date'])) ? 10 : $maxlength; | |
| 59 | - $maxlength = (in_array( $type , ['datetime'])) ? 19 : $maxlength; | |
| 60 | - $maxlength = (in_array( $type , ['boolean'])) ? 1 : $maxlength; | |
| 57 | +        $maxlength = (in_array($type, ['string', 'float', 'int'])) ? substr($default, (strpos($default, '(') + 1), -1) : 0; | |
| 58 | + $maxlength = (in_array($type, ['date'])) ? 10 : $maxlength; | |
| 59 | + $maxlength = (in_array($type, ['datetime'])) ? 19 : $maxlength; | |
| 60 | + $maxlength = (in_array($type, ['boolean'])) ? 1 : $maxlength; | |
| 61 | 61 | $this->$field = ['maxlength' => $maxlength]; | 
| 62 | 62 | } | 
| 63 | 63 | |
| @@ -4,7 +4,7 @@ discard block | ||
| 4 | 4 | |
| 5 | 5 | use Exception; | 
| 6 | 6 | |
| 7 | -class DatamanagerException extends Exception{ | |
| 7 | +class DatamanagerException extends Exception { | |
| 8 | 8 | |
| 9 | 9 | public function __construct($message, $code = 0, Exception $previous = null) | 
| 10 | 10 |      { | 
| @@ -13,7 +13,7 @@ discard block | ||
| 13 | 13 | |
| 14 | 14 | public function __toString() | 
| 15 | 15 |      { | 
| 16 | -        return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; | |
| 16 | +        return __CLASS__.": [{$this->code}]: {$this->message}\n"; | |
| 17 | 17 | } | 
| 18 | 18 | |
| 19 | 19 | } | 
| 20 | 20 | \ No newline at end of file | 
| @@ -6,24 +6,24 @@ discard block | ||
| 6 | 6 | use Exception; | 
| 7 | 7 | use PDO; | 
| 8 | 8 | |
| 9 | -trait CrudTrait{ | |
| 9 | +trait CrudTrait { | |
| 10 | 10 | |
| 11 | 11 | protected ?DatamanagerException $fail = null; | 
| 12 | 12 | |
| 13 | 13 | protected function check_fail() | 
| 14 | 14 |      { | 
| 15 | -        if(!is_null($this->fail)){ | |
| 15 | +        if (!is_null($this->fail)) { | |
| 16 | 16 | throw $this->fail; | 
| 17 | 17 | } | 
| 18 | 18 | } | 
| 19 | 19 | |
| 20 | 20 | protected function transaction(string $transaction): ?bool | 
| 21 | 21 |      { | 
| 22 | -        if(array_key_exists($transaction,['begin','commit','rollback'])){ | |
| 22 | +        if (array_key_exists($transaction, ['begin', 'commit', 'rollback'])) { | |
| 23 | 23 |              throw new DatamanagerException("{$transaction} é um estado inválido para transações."); | 
| 24 | 24 | } | 
| 25 | 25 | |
| 26 | -        if(!Connect::getInstance()->inTransaction()){ | |
| 26 | +        if (!Connect::getInstance()->inTransaction()) { | |
| 27 | 27 | return Connect::getInstance()->beginTransaction(); | 
| 28 | 28 | } | 
| 29 | 29 | |
| @@ -34,13 +34,13 @@ discard block | ||
| 34 | 34 | return false; | 
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | - protected function select(string $query,array $data): ?array | |
| 37 | + protected function select(string $query, array $data): ?array | |
| 38 | 38 |      { | 
| 39 | -        try{ | |
| 39 | +        try { | |
| 40 | 40 |              $stmt = Connect::getInstance()->prepare("{$query}"); | 
| 41 | 41 | $stmt->execute($data); | 
| 42 | 42 | return $stmt->fetchAll(PDO::FETCH_ASSOC); | 
| 43 | -        }catch(Exception $exception){ | |
| 43 | +        } catch (Exception $exception) { | |
| 44 | 44 | $this->fail = new DatamanagerException($exception->getMessage(), $exception->getCode(), $exception); | 
| 45 | 45 | } | 
| 46 | 46 | return []; | 
| @@ -48,11 +48,11 @@ discard block | ||
| 48 | 48 | |
| 49 | 49 | protected function describe(): array | 
| 50 | 50 |      { | 
| 51 | -        try{ | |
| 51 | +        try { | |
| 52 | 52 |              $stmt = Connect::getInstance()->prepare("DESCRIBE {$this->table}"); | 
| 53 | 53 | $stmt->execute(); | 
| 54 | 54 | return $stmt->fetchAll(PDO::FETCH_ASSOC); | 
| 55 | -        }catch(Exception $exception){ | |
| 55 | +        } catch (Exception $exception) { | |
| 56 | 56 | $this->fail = new DatamanagerException($exception->getMessage(), $exception->getCode(), $exception); | 
| 57 | 57 | return []; | 
| 58 | 58 | } | 
| @@ -62,7 +62,7 @@ discard block | ||
| 62 | 62 |      { | 
| 63 | 63 |          try { | 
| 64 | 64 |              $columns = implode(", ", array_keys($data)); | 
| 65 | -            $values = ":" . implode(", :", array_keys($data)); | |
| 65 | +            $values = ":".implode(", :", array_keys($data)); | |
| 66 | 66 | |
| 67 | 67 |              $stmt = Connect::getInstance()->prepare("INSERT INTO {$this->table} ({$columns}) VALUES ({$values})"); | 
| 68 | 68 | |
| @@ -103,7 +103,7 @@ discard block | ||
| 103 | 103 |          try { | 
| 104 | 104 |              $stmt = Connect::getInstance()->prepare("DELETE FROM {$this->table} WHERE {$terms}"); | 
| 105 | 105 | |
| 106 | -            if($params){ | |
| 106 | +            if ($params) { | |
| 107 | 107 | parse_str($params, $arr); | 
| 108 | 108 | $stmt->execute($arr); | 
| 109 | 109 | return true; | 
| @@ -4,36 +4,36 @@ discard block | ||
| 4 | 4 | |
| 5 | 5 | use HnrAzevedo\Datamanager\DatamanagerException; | 
| 6 | 6 | |
| 7 | -trait CheckTrait{ | |
| 7 | +trait CheckTrait { | |
| 8 | 8 | |
| 9 | 9 | protected function check_where_array(array $where) | 
| 10 | 10 |      { | 
| 11 | -        if(count($where) != 3){ | |
| 12 | -            throw new DatamanagerException("Condition where set incorrectly: ".implode(' ',$where)); | |
| 11 | +        if (count($where) != 3) { | |
| 12 | +            throw new DatamanagerException("Condition where set incorrectly: ".implode(' ', $where)); | |
| 13 | 13 | } | 
| 14 | 14 | |
| 15 | -        if(!array_key_exists($where[0],$this->data) && $this->full){ | |
| 15 | +        if (!array_key_exists($where[0], $this->data) && $this->full) { | |
| 16 | 16 |              throw new DatamanagerException("{$where[0]} field does not exist in the table {$this->table}."); | 
| 17 | 17 | } | 
| 18 | 18 | } | 
| 19 | 19 | |
| 20 | 20 | protected function isSettable(string $prop) | 
| 21 | 21 |      { | 
| 22 | -        if($this->full && !array_key_exists($prop,$this->data)){ | |
| 22 | +        if ($this->full && !array_key_exists($prop, $this->data)) { | |
| 23 | 23 |              throw new DatamanagerException("{$prop} field does not exist in the table {$this->table}."); | 
| 24 | 24 | } | 
| 25 | 25 | } | 
| 26 | 26 | |
| 27 | 27 | protected function checkLimit() | 
| 28 | 28 |      { | 
| 29 | -        if(is_null($this->limit)){ | |
| 29 | +        if (is_null($this->limit)) { | |
| 30 | 30 |              throw new DatamanagerException("The limit must be set before the offset."); | 
| 31 | 31 | } | 
| 32 | 32 | } | 
| 33 | 33 | |
| 34 | - protected function checkMaxlength(string $field, $val , $max) | |
| 34 | + protected function checkMaxlength(string $field, $val, $max) | |
| 35 | 35 |      { | 
| 36 | -        if(strlen($val) > $max){ | |
| 36 | +        if (strlen($val) > $max) { | |
| 37 | 37 |              throw new DatamanagerException("The information provided for column {$field} of table {$this->table} exceeded that allowed."); | 
| 38 | 38 | } | 
| 39 | 39 | } | 
| @@ -45,6 +45,6 @@ discard block | ||
| 45 | 45 | |
| 46 | 46 | protected function isIncremented(string $field): bool | 
| 47 | 47 |      { | 
| 48 | - return ( strstr($this->data[$field]['extra'],'auto_increment') && $field !== $this->primary ); | |
| 48 | + return (strstr($this->data[$field]['extra'], 'auto_increment') && $field !== $this->primary); | |
| 49 | 49 | } | 
| 50 | 50 | } | 
| @@ -15,12 +15,12 @@ discard block | ||
| 15 | 15 |          if (empty(self::$instance)) { | 
| 16 | 16 |              try { | 
| 17 | 17 | |
| 18 | -                if(!defined('DATAMANAGER_CONFIG')){ | |
| 18 | +                if (!defined('DATAMANAGER_CONFIG')) { | |
| 19 | 19 |                      throw new DatamanagerException("Information for connection to the database not defined."); | 
| 20 | 20 | } | 
| 21 | 21 | |
| 22 | 22 | self::$instance = new PDO( | 
| 23 | - DATAMANAGER_CONFIG['driver'] . ':host='.DATAMANAGER_CONFIG['host'] . ';port='.DATAMANAGER_CONFIG['port'] . ';dbname='.DATAMANAGER_CONFIG['database'] . ';charset='.DATAMANAGER_CONFIG['charset'], | |
| 23 | + DATAMANAGER_CONFIG['driver'].':host='.DATAMANAGER_CONFIG['host'].';port='.DATAMANAGER_CONFIG['port'].';dbname='.DATAMANAGER_CONFIG['database'].';charset='.DATAMANAGER_CONFIG['charset'], | |
| 24 | 24 | DATAMANAGER_CONFIG['username'], | 
| 25 | 25 | DATAMANAGER_CONFIG['password'], | 
| 26 | 26 | DATAMANAGER_CONFIG['options'] | 
| @@ -32,7 +32,7 @@ discard block | ||
| 32 | 32 | return self::$instance; | 
| 33 | 33 | } | 
| 34 | 34 | |
| 35 | -    public static function destroy(){ | |
| 35 | +    public static function destroy() { | |
| 36 | 36 | self::$instance = null; | 
| 37 | 37 | } | 
| 38 | 38 | |
| @@ -4,16 +4,16 @@ discard block | ||
| 4 | 4 | |
| 5 | 5 | use HnrAzevedo\Datamanager\DatamanagerException; | 
| 6 | 6 | |
| 7 | -trait EntityTrait{ | |
| 7 | +trait EntityTrait { | |
| 8 | 8 | public function toEntity() | 
| 9 | 9 |      { | 
| 10 | -        if($this->getCount() === 0){ | |
| 10 | +        if ($this->getCount() === 0) { | |
| 11 | 11 | return null; | 
| 12 | 12 | } | 
| 13 | 13 | |
| 14 | 14 | $entity = $this->setByDatabase($this->result[0]); | 
| 15 | 15 | |
| 16 | -        if(count($this->result) > 1){ | |
| 16 | +        if (count($this->result) > 1) { | |
| 17 | 17 | $entity = []; | 
| 18 | 18 |              foreach ($this->result as $key => $value) { | 
| 19 | 19 | $entity[] = $this->setByDatabase($value); | 
| @@ -30,7 +30,7 @@ discard block | ||
| 30 | 30 | $data = []; | 
| 31 | 31 | |
| 32 | 32 |          foreach ($this->data as $key => $value) { | 
| 33 | -            if(strstr($this->data[$key]['extra'],'auto_increment')){ | |
| 33 | +            if (strstr($this->data[$key]['extra'], 'auto_increment')) { | |
| 34 | 34 | continue; | 
| 35 | 35 | } | 
| 36 | 36 | |
| @@ -42,7 +42,7 @@ discard block | ||
| 42 | 42 | } | 
| 43 | 43 | |
| 44 | 44 |          $this->transaction('begin'); | 
| 45 | -        try{ | |
| 45 | +        try { | |
| 46 | 46 | |
| 47 | 47 | $id = $this->insert($data); | 
| 48 | 48 | |
| @@ -52,7 +52,7 @@ discard block | ||
| 52 | 52 | |
| 53 | 53 |              $this->transaction('commit'); | 
| 54 | 54 | |
| 55 | -        }catch(DatamanagerException $er){ | |
| 55 | +        } catch (DatamanagerException $er) { | |
| 56 | 56 |              $this->transaction('rollback'); | 
| 57 | 57 | throw $er; | 
| 58 | 58 | } | 
| @@ -62,19 +62,19 @@ discard block | ||
| 62 | 62 | |
| 63 | 63 | public function remove(?bool $exec = false) | 
| 64 | 64 |      { | 
| 65 | -        if($exec !== null){ | |
| 65 | +        if ($exec !== null) { | |
| 66 | 66 | $this->clause = 'remove'; | 
| 67 | 67 | return $this; | 
| 68 | 68 | } | 
| 69 | 69 | |
| 70 | 70 | $this->clause = null; | 
| 71 | 71 | |
| 72 | -        if(count($this->where) == 1){ | |
| 72 | +        if (count($this->where) == 1) { | |
| 73 | 73 | $this->removeById(); | 
| 74 | 74 | return $this; | 
| 75 | 75 | } | 
| 76 | 76 | |
| 77 | - $this->delete($this->mountRemove()['where'], substr( $this->mountRemove()['data'] ,0,-1) ); | |
| 77 | + $this->delete($this->mountRemove()['where'], substr($this->mountRemove()['data'], 0, -1)); | |
| 78 | 78 | |
| 79 | 79 | $this->check_fail(); | 
| 80 | 80 | |
| @@ -85,7 +85,7 @@ discard block | ||
| 85 | 85 |      { | 
| 86 | 86 |          $this->transaction('begin'); | 
| 87 | 87 | |
| 88 | -        try{ | |
| 88 | +        try { | |
| 89 | 89 | $this->update( | 
| 90 | 90 | $this->mountSave()['data'], | 
| 91 | 91 |                  "{$this->primary}=:{$this->primary}",  | 
| @@ -95,7 +95,7 @@ discard block | ||
| 95 | 95 | $this->check_fail(); | 
| 96 | 96 | |
| 97 | 97 |              $this->transaction('commit'); | 
| 98 | -        }catch(DatamanagerException $er){ | |
| 98 | +        } catch (DatamanagerException $er) { | |
| 99 | 99 |              $this->transaction('rollback'); | 
| 100 | 100 | throw $er; | 
| 101 | 101 | } | 
| @@ -11,21 +11,21 @@ discard block | ||
| 11 | 11 | protected ?string $table = null; | 
| 12 | 12 | protected ?string $primary = null; | 
| 13 | 13 | protected array $data = []; | 
| 14 | - protected array $where = [''=> ["1",'=',"1"] ]; | |
| 14 | + protected array $where = [''=> ["1", '=', "1"]]; | |
| 15 | 15 | protected array $between = []; | 
| 16 | 16 | |
| 17 | - public function __set(string $prop,$value) | |
| 17 | + public function __set(string $prop, $value) | |
| 18 | 18 |      { | 
| 19 | -        if(is_array($value)){ | |
| 19 | +        if (is_array($value)) { | |
| 20 | 20 | $attr = array_keys($value)[0]; | 
| 21 | 21 | $this->data[$prop][$attr] = $value[$attr]; | 
| 22 | 22 | return $this; | 
| 23 | 23 | } | 
| 24 | 24 | |
| 25 | -        if($this->full){ | |
| 26 | -            switch($this->data[$prop]['type']){ | |
| 25 | +        if ($this->full) { | |
| 26 | +            switch ($this->data[$prop]['type']) { | |
| 27 | 27 | case 'date': | 
| 28 | - $value = (date_format( date_create_from_format(DATAMANAGER_CONFIG['dateformat'],$value) , 'Y-m-d')); | |
| 28 | + $value = (date_format(date_create_from_format(DATAMANAGER_CONFIG['dateformat'], $value), 'Y-m-d')); | |
| 29 | 29 | break; | 
| 30 | 30 | } | 
| 31 | 31 | } | 
| @@ -47,9 +47,9 @@ discard block | ||
| 47 | 47 |      { | 
| 48 | 48 | $this->isSettable($field); | 
| 49 | 49 | |
| 50 | -        if($this->full){ | |
| 51 | -            switch($this->data[$field]['type']){ | |
| 52 | -                case 'date': $this->data[$field]['value'] = (date_format( date_create_from_format('Y-m-d' , $this->data[$field]['value'] ) , DATAMANAGER_CONFIG['dateformat'])); | |
| 50 | +        if ($this->full) { | |
| 51 | +            switch ($this->data[$field]['type']) { | |
| 52 | +                case 'date': $this->data[$field]['value'] = (date_format(date_create_from_format('Y-m-d', $this->data[$field]['value']), DATAMANAGER_CONFIG['dateformat'])); | |
| 53 | 53 | } | 
| 54 | 54 | } | 
| 55 | 55 | |
| @@ -66,7 +66,7 @@ discard block | ||
| 66 | 66 | $deniable = (is_array($deniable)) ? $deniable : [$deniable]; | 
| 67 | 67 | |
| 68 | 68 |          foreach ($deniable as $field) { | 
| 69 | -            if(!array_key_exists($field,$this->data)){ | |
| 69 | +            if (!array_key_exists($field, $this->data)) { | |
| 70 | 70 |                  throw new DatamanagerException("{$field} field does not exist in the table {$this->table}."); | 
| 71 | 71 | } | 
| 72 | 72 | |
| @@ -86,9 +86,9 @@ discard block | ||
| 86 | 86 | |
| 87 | 87 | public function orderBy(string $field, string $ord = 'ASC') | 
| 88 | 88 |      { | 
| 89 | - $this->isSettable( str_replace(['asc','ASC','desc','DESC',' '],'',$field) ); | |
| 89 | + $this->isSettable(str_replace(['asc', 'ASC', 'desc', 'DESC', ' '], '', $field)); | |
| 90 | 90 | |
| 91 | - $ord = (strpos(strtolower($field),'asc') || strpos(strtolower($field),'desc')) ? '' : $ord; | |
| 91 | + $ord = (strpos(strtolower($field), 'asc') || strpos(strtolower($field), 'desc')) ? '' : $ord; | |
| 92 | 92 | |
| 93 | 93 |          $this->order = " ORDER BY {$field} {$ord} "; | 
| 94 | 94 | return $this; | 
| @@ -112,11 +112,11 @@ discard block | ||
| 112 | 112 | |
| 113 | 113 | public function where(array $where) | 
| 114 | 114 |      { | 
| 115 | -        $this->where['AND'] = (array_key_exists('AND',$this->where)) ?? ''; | |
| 115 | +        $this->where['AND'] = (array_key_exists('AND', $this->where)) ?? ''; | |
| 116 | 116 | $w = []; | 
| 117 | 117 |          foreach ($where as $condition => $values) { | 
| 118 | 118 | |
| 119 | -            if(!is_array($values)){ | |
| 119 | +            if (!is_array($values)) { | |
| 120 | 120 | $w['AND'][] = $values; | 
| 121 | 121 | continue; | 
| 122 | 122 | } | 
| @@ -127,7 +127,7 @@ discard block | ||
| 127 | 127 | |
| 128 | 128 | } | 
| 129 | 129 | |
| 130 | - $this->where = array_merge($this->where,$w); | |
| 130 | + $this->where = array_merge($this->where, $w); | |
| 131 | 131 | |
| 132 | 132 | return $this; | 
| 133 | 133 | } | 
| @@ -187,7 +187,7 @@ discard block | ||
| 187 | 187 | $string = ''; | 
| 188 | 188 |          foreach ($this->data as $key => $value) { | 
| 189 | 189 | |
| 190 | -            if(gettype($value)==='object'){ | |
| 190 | +            if (gettype($value) === 'object') { | |
| 191 | 191 | $value = $value->getData()[$this->primary]['value']; | 
| 192 | 192 | } | 
| 193 | 193 | |
| @@ -198,7 +198,7 @@ discard block | ||
| 198 | 198 | |
| 199 | 199 | private function removeById(): bool | 
| 200 | 200 |      { | 
| 201 | -        $delete = $this->delete("{$this->primary}=:{$this->primary}","{$this->primary}={$this->getData()[$this->primary]['value']}"); | |
| 201 | +        $delete = $this->delete("{$this->primary}=:{$this->primary}", "{$this->primary}={$this->getData()[$this->primary]['value']}"); | |
| 202 | 202 | |
| 203 | 203 | $this->check_fail(); | 
| 204 | 204 | |
| @@ -207,12 +207,12 @@ discard block | ||
| 207 | 207 | |
| 208 | 208 | public function findById($id) | 
| 209 | 209 |      { | 
| 210 | - return $this->where([$this->primary,'=',$id]); | |
| 210 | + return $this->where([$this->primary, '=', $id]); | |
| 211 | 211 | } | 
| 212 | 212 | |
| 213 | 213 | public function execute() | 
| 214 | 214 |      { | 
| 215 | -        if(!is_null($this->clause) && $this->clause == 'remove'){ | |
| 215 | +        if (!is_null($this->clause) && $this->clause == 'remove') { | |
| 216 | 216 | return $this->remove(true); | 
| 217 | 217 | } | 
| 218 | 218 | |
| @@ -220,8 +220,8 @@ discard block | ||
| 220 | 220 | |
| 221 | 221 | $this->mountSelect(); | 
| 222 | 222 | |
| 223 | - $where = substr($this->mountWhereExec()['where'],0,-1); | |
| 224 | - $where .= substr($this->mountBetweenExec()['where'],0,-1); | |
| 223 | + $where = substr($this->mountWhereExec()['where'], 0, -1); | |
| 224 | + $where .= substr($this->mountBetweenExec()['where'], 0, -1); | |
| 225 | 225 | |
| 226 | 226 |          $this->query .= " WHERE {$where} "; | 
| 227 | 227 | |
| @@ -2,7 +2,7 @@ discard block | ||
| 2 | 2 | |
| 3 | 3 | namespace HnrAzevedo\Datamanager; | 
| 4 | 4 | |
| 5 | -trait DataTrait{ | |
| 5 | +trait DataTrait { | |
| 6 | 6 | use CrudTrait, CheckTrait; | 
| 7 | 7 | |
| 8 | 8 | protected ?string $table = null; | 
| @@ -24,14 +24,14 @@ discard block | ||
| 24 | 24 | protected function mountRemove(): array | 
| 25 | 25 |      { | 
| 26 | 26 | $return = ['data' => '', 'where' => '']; | 
| 27 | -        foreach($this->where as $clause => $condition){ | |
| 28 | -            if(strlen($clause) === 0){ | |
| 27 | +        foreach ($this->where as $clause => $condition) { | |
| 28 | +            if (strlen($clause) === 0) { | |
| 29 | 29 |                  $return['where'] .= " {$clause} {$condition[0]} {$condition[1]} :q_{$condition[0]} "; | 
| 30 | 30 |                  $return['data'] .= "q_{$condition[0]}={$condition[2]}&"; | 
| 31 | 31 | continue; | 
| 32 | 32 | } | 
| 33 | 33 | |
| 34 | -            foreach($condition as $value){ | |
| 34 | +            foreach ($condition as $value) { | |
| 35 | 35 |                  $return['where'] .= " {$clause} {$value[0]} {$value[1]} :q_{$value[0]} "; | 
| 36 | 36 |                  $return['data'] .= "q_{$value[0]}={$value[2]}&"; | 
| 37 | 37 | } | 
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | $return = ['data' => []]; | 
| 45 | 45 | |
| 46 | 46 |          foreach ($this->data as $key => $value) { | 
| 47 | -            if($this->upgradeable($key) && !$this->isIncremented($key)){ | |
| 47 | +            if ($this->upgradeable($key) && !$this->isIncremented($key)) { | |
| 48 | 48 | $return['data'][$key] = $this->data[$key]['value']; | 
| 49 | 49 | } | 
| 50 | 50 | } | 
| @@ -60,7 +60,7 @@ discard block | ||
| 60 | 60 | |
| 61 | 61 |              $key = (!$key) ? '' : " {$key} "; | 
| 62 | 62 | |
| 63 | -            if(is_array($value[0])){ | |
| 63 | +            if (is_array($value[0])) { | |
| 64 | 64 | |
| 65 | 65 |                  foreach ($value as $k => $v) { | 
| 66 | 66 |                      $return['where'] .= " {$key} {$v[0]} {$v[1]} :q_{$v[0]} "; | 
| @@ -81,13 +81,13 @@ discard block | ||
| 81 | 81 |      { | 
| 82 | 82 | $return = ['where' => '', 'data' => []]; | 
| 83 | 83 | |
| 84 | -        foreach($this->between as $field => $value){ | |
| 85 | -            $condition = (count(explode(' ',$field)) > 2) ? ' '.explode(' ',$field)[0].' ' : ' AND '; | |
| 86 | - $field = str_replace(['AND','OR',' '],'',$field); | |
| 84 | +        foreach ($this->between as $field => $value) { | |
| 85 | +            $condition = (count(explode(' ', $field)) > 2) ? ' '.explode(' ', $field)[0].' ' : ' AND '; | |
| 86 | + $field = str_replace(['AND', 'OR', ' '], '', $field); | |
| 87 | 87 |              $return['where'] .= " {$condition} {$field} BETWEEN :q_1{$field} AND :q_2{$field} "; | 
| 88 | 88 | $return['data'] = [ | 
| 89 | -                "q_1{$field}" => (date_format( date_create_from_format(DATAMANAGER_CONFIG['dateformat'],$value[0]) , 'Y-m-d')), | |
| 90 | -                "q_2{$field}" => (date_format( date_create_from_format(DATAMANAGER_CONFIG['dateformat'],$value[1]) , 'Y-m-d')) | |
| 89 | +                "q_1{$field}" => (date_format(date_create_from_format(DATAMANAGER_CONFIG['dateformat'], $value[0]), 'Y-m-d')), | |
| 90 | +                "q_2{$field}" => (date_format(date_create_from_format(DATAMANAGER_CONFIG['dateformat'], $value[1]), 'Y-m-d')) | |
| 91 | 91 | ]; | 
| 92 | 92 | } | 
| 93 | 93 | return $return; | 
| @@ -95,21 +95,21 @@ discard block | ||
| 95 | 95 | |
| 96 | 96 | protected function mountSelect() | 
| 97 | 97 |      { | 
| 98 | -        $select = implode(',',array_keys($this->select)); | |
| 98 | +        $select = implode(',', array_keys($this->select)); | |
| 99 | 99 | |
| 100 | -        $this->query = str_replace('*', $select,$this->query); | |
| 100 | +        $this->query = str_replace('*', $select, $this->query); | |
| 101 | 101 | } | 
| 102 | 102 | |
| 103 | 103 | protected function mountLimit() | 
| 104 | 104 |      { | 
| 105 | -        if(!is_null($this->limit)){ | |
| 105 | +        if (!is_null($this->limit)) { | |
| 106 | 106 |              $this->query .= " LIMIT {$this->limit}"; | 
| 107 | 107 | } | 
| 108 | 108 | } | 
| 109 | 109 | |
| 110 | 110 | protected function mountOffset() | 
| 111 | 111 |      { | 
| 112 | -        if(!is_null($this->offset)){ | |
| 112 | +        if (!is_null($this->offset)) { | |
| 113 | 113 |              $this->query .= " OFFSET {$this->offset}"; | 
| 114 | 114 | } | 
| 115 | 115 | } |