@@ -10,43 +10,43 @@ |
||
10 | 10 | */ |
11 | 11 | interface ISpecificationCriteria |
12 | 12 | { |
13 | - public function getCriteria(); |
|
13 | + public function getCriteria(); |
|
14 | 14 | |
15 | 15 | public function getWhere(); |
16 | 16 | |
17 | - public function getLimit(); |
|
17 | + public function getLimit(); |
|
18 | 18 | |
19 | - public function getOfset(); |
|
19 | + public function getOfset(); |
|
20 | 20 | |
21 | - public function getJoins(); |
|
21 | + public function getJoins(); |
|
22 | 22 | |
23 | - public function getOrder(); |
|
23 | + public function getOrder(); |
|
24 | 24 | |
25 | - public function getManualJoins(); |
|
25 | + public function getManualJoins(); |
|
26 | 26 | |
27 | - public function getGroup(); |
|
27 | + public function getGroup(); |
|
28 | 28 | |
29 | - public function getManualWheres(); |
|
29 | + public function getManualWheres(); |
|
30 | 30 | |
31 | - public function getWhereType(); |
|
31 | + public function getWhereType(); |
|
32 | 32 | |
33 | - public function setWhere($field,$value = false); |
|
33 | + public function setWhere($field,$value = false); |
|
34 | 34 | |
35 | - public function setLimit($limit); |
|
35 | + public function setLimit($limit); |
|
36 | 36 | |
37 | - public function setOfset($ofset); |
|
37 | + public function setOfset($ofset); |
|
38 | 38 | |
39 | - public function setJoins($joins); |
|
39 | + public function setJoins($joins); |
|
40 | 40 | |
41 | - public function setOrder($order); |
|
41 | + public function setOrder($order); |
|
42 | 42 | |
43 | - public function setManualJoins($manualJoins); |
|
43 | + public function setManualJoins($manualJoins); |
|
44 | 44 | |
45 | - public function setGroup($group); |
|
45 | + public function setGroup($group); |
|
46 | 46 | |
47 | - public function setManualWheres($manualWheres); |
|
47 | + public function setManualWheres($manualWheres); |
|
48 | 48 | |
49 | - public function setWhereType($whereType); |
|
49 | + public function setWhereType($whereType); |
|
50 | 50 | |
51 | 51 | } |
52 | 52 |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | public function getWhereType(); |
32 | 32 | |
33 | - public function setWhere($field,$value = false); |
|
33 | + public function setWhere($field, $value = false); |
|
34 | 34 | |
35 | 35 | public function setLimit($limit); |
36 | 36 |
@@ -10,134 +10,134 @@ |
||
10 | 10 | class Specification implements ISpecificationCriteria |
11 | 11 | { |
12 | 12 | |
13 | - protected $where = []; |
|
13 | + protected $where = []; |
|
14 | 14 | |
15 | - protected $limit = 0; |
|
15 | + protected $limit = 0; |
|
16 | 16 | |
17 | - protected $ofset = 0; |
|
17 | + protected $ofset = 0; |
|
18 | 18 | |
19 | - protected $joins = []; |
|
19 | + protected $joins = []; |
|
20 | 20 | |
21 | - protected $order = []; |
|
21 | + protected $order = []; |
|
22 | 22 | |
23 | - protected $manualJoins = []; |
|
23 | + protected $manualJoins = []; |
|
24 | 24 | |
25 | - protected $group = null; |
|
25 | + protected $group = null; |
|
26 | 26 | |
27 | - protected $manualWheres = []; |
|
27 | + protected $manualWheres = []; |
|
28 | 28 | |
29 | - protected $whereType = 'AND'; |
|
29 | + protected $whereType = 'AND'; |
|
30 | 30 | |
31 | - function getWhere() |
|
32 | - { |
|
33 | - return $this->where; |
|
34 | - } |
|
35 | - |
|
36 | - function getLimit() |
|
37 | - { |
|
38 | - return $this->limit; |
|
39 | - } |
|
40 | - |
|
41 | - function getOfset() |
|
42 | - { |
|
43 | - return $this->ofset; |
|
44 | - } |
|
45 | - |
|
46 | - function getJoins() |
|
47 | - { |
|
48 | - return $this->joins; |
|
49 | - } |
|
50 | - |
|
51 | - function getOrder() |
|
52 | - { |
|
53 | - return $this->order; |
|
54 | - } |
|
55 | - |
|
56 | - function getManualJoins() |
|
57 | - { |
|
58 | - return $this->manualJoins; |
|
59 | - } |
|
60 | - |
|
61 | - function getGroup() |
|
62 | - { |
|
63 | - return $this->group; |
|
64 | - } |
|
65 | - |
|
66 | - function getManualWheres() |
|
67 | - { |
|
68 | - return $this->manualWheres; |
|
69 | - } |
|
70 | - |
|
71 | - function getWhereType() |
|
72 | - { |
|
73 | - return $this->whereType; |
|
74 | - } |
|
75 | - |
|
76 | - function setWhere($field,$value = false) |
|
77 | - { |
|
78 | - if($value!==false){ |
|
79 | - $this->where[$field] = $value; |
|
80 | - } |
|
81 | - else{ |
|
82 | - $this->where = $where; |
|
83 | - } |
|
31 | + function getWhere() |
|
32 | + { |
|
33 | + return $this->where; |
|
34 | + } |
|
35 | + |
|
36 | + function getLimit() |
|
37 | + { |
|
38 | + return $this->limit; |
|
39 | + } |
|
40 | + |
|
41 | + function getOfset() |
|
42 | + { |
|
43 | + return $this->ofset; |
|
44 | + } |
|
45 | + |
|
46 | + function getJoins() |
|
47 | + { |
|
48 | + return $this->joins; |
|
49 | + } |
|
50 | + |
|
51 | + function getOrder() |
|
52 | + { |
|
53 | + return $this->order; |
|
54 | + } |
|
55 | + |
|
56 | + function getManualJoins() |
|
57 | + { |
|
58 | + return $this->manualJoins; |
|
59 | + } |
|
60 | + |
|
61 | + function getGroup() |
|
62 | + { |
|
63 | + return $this->group; |
|
64 | + } |
|
65 | + |
|
66 | + function getManualWheres() |
|
67 | + { |
|
68 | + return $this->manualWheres; |
|
69 | + } |
|
70 | + |
|
71 | + function getWhereType() |
|
72 | + { |
|
73 | + return $this->whereType; |
|
74 | + } |
|
75 | + |
|
76 | + function setWhere($field,$value = false) |
|
77 | + { |
|
78 | + if($value!==false){ |
|
79 | + $this->where[$field] = $value; |
|
80 | + } |
|
81 | + else{ |
|
82 | + $this->where = $where; |
|
83 | + } |
|
84 | 84 | |
85 | - return $this; |
|
86 | - } |
|
87 | - |
|
88 | - function setLimit($limit) |
|
89 | - { |
|
90 | - $this->limit = $limit; |
|
91 | - return $this; |
|
92 | - } |
|
93 | - |
|
94 | - function setOfset($ofset) |
|
95 | - { |
|
96 | - $this->ofset = $ofset; |
|
97 | - return $this; |
|
98 | - } |
|
99 | - |
|
100 | - function setJoins($joins) |
|
101 | - { |
|
102 | - $this->joins = $joins; |
|
103 | - return $this; |
|
104 | - } |
|
105 | - |
|
106 | - function setOrder($order) |
|
107 | - { |
|
108 | - $this->order = $order; |
|
109 | - return $this; |
|
110 | - } |
|
111 | - |
|
112 | - function setManualJoins($manualJoins) |
|
113 | - { |
|
114 | - $this->manualJoins = $manualJoins; |
|
115 | - return $this; |
|
116 | - } |
|
117 | - |
|
118 | - function setGroup($group) |
|
119 | - { |
|
120 | - $this->group = $group; |
|
121 | - return $this; |
|
122 | - } |
|
123 | - |
|
124 | - function setManualWheres($manualWheres) |
|
125 | - { |
|
126 | - $this->manualWheres = $manualWheres; |
|
127 | - return $this; |
|
128 | - } |
|
129 | - |
|
130 | - function setWhereType($whereType) |
|
131 | - { |
|
132 | - $this->whereType = $whereType; |
|
133 | - return $this; |
|
134 | - } |
|
135 | - |
|
136 | - /** |
|
137 | - * Создание критериев |
|
138 | - */ |
|
139 | - public function getCriteria() |
|
140 | - { |
|
85 | + return $this; |
|
86 | + } |
|
87 | + |
|
88 | + function setLimit($limit) |
|
89 | + { |
|
90 | + $this->limit = $limit; |
|
91 | + return $this; |
|
92 | + } |
|
93 | + |
|
94 | + function setOfset($ofset) |
|
95 | + { |
|
96 | + $this->ofset = $ofset; |
|
97 | + return $this; |
|
98 | + } |
|
99 | + |
|
100 | + function setJoins($joins) |
|
101 | + { |
|
102 | + $this->joins = $joins; |
|
103 | + return $this; |
|
104 | + } |
|
105 | + |
|
106 | + function setOrder($order) |
|
107 | + { |
|
108 | + $this->order = $order; |
|
109 | + return $this; |
|
110 | + } |
|
111 | + |
|
112 | + function setManualJoins($manualJoins) |
|
113 | + { |
|
114 | + $this->manualJoins = $manualJoins; |
|
115 | + return $this; |
|
116 | + } |
|
117 | + |
|
118 | + function setGroup($group) |
|
119 | + { |
|
120 | + $this->group = $group; |
|
121 | + return $this; |
|
122 | + } |
|
123 | + |
|
124 | + function setManualWheres($manualWheres) |
|
125 | + { |
|
126 | + $this->manualWheres = $manualWheres; |
|
127 | + return $this; |
|
128 | + } |
|
129 | + |
|
130 | + function setWhereType($whereType) |
|
131 | + { |
|
132 | + $this->whereType = $whereType; |
|
133 | + return $this; |
|
134 | + } |
|
135 | + |
|
136 | + /** |
|
137 | + * Создание критериев |
|
138 | + */ |
|
139 | + public function getCriteria() |
|
140 | + { |
|
141 | 141 | |
142 | - } |
|
142 | + } |
|
143 | 143 | } |
@@ -73,12 +73,12 @@ |
||
73 | 73 | return $this->whereType; |
74 | 74 | } |
75 | 75 | |
76 | - function setWhere($field,$value = false) |
|
76 | + function setWhere($field, $value = false) |
|
77 | 77 | { |
78 | - if($value!==false){ |
|
78 | + if ($value!==false) { |
|
79 | 79 | $this->where[$field] = $value; |
80 | 80 | } |
81 | - else{ |
|
81 | + else { |
|
82 | 82 | $this->where = $where; |
83 | 83 | } |
84 | 84 |
@@ -77,8 +77,7 @@ |
||
77 | 77 | { |
78 | 78 | if($value!==false){ |
79 | 79 | $this->where[$field] = $value; |
80 | - } |
|
81 | - else{ |
|
80 | + } else{ |
|
82 | 81 | $this->where = $where; |
83 | 82 | } |
84 | 83 |
@@ -10,15 +10,15 @@ |
||
10 | 10 | interface RepositoryInterface |
11 | 11 | { |
12 | 12 | |
13 | - public function findById($id); |
|
13 | + public function findById($id); |
|
14 | 14 | |
15 | - public function findBySpecification(ISpecificationCriteria $specification); |
|
15 | + public function findBySpecification(ISpecificationCriteria $specification); |
|
16 | 16 | |
17 | - public function findAll(); |
|
17 | + public function findAll(); |
|
18 | 18 | |
19 | - public function findAllBySpecification(ISpecificationCriteria $specification); |
|
19 | + public function findAllBySpecification(ISpecificationCriteria $specification); |
|
20 | 20 | |
21 | - public function save(EntityInterface $Entity); |
|
21 | + public function save(EntityInterface $Entity); |
|
22 | 22 | |
23 | - public function delete(EntityInterface $Entity); |
|
23 | + public function delete(EntityInterface $Entity); |
|
24 | 24 | } |
@@ -14,13 +14,13 @@ |
||
14 | 14 | */ |
15 | 15 | interface QueryBuilderInterface { |
16 | 16 | |
17 | - public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria); |
|
17 | + public function getResultQuery($table, \SimpleORM\ISpecificationCriteria $Criteria); |
|
18 | 18 | |
19 | - public function update($table,array $data,$where = []); |
|
19 | + public function update($table, array $data, $where = []); |
|
20 | 20 | |
21 | - public function insert($table,array $data); |
|
21 | + public function insert($table, array $data); |
|
22 | 22 | |
23 | 23 | public function insert_id(); |
24 | 24 | |
25 | - public function delete($table,$where = []); |
|
25 | + public function delete($table, $where = []); |
|
26 | 26 | } |
@@ -8,12 +8,12 @@ |
||
8 | 8 | */ |
9 | 9 | interface EntityInterface |
10 | 10 | { |
11 | - //put your code here |
|
12 | - public function getId(); |
|
11 | + //put your code here |
|
12 | + public function getId(); |
|
13 | 13 | |
14 | - public function setId($id); |
|
14 | + public function setId($id); |
|
15 | 15 | |
16 | - public function getDeleted(); |
|
16 | + public function getDeleted(); |
|
17 | 17 | |
18 | - public function setDeleted($delete); |
|
18 | + public function setDeleted($delete); |
|
19 | 19 | } |
@@ -66,6 +66,9 @@ discard block |
||
66 | 66 | return $this->adapter->delete($table,$where); |
67 | 67 | } |
68 | 68 | |
69 | + /** |
|
70 | + * @param string $str |
|
71 | + */ |
|
69 | 72 | protected function escape_str($str, $like = FALSE) |
70 | 73 | { |
71 | 74 | |
@@ -120,7 +123,6 @@ discard block |
||
120 | 123 | |
121 | 124 | /** |
122 | 125 | * |
123 | - * @param type $param |
|
124 | 126 | */ |
125 | 127 | public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria ) { |
126 | 128 | |
@@ -155,7 +157,7 @@ discard block |
||
155 | 157 | /** |
156 | 158 | * Создает селект не только для основной таблицы но и для приджойненых таблиц |
157 | 159 | * @param type $joins |
158 | - * @return type |
|
160 | + * @return string |
|
159 | 161 | */ |
160 | 162 | protected function createSelect($joins) |
161 | 163 | { |
@@ -171,8 +173,8 @@ discard block |
||
171 | 173 | /** |
172 | 174 | * Получение записей по условию |
173 | 175 | * @param type $where |
174 | - * @param type $limit |
|
175 | - * @param type $offset |
|
176 | + * @param integer $limit |
|
177 | + * @param integer $offset |
|
176 | 178 | * @param type $joins |
177 | 179 | * @param type $order |
178 | 180 | * @param type $manualJoins |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | protected function escape($str) |
39 | 39 | { |
40 | 40 | if (is_string($str)) { |
41 | - $str = "'" . $this->escape_str($str) . "'"; |
|
41 | + $str = "'".$this->escape_str($str)."'"; |
|
42 | 42 | } elseif (is_bool($str)) { |
43 | - $str = ($str === FALSE) ? 0 : 1; |
|
43 | + $str = ($str===FALSE) ? 0 : 1; |
|
44 | 44 | } elseif (is_null($str)) { |
45 | 45 | $str = 'NULL'; |
46 | 46 | } |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | return $str; |
49 | 49 | } |
50 | 50 | |
51 | - public function update($table,array $data,$where = []){ |
|
52 | - return $this->adapter->update($table,$data,$where); |
|
51 | + public function update($table, array $data, $where = []) { |
|
52 | + return $this->adapter->update($table, $data, $where); |
|
53 | 53 | } |
54 | 54 | |
55 | - public function insert($table,array $data) |
|
55 | + public function insert($table, array $data) |
|
56 | 56 | { |
57 | - return $this->adapter->insert($table,$data); |
|
57 | + return $this->adapter->insert($table, $data); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | public function insert_id() |
@@ -62,17 +62,17 @@ discard block |
||
62 | 62 | return $this->adapter->insert_id(); |
63 | 63 | } |
64 | 64 | |
65 | - public function delete($table,$where = []){ |
|
66 | - return $this->adapter->delete($table,$where); |
|
65 | + public function delete($table, $where = []) { |
|
66 | + return $this->adapter->delete($table, $where); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | protected function escape_str($str, $like = FALSE) |
70 | 70 | { |
71 | 71 | |
72 | - if(!$like){ |
|
72 | + if (!$like) { |
|
73 | 73 | return $this->adapter->escape_str($str); |
74 | 74 | } |
75 | - else{ |
|
75 | + else { |
|
76 | 76 | return $this->adapter->escape_like_str($str); |
77 | 77 | } |
78 | 78 | |
@@ -111,8 +111,8 @@ discard block |
||
111 | 111 | throw new HttpException('You cannot have an empty field name.'); |
112 | 112 | } |
113 | 113 | |
114 | - if (strpos($field, '.') === false) { |
|
115 | - return $this->TableName . '.' . $field; |
|
114 | + if (strpos($field, '.')===false) { |
|
115 | + return $this->TableName.'.'.$field; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | return $field; |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * |
123 | 123 | * @param type $param |
124 | 124 | */ |
125 | - public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria ) { |
|
125 | + public function getResultQuery($table, \SimpleORM\ISpecificationCriteria $Criteria) { |
|
126 | 126 | |
127 | 127 | $this->setTable($table); |
128 | 128 | |
@@ -141,12 +141,12 @@ discard block |
||
141 | 141 | return $res; |
142 | 142 | } |
143 | 143 | |
144 | - protected function setTable($table){ |
|
145 | - if(preg_match('~(.*?)\.(.*?)$~is',$table,$m)){ |
|
144 | + protected function setTable($table) { |
|
145 | + if (preg_match('~(.*?)\.(.*?)$~is', $table, $m)) { |
|
146 | 146 | $this->database = $m[1]; |
147 | 147 | $this->TableName = $m[2]; |
148 | 148 | } |
149 | - else{ |
|
149 | + else { |
|
150 | 150 | $this->TableName = $table; |
151 | 151 | } |
152 | 152 | } |
@@ -159,9 +159,9 @@ discard block |
||
159 | 159 | */ |
160 | 160 | protected function createSelect($joins) |
161 | 161 | { |
162 | - $s = "`" . $this->TableName . '`.*'; |
|
162 | + $s = "`".$this->TableName.'`.*'; |
|
163 | 163 | foreach ($joins as $table => $join) { |
164 | - $table = isset($join['alias']) ? "`{$join['alias']}`": $table; |
|
164 | + $table = isset($join['alias']) ? "`{$join['alias']}`" : $table; |
|
165 | 165 | $s .= ", $table.*"; |
166 | 166 | } |
167 | 167 | return $s; |
@@ -184,8 +184,8 @@ discard block |
||
184 | 184 | */ |
185 | 185 | protected function buildQuery($where = array(), $limit = 25, $offset = 0, $joins = array(), $order = array(), $manualJoins = array(), $group = null, $manualWheres = array(), $whereType = 'AND') |
186 | 186 | { |
187 | - $table = !empty($this->database)? "`{$this->database}`.".$this->TableName : $this->TableName; |
|
188 | - $query = 'SELECT ' . $this->createSelect($joins) . " FROM `".$table."`"; |
|
187 | + $table = !empty($this->database) ? "`{$this->database}`.".$this->TableName : $this->TableName; |
|
188 | + $query = 'SELECT '.$this->createSelect($joins)." FROM `".$table."`"; |
|
189 | 189 | //$countQuery = "SELECT COUNT(*) AS cnt FROM `{$this->database}`.".$this->getTableName(); |
190 | 190 | |
191 | 191 | $wheres = array(); |
@@ -195,15 +195,15 @@ discard block |
||
195 | 195 | |
196 | 196 | if (!is_array($value)) { |
197 | 197 | $params[] = $value; |
198 | - $wheres[] = $key . ' = ?'; |
|
198 | + $wheres[] = $key.' = ?'; |
|
199 | 199 | } else { |
200 | 200 | if (isset($value['operator'])) { |
201 | 201 | if (is_array($value['value'])) { |
202 | - if ($value['operator'] == 'between') { |
|
202 | + if ($value['operator']=='between') { |
|
203 | 203 | $params[] = $value['value'][0]; |
204 | 204 | $params[] = $value['value'][1]; |
205 | - $wheres[] = $key . ' BETWEEN ? AND ?'; |
|
206 | - } elseif ($value['operator'] == 'IN') { |
|
205 | + $wheres[] = $key.' BETWEEN ? AND ?'; |
|
206 | + } elseif ($value['operator']=='IN') { |
|
207 | 207 | $in = array(); |
208 | 208 | |
209 | 209 | foreach ($value['value'] as $item) { |
@@ -211,67 +211,67 @@ discard block |
||
211 | 211 | $in[] = '?'; |
212 | 212 | } |
213 | 213 | |
214 | - $wheres[] = $key . ' IN (' . implode(', ', $in) . ') '; |
|
214 | + $wheres[] = $key.' IN ('.implode(', ', $in).') '; |
|
215 | 215 | } else { |
216 | 216 | $ors = array(); |
217 | 217 | foreach ($value['value'] as $item) { |
218 | - if ($item == 'null') { |
|
218 | + if ($item=='null') { |
|
219 | 219 | switch ($value['operator']) { |
220 | 220 | case '!=': |
221 | - $ors[] = $key . ' IS NOT NULL'; |
|
221 | + $ors[] = $key.' IS NOT NULL'; |
|
222 | 222 | break; |
223 | 223 | |
224 | 224 | case '==': |
225 | 225 | default: |
226 | - $ors[] = $key . ' IS NULL'; |
|
226 | + $ors[] = $key.' IS NULL'; |
|
227 | 227 | break; |
228 | 228 | } |
229 | 229 | } else { |
230 | 230 | $params[] = $item; |
231 | - $ors[] = $this->fieldCheck($key) . ' ' . $value['operator'] . ' ?'; |
|
231 | + $ors[] = $this->fieldCheck($key).' '.$value['operator'].' ?'; |
|
232 | 232 | } |
233 | 233 | } |
234 | - $wheres[] = '(' . implode(' OR ', $ors) . ')'; |
|
234 | + $wheres[] = '('.implode(' OR ', $ors).')'; |
|
235 | 235 | } |
236 | 236 | } else { |
237 | - if ($value['operator'] == 'like') { |
|
238 | - $params[] = '%' . $value['value'] . '%'; |
|
239 | - $wheres[] = $key . ' ' . $value['operator'] . ' ?'; |
|
237 | + if ($value['operator']=='like') { |
|
238 | + $params[] = '%'.$value['value'].'%'; |
|
239 | + $wheres[] = $key.' '.$value['operator'].' ?'; |
|
240 | 240 | } else { |
241 | - if ($value['value'] === 'null') { |
|
241 | + if ($value['value']==='null') { |
|
242 | 242 | switch ($value['operator']) { |
243 | 243 | case '!=': |
244 | - $wheres[] = $key . ' IS NOT NULL'; |
|
244 | + $wheres[] = $key.' IS NOT NULL'; |
|
245 | 245 | break; |
246 | 246 | |
247 | 247 | case '==': |
248 | 248 | default: |
249 | - $wheres[] = $key . ' IS NULL'; |
|
249 | + $wheres[] = $key.' IS NULL'; |
|
250 | 250 | break; |
251 | 251 | } |
252 | 252 | } else { |
253 | 253 | $params[] = $value['value']; |
254 | - $wheres[] = $key . ' ' . $value['operator'] . ' ?'; |
|
254 | + $wheres[] = $key.' '.$value['operator'].' ?'; |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | } |
258 | 258 | } else { |
259 | - $wheres[] = $key . ' IN (' . implode(', ', array_map(array($this, 'escape'), $value)) . ')'; |
|
259 | + $wheres[] = $key.' IN ('.implode(', ', array_map(array($this, 'escape'), $value)).')'; |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | } |
263 | 263 | |
264 | 264 | if (count($joins)) { |
265 | 265 | foreach ($joins as $table => $join) { |
266 | - $type = isset($join['type'])?$join['type']:'INNER'; |
|
267 | - $query .= ' '. $type.' JOIN `' . $table . '` as `' . $join['alias'] . '` ON ' . $join['on'] . ' '; |
|
266 | + $type = isset($join['type']) ? $join['type'] : 'INNER'; |
|
267 | + $query .= ' '.$type.' JOIN `'.$table.'` as `'.$join['alias'].'` ON '.$join['on'].' '; |
|
268 | 268 | //$countQuery .= ' '.$type.' JOIN ' . $table . ' ' . $join['alias'] . ' ON ' . $join['on'] . ' '; |
269 | 269 | } |
270 | 270 | } |
271 | 271 | |
272 | 272 | if (count($manualJoins)) { |
273 | 273 | foreach ($manualJoins as $join) { |
274 | - $query .= ' ' . $join . ' '; |
|
274 | + $query .= ' '.$join.' '; |
|
275 | 275 | //$countQuery .= ' ' . $join . ' '; |
276 | 276 | } |
277 | 277 | } |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | $hasWhere = false; |
280 | 280 | if (count($wheres)) { |
281 | 281 | $hasWhere = true; |
282 | - $query .= ' WHERE (' . implode(' ' . $whereType . ' ', $wheres) . ')'; |
|
282 | + $query .= ' WHERE ('.implode(' '.$whereType.' ', $wheres).')'; |
|
283 | 283 | //$countQuery .= ' WHERE (' . implode(' ' . $whereType . ' ', $wheres) . ')'; |
284 | 284 | } |
285 | 285 | |
@@ -290,11 +290,11 @@ discard block |
||
290 | 290 | $query .= ' WHERE '; |
291 | 291 | //$countQuery .= ' WHERE '; |
292 | 292 | } else { |
293 | - $query .= ' ' . $where['type'] . ' '; |
|
293 | + $query .= ' '.$where['type'].' '; |
|
294 | 294 | //$countQuery .= ' ' . $where['type'] . ' '; |
295 | 295 | } |
296 | 296 | |
297 | - $query .= ' ' . $where['query']; |
|
297 | + $query .= ' '.$where['query']; |
|
298 | 298 | //$countQuery .= ' ' . $where['query']; |
299 | 299 | |
300 | 300 | if (isset($where['params'])) { |
@@ -306,28 +306,28 @@ discard block |
||
306 | 306 | } |
307 | 307 | |
308 | 308 | if (!is_null($group)) { |
309 | - $query .= ' GROUP BY ' . $group . ' '; |
|
309 | + $query .= ' GROUP BY '.$group.' '; |
|
310 | 310 | } |
311 | 311 | |
312 | 312 | if (count($order)) { |
313 | 313 | $orders = array(); |
314 | - if (is_string($order) && $order == 'rand') { |
|
314 | + if (is_string($order) && $order=='rand') { |
|
315 | 315 | $query .= ' ORDER BY RAND() '; |
316 | 316 | } else { |
317 | 317 | foreach ($order as $key => $value) { |
318 | - $orders[] = $this->fieldCheck($key) . ' ' . $value; |
|
318 | + $orders[] = $this->fieldCheck($key).' '.$value; |
|
319 | 319 | } |
320 | 320 | |
321 | - $query .= ' ORDER BY ' . implode(', ', $orders); |
|
321 | + $query .= ' ORDER BY '.implode(', ', $orders); |
|
322 | 322 | } |
323 | 323 | } |
324 | 324 | |
325 | 325 | if ($limit) { |
326 | - $query .= ' LIMIT ' . $limit; |
|
326 | + $query .= ' LIMIT '.$limit; |
|
327 | 327 | } |
328 | 328 | |
329 | 329 | if ($offset) { |
330 | - $query .= ' OFFSET ' . $offset; |
|
330 | + $query .= ' OFFSET '.$offset; |
|
331 | 331 | } |
332 | 332 | |
333 | 333 | |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | try { |
346 | 346 | //$query = $this->compile_binds($query, $params); |
347 | 347 | |
348 | - return $this->adapter->query($query,$params); |
|
348 | + return $this->adapter->query($query, $params); |
|
349 | 349 | //ed( $this->adapter->query($query) ,1); |
350 | 350 | // if ($res = $this->adapter->getRows($query)) { |
351 | 351 | // $rtn = array(); |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | // } else { |
360 | 360 | // return false; |
361 | 361 | // } |
362 | - } catch(\PDOException $ex) { |
|
362 | + } catch (\PDOException $ex) { |
|
363 | 363 | throw $ex; |
364 | 364 | } |
365 | 365 | } |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | */ |
375 | 375 | protected function compile_binds($sql, $binds) |
376 | 376 | { |
377 | - if (strpos($sql, $this->bind_marker) === FALSE) { |
|
377 | + if (strpos($sql, $this->bind_marker)===FALSE) { |
|
378 | 378 | return $sql; |
379 | 379 | } |
380 | 380 |
@@ -71,8 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | if(!$like){ |
73 | 73 | return $this->adapter->escape_str($str); |
74 | - } |
|
75 | - else{ |
|
74 | + } else{ |
|
76 | 75 | return $this->adapter->escape_like_str($str); |
77 | 76 | } |
78 | 77 | |
@@ -145,8 +144,7 @@ discard block |
||
145 | 144 | if(preg_match('~(.*?)\.(.*?)$~is',$table,$m)){ |
146 | 145 | $this->database = $m[1]; |
147 | 146 | $this->TableName = $m[2]; |
148 | - } |
|
149 | - else{ |
|
147 | + } else{ |
|
150 | 148 | $this->TableName = $table; |
151 | 149 | } |
152 | 150 | } |
@@ -5,8 +5,8 @@ discard block |
||
5 | 5 | |
6 | 6 | /** |
7 | 7 | * получение защищенного свойства |
8 | - * @param type $o |
|
9 | - * @param type $name |
|
8 | + * @param string $name |
|
9 | + * @param SimpleORM\AbstractDataMapper $obj |
|
10 | 10 | * @return type |
11 | 11 | */ |
12 | 12 | static public function getProtectedAttribute($obj, $name) |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * Добавление значения в защищенное свойтсво |
22 | 22 | * @param type $name |
23 | - * @param type $valued |
|
23 | + * @param type $value |
|
24 | 24 | */ |
25 | 25 | private function setValueprotectedProperty($name, $value) |
26 | 26 | { |
@@ -30,6 +30,10 @@ discard block |
||
30 | 30 | $r->setValue($this->object, $value); //изменяем значение |
31 | 31 | } |
32 | 32 | |
33 | + /** |
|
34 | + * @param SimpleORM\AbstractDataMapper $obj |
|
35 | + * @param string $name |
|
36 | + */ |
|
33 | 37 | static public function callMethod($obj, $name, array $args) { |
34 | 38 | $class = new \ReflectionClass($obj); |
35 | 39 | $method = $class->getMethod($name); |
@@ -3,38 +3,38 @@ |
||
3 | 3 | |
4 | 4 | class TestHelper{ |
5 | 5 | |
6 | - /** |
|
7 | - * получение защищенного свойства |
|
8 | - * @param type $o |
|
9 | - * @param type $name |
|
10 | - * @return type |
|
11 | - */ |
|
12 | - static public function getProtectedAttribute($obj, $name) |
|
13 | - { |
|
14 | - $reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass |
|
15 | - $r = $reflectionClass->getProperty($name); //получаем свойство |
|
16 | - $r->setAccessible(true); //делаем открытым |
|
17 | - return $r->getValue($obj); |
|
18 | - } |
|
6 | + /** |
|
7 | + * получение защищенного свойства |
|
8 | + * @param type $o |
|
9 | + * @param type $name |
|
10 | + * @return type |
|
11 | + */ |
|
12 | + static public function getProtectedAttribute($obj, $name) |
|
13 | + { |
|
14 | + $reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass |
|
15 | + $r = $reflectionClass->getProperty($name); //получаем свойство |
|
16 | + $r->setAccessible(true); //делаем открытым |
|
17 | + return $r->getValue($obj); |
|
18 | + } |
|
19 | 19 | |
20 | - /** |
|
21 | - * Добавление значения в защищенное свойтсво |
|
22 | - * @param type $name |
|
23 | - * @param type $valued |
|
24 | - */ |
|
25 | - private function setValueprotectedProperty($name, $value) |
|
26 | - { |
|
27 | - $reflectionClass = new \ReflectionClass($this->object); //создаем reflectionClass |
|
28 | - $r = $reflectionClass->getProperty($name); //получаем свойство |
|
29 | - $r->setAccessible(true); //делаем открытым |
|
30 | - $r->setValue($this->object, $value); //изменяем значение |
|
31 | - } |
|
20 | + /** |
|
21 | + * Добавление значения в защищенное свойтсво |
|
22 | + * @param type $name |
|
23 | + * @param type $valued |
|
24 | + */ |
|
25 | + private function setValueprotectedProperty($name, $value) |
|
26 | + { |
|
27 | + $reflectionClass = new \ReflectionClass($this->object); //создаем reflectionClass |
|
28 | + $r = $reflectionClass->getProperty($name); //получаем свойство |
|
29 | + $r->setAccessible(true); //делаем открытым |
|
30 | + $r->setValue($this->object, $value); //изменяем значение |
|
31 | + } |
|
32 | 32 | |
33 | 33 | static public function callMethod($obj, $name, array $args) { |
34 | - $class = new \ReflectionClass($obj); |
|
35 | - $method = $class->getMethod($name); |
|
36 | - $method->setAccessible(true); |
|
37 | - return $method->invokeArgs($obj, $args); |
|
38 | - } |
|
34 | + $class = new \ReflectionClass($obj); |
|
35 | + $method = $class->getMethod($name); |
|
36 | + $method->setAccessible(true); |
|
37 | + return $method->invokeArgs($obj, $args); |
|
38 | + } |
|
39 | 39 | |
40 | 40 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | $loader = require_once __DIR__.'/../vendor/autoload.php'; |
3 | 3 | |
4 | -class TestHelper{ |
|
4 | +class TestHelper { |
|
5 | 5 | |
6 | 6 | /** |
7 | 7 | * получение защищенного свойства |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | //----------------- |
59 | 59 | $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
60 | 60 | |
61 | - $this->assertEquals($mapping_fields, $correct); |
|
61 | + $this->assertEquals($mapping_fields, $correct); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | //----------------- |
78 | 78 | $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
79 | 79 | |
80 | - $this->assertEquals($mapping_fields, $correct); |
|
80 | + $this->assertEquals($mapping_fields, $correct); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | //----------------- |
99 | 99 | $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
100 | 100 | |
101 | - $this->assertEquals($mapping_fields, $correct); |
|
101 | + $this->assertEquals($mapping_fields, $correct); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | //----------------- |
122 | 122 | $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
123 | 123 | |
124 | - $this->assertEquals($mapping_fields, $correct); |
|
124 | + $this->assertEquals($mapping_fields, $correct); |
|
125 | 125 | |
126 | 126 | $key_field = \TestHelper::getProtectedAttribute($this->object,'key'); |
127 | 127 | $this->assertEquals($key_field, 'tb_mayfield'); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | //----------------- |
148 | 148 | $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
149 | 149 | |
150 | - $this->assertEquals($mapping_fields, $correct); |
|
150 | + $this->assertEquals($mapping_fields, $correct); |
|
151 | 151 | |
152 | 152 | $soft_delete_key = \TestHelper::getProtectedAttribute($this->object,'soft_delete_key'); |
153 | 153 | $this->assertEquals($soft_delete_key, 'tb_mayfield'); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | // ])//в конструктор |
29 | 29 | ->disableOriginalConstructor() |
30 | 30 | //->setMethods(null) |
31 | - ->setMethods(['setMappingFields','createEntity']) |
|
31 | + ->setMethods(['setMappingFields', 'createEntity']) |
|
32 | 32 | //->setMethods(null) //не использовать заглушки методов иначе буде возвращать NULL |
33 | 33 | ->getMock(); |
34 | 34 | } |
@@ -45,9 +45,9 @@ discard block |
||
45 | 45 | /** |
46 | 46 | * @covers SimpleORM\AbstractDataMapper::AddMappingField |
47 | 47 | */ |
48 | - public function testAddMappingField_SimpleField(){ |
|
48 | + public function testAddMappingField_SimpleField() { |
|
49 | 49 | |
50 | - \TestHelper::callMethod($this->object,'addMappingField',['myfield']); |
|
50 | + \TestHelper::callMethod($this->object, 'addMappingField', ['myfield']); |
|
51 | 51 | |
52 | 52 | $correct = [ |
53 | 53 | 'myfield' => [ |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | ]; |
57 | 57 | |
58 | 58 | //----------------- |
59 | - $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
|
59 | + $mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields'); |
|
60 | 60 | |
61 | 61 | $this->assertEquals($mapping_fields, $correct); |
62 | 62 | } |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | /** |
65 | 65 | * @covers SimpleORM\AbstractDataMapper::AddMappingField |
66 | 66 | */ |
67 | - public function testAddMappingField_FieldAndAlias(){ |
|
67 | + public function testAddMappingField_FieldAndAlias() { |
|
68 | 68 | |
69 | - \TestHelper::callMethod($this->object,'addMappingField',['myfield','tb_mayfield']); |
|
69 | + \TestHelper::callMethod($this->object, 'addMappingField', ['myfield', 'tb_mayfield']); |
|
70 | 70 | |
71 | 71 | $correct = [ |
72 | 72 | 'myfield' => [ |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | ]; |
76 | 76 | |
77 | 77 | //----------------- |
78 | - $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
|
78 | + $mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields'); |
|
79 | 79 | |
80 | 80 | $this->assertEquals($mapping_fields, $correct); |
81 | 81 | } |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | /** |
84 | 84 | * @covers SimpleORM\AbstractDataMapper::AddMappingField |
85 | 85 | */ |
86 | - public function testAddMappingField_ArrayField(){ |
|
86 | + public function testAddMappingField_ArrayField() { |
|
87 | 87 | |
88 | - \TestHelper::callMethod($this->object,'addMappingField',['myfield',[ |
|
88 | + \TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [ |
|
89 | 89 | 'field' => 'tb_mayfield' |
90 | 90 | ]]); |
91 | 91 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | ]; |
97 | 97 | |
98 | 98 | //----------------- |
99 | - $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
|
99 | + $mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields'); |
|
100 | 100 | |
101 | 101 | $this->assertEquals($mapping_fields, $correct); |
102 | 102 | } |
@@ -104,9 +104,9 @@ discard block |
||
104 | 104 | /** |
105 | 105 | * @covers SimpleORM\AbstractDataMapper::AddMappingField |
106 | 106 | */ |
107 | - public function testAddMappingField_PrimaryKey(){ |
|
107 | + public function testAddMappingField_PrimaryKey() { |
|
108 | 108 | |
109 | - \TestHelper::callMethod($this->object,'addMappingField',['myfield',[ |
|
109 | + \TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [ |
|
110 | 110 | 'field' => 'tb_mayfield', |
111 | 111 | 'primary' => true |
112 | 112 | ]]); |
@@ -119,20 +119,20 @@ discard block |
||
119 | 119 | ]; |
120 | 120 | |
121 | 121 | //----------------- |
122 | - $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
|
122 | + $mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields'); |
|
123 | 123 | |
124 | 124 | $this->assertEquals($mapping_fields, $correct); |
125 | 125 | |
126 | - $key_field = \TestHelper::getProtectedAttribute($this->object,'key'); |
|
126 | + $key_field = \TestHelper::getProtectedAttribute($this->object, 'key'); |
|
127 | 127 | $this->assertEquals($key_field, 'tb_mayfield'); |
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
131 | 131 | * @covers SimpleORM\AbstractDataMapper::AddMappingField |
132 | 132 | */ |
133 | - public function testAddMappingField_SoftDelete(){ |
|
133 | + public function testAddMappingField_SoftDelete() { |
|
134 | 134 | |
135 | - \TestHelper::callMethod($this->object,'addMappingField',['myfield',[ |
|
135 | + \TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [ |
|
136 | 136 | 'field' => 'tb_mayfield', |
137 | 137 | 'softdelete' => true |
138 | 138 | ]]); |
@@ -145,11 +145,11 @@ discard block |
||
145 | 145 | ]; |
146 | 146 | |
147 | 147 | //----------------- |
148 | - $mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields'); |
|
148 | + $mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields'); |
|
149 | 149 | |
150 | 150 | $this->assertEquals($mapping_fields, $correct); |
151 | 151 | |
152 | - $soft_delete_key = \TestHelper::getProtectedAttribute($this->object,'soft_delete_key'); |
|
152 | + $soft_delete_key = \TestHelper::getProtectedAttribute($this->object, 'soft_delete_key'); |
|
153 | 153 | $this->assertEquals($soft_delete_key, 'tb_mayfield'); |
154 | 154 | } |
155 | 155 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * таблица для сущности |
20 | 20 | * @var type |
21 | 21 | */ |
22 | - protected $entityTable; |
|
22 | + protected $entityTable; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * первичный ключ |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | |
89 | 89 | abstract protected function setMappingFields(); |
90 | 90 | |
91 | - public function getAdapter() { |
|
92 | - return $this->adapter; |
|
93 | - } |
|
91 | + public function getAdapter() { |
|
92 | + return $this->adapter; |
|
93 | + } |
|
94 | 94 | |
95 | 95 | public function setAdapter(QueryBuilderInterface $adapter){ |
96 | 96 | $this->adapter = $adapter; |
@@ -109,12 +109,12 @@ discard block |
||
109 | 109 | } |
110 | 110 | |
111 | 111 | |
112 | - public function findById($id) |
|
113 | - { |
|
112 | + public function findById($id) |
|
113 | + { |
|
114 | 114 | $Criteria = (new Specification())->setWhere($this->key , $id); |
115 | 115 | |
116 | - return $this->findBySpecification($Criteria); |
|
117 | - } |
|
116 | + return $this->findBySpecification($Criteria); |
|
117 | + } |
|
118 | 118 | |
119 | 119 | /** |
120 | 120 | * Cохранение сущности |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | */ |
211 | 211 | protected function buildEntity(EntityInterface $Entity, array $row){ |
212 | 212 | |
213 | - foreach ($this->mapping_fields as $alias => $cfg ) { |
|
213 | + foreach ($this->mapping_fields as $alias => $cfg ) { |
|
214 | 214 | |
215 | 215 | $value = false; |
216 | 216 | |
@@ -247,9 +247,9 @@ discard block |
||
247 | 247 | if($value!==false) |
248 | 248 | $Entity->{$method_set}($value); |
249 | 249 | |
250 | - } |
|
250 | + } |
|
251 | 251 | |
252 | - return $Entity; |
|
252 | + return $Entity; |
|
253 | 253 | } |
254 | 254 | |
255 | 255 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | $row = []; |
265 | 265 | |
266 | - foreach ($this->mapping_fields as $alias => $cfg ) { |
|
266 | + foreach ($this->mapping_fields as $alias => $cfg ) { |
|
267 | 267 | |
268 | 268 | $field = $cfg['field']; |
269 | 269 | |
@@ -293,9 +293,9 @@ discard block |
||
293 | 293 | |
294 | 294 | $row[$field] = $value; |
295 | 295 | |
296 | - } |
|
296 | + } |
|
297 | 297 | |
298 | - return $row; |
|
298 | + return $row; |
|
299 | 299 | } |
300 | 300 | |
301 | 301 | /** |
@@ -367,10 +367,10 @@ discard block |
||
367 | 367 | //получение записей |
368 | 368 | $res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification); |
369 | 369 | |
370 | - if (!$row = $res->row_array()) { |
|
371 | - return null; |
|
372 | - } |
|
373 | - return $this->createEntity($row); |
|
370 | + if (!$row = $res->row_array()) { |
|
371 | + return null; |
|
372 | + } |
|
373 | + return $this->createEntity($row); |
|
374 | 374 | } |
375 | 375 | |
376 | 376 | /** |
@@ -412,8 +412,8 @@ discard block |
||
412 | 412 | $res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification); |
413 | 413 | |
414 | 414 | if (!$rows = $res->result_array()) { |
415 | - return null; |
|
416 | - } |
|
415 | + return null; |
|
416 | + } |
|
417 | 417 | |
418 | 418 | foreach($rows as $k => $row){ |
419 | 419 | $rows[$k] = $this->createEntity($row); |
@@ -303,9 +303,9 @@ discard block |
||
303 | 303 | /** |
304 | 304 | * Подготавливаем конечный вариант Сущности |
305 | 305 | * |
306 | - * @param \Core\Infrastructure\EntityInterface $Entity |
|
306 | + * @param EntityInterface $Entity |
|
307 | 307 | * @param array $row |
308 | - * @return \Core\Infrastructure\EntityInterface |
|
308 | + * @return EntityInterface |
|
309 | 309 | * @throws BadMethodCallException |
310 | 310 | */ |
311 | 311 | protected function buildEntity(EntityInterface $Entity, array $row){ |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | |
356 | 356 | /** |
357 | 357 | * из объекта формирует массив |
358 | - * @param \Core\Infrastructure\EntityInterface $Entity |
|
358 | + * @param EntityInterface $Entity |
|
359 | 359 | * @return \Core\Infrastructure\EntityInterface |
360 | 360 | * @throws BadMethodCallException |
361 | 361 | */ |
@@ -400,6 +400,7 @@ discard block |
||
400 | 400 | |
401 | 401 | /** |
402 | 402 | * Установка поля для маппинга |
403 | + * @param string $alias |
|
403 | 404 | */ |
404 | 405 | protected function addMappingField($alias,$field = null){ |
405 | 406 |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | $this->setEntityTable($db_name); |
86 | 86 | |
87 | - if($this->getEntityTable()=='' || $this->getPrimaryKey()==''){ |
|
87 | + if ($this->getEntityTable()=='' || $this->getPrimaryKey()=='') { |
|
88 | 88 | throw new InvalidEntityPropertyException('Свойства entityTable или key не заданы'); |
89 | 89 | } |
90 | 90 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | return $this->adapter; |
97 | 97 | } |
98 | 98 | |
99 | - public function setAdapter(QueryBuilderInterface $adapter){ |
|
99 | + public function setAdapter(QueryBuilderInterface $adapter) { |
|
100 | 100 | $this->adapter = $adapter; |
101 | 101 | } |
102 | 102 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * Уставнока таблицы |
110 | 110 | */ |
111 | 111 | protected function setEntityTable($db_name) { |
112 | - $this->entityTable = !empty($db_name)? "$db_name.".$this->table : $this->table; |
|
112 | + $this->entityTable = !empty($db_name) ? "$db_name.".$this->table : $this->table; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function findById($id) |
121 | 121 | { |
122 | - $Criteria = (new Specification())->setWhere($this->key , $id); |
|
122 | + $Criteria = (new Specification())->setWhere($this->key, $id); |
|
123 | 123 | |
124 | 124 | return $this->findBySpecification($Criteria); |
125 | 125 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | $data = $this->unbuildEntity($Entity); |
134 | 134 | |
135 | - if(method_exists($this, 'onPrepareData' )) $this->onPrepareData( $Entity , $data ); |
|
135 | + if (method_exists($this, 'onPrepareData')) $this->onPrepareData($Entity, $data); |
|
136 | 136 | |
137 | 137 | $id = $data[$this->getPrimaryKey()]; |
138 | 138 | unset($data[$this->getPrimaryKey()]); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | unset($data[$this->setSoftDeleteKey()]); |
144 | 144 | |
145 | - $this->getAdapter()->insert($this->getEntityTable(),$data); |
|
145 | + $this->getAdapter()->insert($this->getEntityTable(), $data); |
|
146 | 146 | |
147 | 147 | if (!$id = $this->getAdapter()->insert_id()) { |
148 | 148 | return false; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | //update |
154 | 154 | else { |
155 | 155 | |
156 | - if(!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")){ |
|
156 | + if (!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")) { |
|
157 | 157 | return false; |
158 | 158 | } |
159 | 159 | |
@@ -168,13 +168,13 @@ discard block |
||
168 | 168 | */ |
169 | 169 | public function save(EntityInterface $Entity) |
170 | 170 | { |
171 | - if(method_exists($this, 'onAfterSave' )) $this->onAfterSave( $Entity ); |
|
171 | + if (method_exists($this, 'onAfterSave')) $this->onAfterSave($Entity); |
|
172 | 172 | |
173 | - if(!$this->saveWithoutEvents($Entity)){ |
|
173 | + if (!$this->saveWithoutEvents($Entity)) { |
|
174 | 174 | return false; |
175 | 175 | } |
176 | 176 | |
177 | - if(method_exists($this, 'onBeforeSave' )) $this->onBeforeSave( $Entity ); |
|
177 | + if (method_exists($this, 'onBeforeSave')) $this->onBeforeSave($Entity); |
|
178 | 178 | |
179 | 179 | return true; |
180 | 180 | } |
@@ -184,12 +184,12 @@ discard block |
||
184 | 184 | * получение мапперов в порядке их использования с учетом вложенности |
185 | 185 | * @return array |
186 | 186 | */ |
187 | - protected function createListRelation(){ |
|
187 | + protected function createListRelation() { |
|
188 | 188 | $rel_list = []; |
189 | 189 | |
190 | 190 | $rel_map = $this->getRelations(); |
191 | 191 | |
192 | - $this->createListRelationReq($rel_map,$rel_list); |
|
192 | + $this->createListRelationReq($rel_map, $rel_list); |
|
193 | 193 | |
194 | 194 | return $rel_list; |
195 | 195 | } |
@@ -199,17 +199,17 @@ discard block |
||
199 | 199 | * @param array $rel_map |
200 | 200 | * @param type $rel_list |
201 | 201 | */ |
202 | - protected function createListRelationReq(array $rel_map,&$rel_list,$obj_parent_link = null) { |
|
202 | + protected function createListRelationReq(array $rel_map, &$rel_list, $obj_parent_link = null) { |
|
203 | 203 | |
204 | - foreach ($rel_map as $rel){ |
|
204 | + foreach ($rel_map as $rel) { |
|
205 | 205 | |
206 | 206 | $obj_link = '#'.$rel['alias'].'()'; |
207 | 207 | |
208 | - if(count($rel['relations'])>0){ |
|
209 | - $this->createListRelationReq($rel['relations'],$rel_list,$obj_parent_link.'get'.$rel['alias'].'()'); |
|
210 | - $rel_list [$obj_parent_link.$obj_link]= $rel['name']; |
|
208 | + if (count($rel['relations']) > 0) { |
|
209 | + $this->createListRelationReq($rel['relations'], $rel_list, $obj_parent_link.'get'.$rel['alias'].'()'); |
|
210 | + $rel_list [$obj_parent_link.$obj_link] = $rel['name']; |
|
211 | 211 | } |
212 | - else{ |
|
212 | + else { |
|
213 | 213 | $rel_list [$obj_parent_link.$obj_link] = $rel['name']; |
214 | 214 | } |
215 | 215 | } |
@@ -219,12 +219,12 @@ discard block |
||
219 | 219 | /** |
220 | 220 | * получить связи |
221 | 221 | */ |
222 | - protected function getRelations(){ |
|
222 | + protected function getRelations() { |
|
223 | 223 | $rel_map = []; |
224 | - foreach ($this->mapping_fields as $field => $cfg){ |
|
225 | - if(isset($cfg['relation'])){ |
|
224 | + foreach ($this->mapping_fields as $field => $cfg) { |
|
225 | + if (isset($cfg['relation'])) { |
|
226 | 226 | $rels = $this->DI->get($cfg['relation'])->getRelations(); |
227 | - $rel_map []= [ |
|
227 | + $rel_map [] = [ |
|
228 | 228 | 'name' => $cfg['relation'], |
229 | 229 | 'alias' => $field, |
230 | 230 | 'relations' => $rels |
@@ -248,43 +248,43 @@ discard block |
||
248 | 248 | * @return \Core\Infrastructure\EntityInterface |
249 | 249 | * @throws BadMethodCallException |
250 | 250 | */ |
251 | - protected function buildEntity(EntityInterface $Entity, array $row){ |
|
251 | + protected function buildEntity(EntityInterface $Entity, array $row) { |
|
252 | 252 | |
253 | - foreach ($this->mapping_fields as $alias => $cfg ) { |
|
253 | + foreach ($this->mapping_fields as $alias => $cfg) { |
|
254 | 254 | |
255 | 255 | $value = false; |
256 | 256 | |
257 | 257 | $field = $cfg['field']; |
258 | 258 | |
259 | - $method_set = 'set' . ucfirst($alias); |
|
259 | + $method_set = 'set'.ucfirst($alias); |
|
260 | 260 | |
261 | - if(!method_exists($Entity, $method_set )){ |
|
261 | + if (!method_exists($Entity, $method_set)) { |
|
262 | 262 | throw new BadMethodCallException("Метод {$method_set} не определен"); |
263 | 263 | } |
264 | 264 | |
265 | 265 | //событие на формирование поля |
266 | - if( isset($cfg['build']) && is_object($cfg['build']) ){ |
|
266 | + if (isset($cfg['build']) && is_object($cfg['build'])) { |
|
267 | 267 | $value = call_user_func($cfg['build'], $row); |
268 | 268 | } |
269 | 269 | //на связь |
270 | - elseif(isset($cfg['relation'])){ |
|
270 | + elseif (isset($cfg['relation'])) { |
|
271 | 271 | |
272 | 272 | $mapper = $this->DI->get($cfg['relation']); |
273 | 273 | |
274 | - if($this->use_joins===true || empty($row[$field])){ |
|
274 | + if ($this->use_joins===true || empty($row[$field])) { |
|
275 | 275 | $value = $mapper->createEntity($row); |
276 | 276 | } |
277 | - else{ |
|
278 | - $fkey = isset($cfg['on']) ? $cfg['on'] :$mapper->key; |
|
277 | + else { |
|
278 | + $fkey = isset($cfg['on']) ? $cfg['on'] : $mapper->key; |
|
279 | 279 | $value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field])); |
280 | 280 | } |
281 | 281 | |
282 | 282 | } |
283 | - elseif(is_string($field) && isset($row[strtolower($field)])){ |
|
283 | + elseif (is_string($field) && isset($row[strtolower($field)])) { |
|
284 | 284 | $value = $row[strtolower($field)]; |
285 | 285 | } |
286 | 286 | |
287 | - if($value!==false) |
|
287 | + if ($value!==false) |
|
288 | 288 | $Entity->{$method_set}($value); |
289 | 289 | |
290 | 290 | } |
@@ -299,27 +299,27 @@ discard block |
||
299 | 299 | * @return \Core\Infrastructure\EntityInterface |
300 | 300 | * @throws BadMethodCallException |
301 | 301 | */ |
302 | - protected function unbuildEntity(EntityInterface $Entity){ |
|
302 | + protected function unbuildEntity(EntityInterface $Entity) { |
|
303 | 303 | |
304 | 304 | $row = []; |
305 | 305 | |
306 | - foreach ($this->mapping_fields as $alias => $cfg ) { |
|
306 | + foreach ($this->mapping_fields as $alias => $cfg) { |
|
307 | 307 | |
308 | 308 | $field = $cfg['field']; |
309 | 309 | |
310 | - $method_get = 'get' . ucfirst($alias); |
|
310 | + $method_get = 'get'.ucfirst($alias); |
|
311 | 311 | |
312 | - if(!method_exists($Entity, $method_get )){ |
|
312 | + if (!method_exists($Entity, $method_get)) { |
|
313 | 313 | throw new BadMethodCallException("Метод {$method_get} не определен"); |
314 | 314 | } |
315 | 315 | |
316 | 316 | //-------------------------------------------------------------------- |
317 | - if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){ |
|
318 | - $value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() ); |
|
317 | + if (isset($cfg['unbuild']) && is_object($cfg['unbuild'])) { |
|
318 | + $value = call_user_func($cfg['unbuild'], $Entity->{$method_get}()); |
|
319 | 319 | } |
320 | - elseif(isset($cfg['relation']) && is_object($Entity->{$method_get}()) ){ |
|
320 | + elseif (isset($cfg['relation']) && is_object($Entity->{$method_get}())) { |
|
321 | 321 | |
322 | - if(isset($cfg['on'])) |
|
322 | + if (isset($cfg['on'])) |
|
323 | 323 | $fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']); |
324 | 324 | else |
325 | 325 | $fkey = 'id'; |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | $value = $Entity->{$method_get}()->{'get'.$fkey}(); |
328 | 328 | |
329 | 329 | } |
330 | - else{ |
|
330 | + else { |
|
331 | 331 | $value = $Entity->{$method_get}(); |
332 | 332 | } |
333 | 333 | |
@@ -341,22 +341,22 @@ discard block |
||
341 | 341 | /** |
342 | 342 | * Установка поля для маппинга |
343 | 343 | */ |
344 | - protected function addMappingField($alias,$field = null){ |
|
344 | + protected function addMappingField($alias, $field = null) { |
|
345 | 345 | |
346 | - if(is_string($field)){ |
|
346 | + if (is_string($field)) { |
|
347 | 347 | $field = ['field' => $field]; |
348 | 348 | } |
349 | - elseif( (is_array($field) && !isset($field['field'])) || empty($field)){ |
|
350 | - $field['field'] = $alias; |
|
349 | + elseif ((is_array($field) && !isset($field['field'])) || empty($field)) { |
|
350 | + $field['field'] = $alias; |
|
351 | 351 | } |
352 | 352 | |
353 | 353 | $this->mapping_fields[$alias] = $field; |
354 | 354 | |
355 | - if(isset($field['primary']) && $field['primary']===true){ |
|
355 | + if (isset($field['primary']) && $field['primary']===true) { |
|
356 | 356 | $this->key = $field['field']; |
357 | 357 | } |
358 | 358 | |
359 | - if(isset($field['softdelete']) && $field['softdelete']===true){ |
|
359 | + if (isset($field['softdelete']) && $field['softdelete']===true) { |
|
360 | 360 | $this->soft_delete_key = $field['field']; |
361 | 361 | } |
362 | 362 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | |
384 | 384 | |
385 | 385 | |
386 | - public function getFieldAlias($field){ |
|
386 | + public function getFieldAlias($field) { |
|
387 | 387 | |
388 | 388 | return $this->mapping_fields_aliases[$field]; |
389 | 389 | |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | * @param ISpecificationCriteria $specification |
396 | 396 | * @return type |
397 | 397 | */ |
398 | - public function findBySpecification(ISpecificationCriteria $specification){ |
|
398 | + public function findBySpecification(ISpecificationCriteria $specification) { |
|
399 | 399 | |
400 | 400 | //псеводо удаление |
401 | 401 | $this->setSoftDelete($specification); |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | $specification->setLimit(1); |
406 | 406 | |
407 | 407 | //получение записей |
408 | - $res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification); |
|
408 | + $res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification); |
|
409 | 409 | |
410 | 410 | if (!$row = $res->row_array()) { |
411 | 411 | return null; |
@@ -426,13 +426,13 @@ discard block |
||
426 | 426 | |
427 | 427 | if ( |
428 | 428 | $delete_key > '' && |
429 | - $Entity->getId() > 0){ |
|
430 | - $result = $this->getAdapter()->update($this->getEntityTable(), [ $delete_key => 1 ], "{$this->getPrimaryKey()} = '{$Entity->getId()}'"); |
|
429 | + $Entity->getId() > 0) { |
|
430 | + $result = $this->getAdapter()->update($this->getEntityTable(), [$delete_key => 1], "{$this->getPrimaryKey()} = '{$Entity->getId()}'"); |
|
431 | 431 | } |
432 | - elseif($Entity->getId() > 0){ |
|
432 | + elseif ($Entity->getId() > 0) { |
|
433 | 433 | |
434 | - if($result = $this->getAdapter()->delete($this->getEntityTable(), $this->getPrimaryKey()." = ".$Entity->getId())){ |
|
435 | - if(method_exists($this, 'onBeforeDelete' )){ $result = $this->onBeforeDelete( $Entity );} |
|
434 | + if ($result = $this->getAdapter()->delete($this->getEntityTable(), $this->getPrimaryKey()." = ".$Entity->getId())) { |
|
435 | + if (method_exists($this, 'onBeforeDelete')) { $result = $this->onBeforeDelete($Entity); } |
|
436 | 436 | } |
437 | 437 | } |
438 | 438 | |
@@ -449,13 +449,13 @@ discard block |
||
449 | 449 | |
450 | 450 | $this->setRelations($specification); |
451 | 451 | |
452 | - $res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification); |
|
452 | + $res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification); |
|
453 | 453 | |
454 | 454 | if (!$rows = $res->result_array()) { |
455 | 455 | return null; |
456 | 456 | } |
457 | 457 | |
458 | - foreach($rows as $k => $row){ |
|
458 | + foreach ($rows as $k => $row) { |
|
459 | 459 | $rows[$k] = $this->createEntity($row); |
460 | 460 | } |
461 | 461 | |
@@ -471,13 +471,13 @@ discard block |
||
471 | 471 | * Выборка удаленных моделей |
472 | 472 | * @param ISpecificationCriteria $specification |
473 | 473 | */ |
474 | - private function setSoftDelete(ISpecificationCriteria $specification){ |
|
475 | - if( |
|
476 | - $this->use_delete === false && |
|
477 | - $this->setSoftDeleteKey()>'' |
|
474 | + private function setSoftDelete(ISpecificationCriteria $specification) { |
|
475 | + if ( |
|
476 | + $this->use_delete===false && |
|
477 | + $this->setSoftDeleteKey() > '' |
|
478 | 478 | && !isset($specification->getWhere()[$this->setSoftDeleteKey()]) |
479 | 479 | ) |
480 | - $specification->setWhere($this->setSoftDeleteKey(),0); |
|
480 | + $specification->setWhere($this->setSoftDeleteKey(), 0); |
|
481 | 481 | } |
482 | 482 | |
483 | 483 | /** |
@@ -488,12 +488,12 @@ discard block |
||
488 | 488 | * belongs_to - многие к многим (пользователь имет множество оплат одного заказа) |
489 | 489 | * has_one - один к одному |
490 | 490 | */ |
491 | - protected function setRelations(ISpecificationCriteria $Specification){ |
|
491 | + protected function setRelations(ISpecificationCriteria $Specification) { |
|
492 | 492 | |
493 | 493 | $joins = []; |
494 | 494 | |
495 | - foreach ($this->mapping_fields as $field => $cfg){ |
|
496 | - if(isset($cfg['relation'])){ |
|
495 | + foreach ($this->mapping_fields as $field => $cfg) { |
|
496 | + if (isset($cfg['relation'])) { |
|
497 | 497 | |
498 | 498 | $this->relations[$field] = [ |
499 | 499 | 'mapper' => $mapper = $this->DI->get($cfg['relation']), |
@@ -502,18 +502,18 @@ discard block |
||
502 | 502 | |
503 | 503 | $table = $mapper->getEntityTable(); |
504 | 504 | |
505 | - $relation_key = isset($cfg['on'])? $cfg['on'] : $mapper->key; |
|
505 | + $relation_key = isset($cfg['on']) ? $cfg['on'] : $mapper->key; |
|
506 | 506 | |
507 | 507 | $joins[$table] = [ |
508 | 508 | 'alias' => $field, |
509 | - 'type' => $cfg['reltype'] != 'has_many' ? 'INNER' : 'LEFT OUTER', |
|
509 | + 'type' => $cfg['reltype']!='has_many' ? 'INNER' : 'LEFT OUTER', |
|
510 | 510 | 'on' => "`{$this->table}`.{$cfg['field']} = `{$field}`.{$relation_key}" |
511 | 511 | ]; |
512 | 512 | |
513 | 513 | } |
514 | 514 | } |
515 | 515 | |
516 | - if($this->use_joins===true){ |
|
516 | + if ($this->use_joins===true) { |
|
517 | 517 | $Specification->setJoins($joins); |
518 | 518 | } |
519 | 519 | } |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | return $o; |
529 | 529 | } |
530 | 530 | |
531 | - public function withDelete(){ |
|
531 | + public function withDelete() { |
|
532 | 532 | $o = clone $this; |
533 | 533 | $o->use_delete = true; |
534 | 534 | return $o; |
@@ -132,7 +132,9 @@ discard block |
||
132 | 132 | |
133 | 133 | $data = $this->unbuildEntity($Entity); |
134 | 134 | |
135 | - if(method_exists($this, 'onPrepareData' )) $this->onPrepareData( $Entity , $data ); |
|
135 | + if(method_exists($this, 'onPrepareData' )) { |
|
136 | + $this->onPrepareData( $Entity , $data ); |
|
137 | + } |
|
136 | 138 | |
137 | 139 | $id = $data[$this->getPrimaryKey()]; |
138 | 140 | unset($data[$this->getPrimaryKey()]); |
@@ -168,13 +170,17 @@ discard block |
||
168 | 170 | */ |
169 | 171 | public function save(EntityInterface $Entity) |
170 | 172 | { |
171 | - if(method_exists($this, 'onAfterSave' )) $this->onAfterSave( $Entity ); |
|
173 | + if(method_exists($this, 'onAfterSave' )) { |
|
174 | + $this->onAfterSave( $Entity ); |
|
175 | + } |
|
172 | 176 | |
173 | 177 | if(!$this->saveWithoutEvents($Entity)){ |
174 | 178 | return false; |
175 | 179 | } |
176 | 180 | |
177 | - if(method_exists($this, 'onBeforeSave' )) $this->onBeforeSave( $Entity ); |
|
181 | + if(method_exists($this, 'onBeforeSave' )) { |
|
182 | + $this->onBeforeSave( $Entity ); |
|
183 | + } |
|
178 | 184 | |
179 | 185 | return true; |
180 | 186 | } |
@@ -208,8 +214,7 @@ discard block |
||
208 | 214 | if(count($rel['relations'])>0){ |
209 | 215 | $this->createListRelationReq($rel['relations'],$rel_list,$obj_parent_link.'get'.$rel['alias'].'()'); |
210 | 216 | $rel_list [$obj_parent_link.$obj_link]= $rel['name']; |
211 | - } |
|
212 | - else{ |
|
217 | + } else{ |
|
213 | 218 | $rel_list [$obj_parent_link.$obj_link] = $rel['name']; |
214 | 219 | } |
215 | 220 | } |
@@ -273,19 +278,18 @@ discard block |
||
273 | 278 | |
274 | 279 | if($this->use_joins===true || empty($row[$field])){ |
275 | 280 | $value = $mapper->createEntity($row); |
276 | - } |
|
277 | - else{ |
|
281 | + } else{ |
|
278 | 282 | $fkey = isset($cfg['on']) ? $cfg['on'] :$mapper->key; |
279 | 283 | $value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field])); |
280 | 284 | } |
281 | 285 | |
282 | - } |
|
283 | - elseif(is_string($field) && isset($row[strtolower($field)])){ |
|
286 | + } elseif(is_string($field) && isset($row[strtolower($field)])){ |
|
284 | 287 | $value = $row[strtolower($field)]; |
285 | 288 | } |
286 | 289 | |
287 | - if($value!==false) |
|
288 | - $Entity->{$method_set}($value); |
|
290 | + if($value!==false) { |
|
291 | + $Entity->{$method_set}($value); |
|
292 | + } |
|
289 | 293 | |
290 | 294 | } |
291 | 295 | |
@@ -316,18 +320,17 @@ discard block |
||
316 | 320 | //-------------------------------------------------------------------- |
317 | 321 | if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){ |
318 | 322 | $value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() ); |
319 | - } |
|
320 | - elseif(isset($cfg['relation']) && is_object($Entity->{$method_get}()) ){ |
|
323 | + } elseif(isset($cfg['relation']) && is_object($Entity->{$method_get}()) ){ |
|
321 | 324 | |
322 | - if(isset($cfg['on'])) |
|
323 | - $fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']); |
|
324 | - else |
|
325 | - $fkey = 'id'; |
|
325 | + if(isset($cfg['on'])) { |
|
326 | + $fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']); |
|
327 | + } else { |
|
328 | + $fkey = 'id'; |
|
329 | + } |
|
326 | 330 | |
327 | 331 | $value = $Entity->{$method_get}()->{'get'.$fkey}(); |
328 | 332 | |
329 | - } |
|
330 | - else{ |
|
333 | + } else{ |
|
331 | 334 | $value = $Entity->{$method_get}(); |
332 | 335 | } |
333 | 336 | |
@@ -345,8 +348,7 @@ discard block |
||
345 | 348 | |
346 | 349 | if(is_string($field)){ |
347 | 350 | $field = ['field' => $field]; |
348 | - } |
|
349 | - elseif( (is_array($field) && !isset($field['field'])) || empty($field)){ |
|
351 | + } elseif( (is_array($field) && !isset($field['field'])) || empty($field)){ |
|
350 | 352 | $field['field'] = $alias; |
351 | 353 | } |
352 | 354 | |
@@ -428,8 +430,7 @@ discard block |
||
428 | 430 | $delete_key > '' && |
429 | 431 | $Entity->getId() > 0){ |
430 | 432 | $result = $this->getAdapter()->update($this->getEntityTable(), [ $delete_key => 1 ], "{$this->getPrimaryKey()} = '{$Entity->getId()}'"); |
431 | - } |
|
432 | - elseif($Entity->getId() > 0){ |
|
433 | + } elseif($Entity->getId() > 0){ |
|
433 | 434 | |
434 | 435 | if($result = $this->getAdapter()->delete($this->getEntityTable(), $this->getPrimaryKey()." = ".$Entity->getId())){ |
435 | 436 | if(method_exists($this, 'onBeforeDelete' )){ $result = $this->onBeforeDelete( $Entity );} |
@@ -476,8 +477,9 @@ discard block |
||
476 | 477 | $this->use_delete === false && |
477 | 478 | $this->setSoftDeleteKey()>'' |
478 | 479 | && !isset($specification->getWhere()[$this->setSoftDeleteKey()]) |
479 | - ) |
|
480 | - $specification->setWhere($this->setSoftDeleteKey(),0); |
|
480 | + ) { |
|
481 | + $specification->setWhere($this->setSoftDeleteKey(),0); |
|
482 | + } |
|
481 | 483 | } |
482 | 484 | |
483 | 485 | /** |