@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $item = new SplArrayObject(); |
52 | 52 | foreach ($fields as $field) { |
53 | 53 | if ($row->offsetExists($field)) { |
54 | - $item[ $field ] = $row->offsetGet($field); |
|
54 | + $item[$field] = $row->offsetGet($field); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | $chunks = array_chunk($this->storage, $entries); |
78 | 78 | $offset = $page - 1; |
79 | 79 | |
80 | - if (isset($chunks[ $offset ])) { |
|
81 | - $result = new ArrayIterator($chunks[ $offset ]); |
|
80 | + if (isset($chunks[$offset])) { |
|
81 | + $result = new ArrayIterator($chunks[$offset]); |
|
82 | 82 | |
83 | 83 | if (empty($fields)) { |
84 | 84 | return $this->result = $result; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $item = new SplArrayObject(); |
88 | 88 | foreach ($fields as $field) { |
89 | 89 | if ($row->offsetExists($field)) { |
90 | - $item[ $field ] = $row->offsetGet($field); |
|
90 | + $item[$field] = $row->offsetGet($field); |
|
91 | 91 | } |
92 | 92 | } |
93 | 93 |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | ]); |
87 | 87 | } |
88 | 88 | |
89 | - $update[ 'id' ] = $row->id; |
|
89 | + $update['id'] = $row->id; |
|
90 | 90 | |
91 | 91 | if ($this->hasChilds($row->id)) { |
92 | 92 | $right = $this->rebuildTree($row->id, $right, $depth + 1); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | ->update($update = [ |
97 | 97 | 'record_right' => $right, |
98 | 98 | ]); |
99 | - $update[ 'id' ] = $row->id; |
|
99 | + $update['id'] = $row->id; |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | $i++; |
@@ -77,58 +77,58 @@ |
||
77 | 77 | { |
78 | 78 | $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s'); |
79 | 79 | |
80 | - if ( ! isset($sets[ 'record_status' ])) { |
|
81 | - $sets[ 'record_status' ] = $this->recordStatus; |
|
80 | + if ( ! isset($sets['record_status'])) { |
|
81 | + $sets['record_status'] = $this->recordStatus; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | if (empty($this->primaryKeys)) { |
85 | 85 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
86 | 86 | |
87 | - if (empty($sets[ $primaryKey ])) { |
|
88 | - if ( ! isset($sets[ 'record_create_user' ])) { |
|
89 | - $sets[ 'record_create_user' ] = $this->recordUser; |
|
87 | + if (empty($sets[$primaryKey])) { |
|
88 | + if ( ! isset($sets['record_create_user'])) { |
|
89 | + $sets['record_create_user'] = $this->recordUser; |
|
90 | 90 | } |
91 | 91 | |
92 | - if ( ! isset($sets[ 'record_create_timestamp' ])) { |
|
93 | - $sets[ 'record_create_timestamp' ] = $timestamp; |
|
92 | + if ( ! isset($sets['record_create_timestamp'])) { |
|
93 | + $sets['record_create_timestamp'] = $timestamp; |
|
94 | 94 | } elseif ($this->unixTimestamp) { |
95 | - $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]); |
|
95 | + $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']); |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 | } else { |
99 | 99 | foreach ($this->primaryKeys as $primaryKey) { |
100 | - if (empty($sets[ $primaryKey ])) { |
|
101 | - if ( ! isset($sets[ 'record_create_user' ])) { |
|
102 | - $sets[ 'record_create_user' ] = $this->recordUser; |
|
100 | + if (empty($sets[$primaryKey])) { |
|
101 | + if ( ! isset($sets['record_create_user'])) { |
|
102 | + $sets['record_create_user'] = $this->recordUser; |
|
103 | 103 | } |
104 | 104 | |
105 | - if ( ! isset($sets[ 'record_create_timestamp' ])) { |
|
106 | - $sets[ 'record_create_timestamp' ] = $timestamp; |
|
105 | + if ( ! isset($sets['record_create_timestamp'])) { |
|
106 | + $sets['record_create_timestamp'] = $timestamp; |
|
107 | 107 | } elseif ($this->unixTimestamp) { |
108 | - $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]); |
|
108 | + $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | } |
112 | 112 | } |
113 | 113 | |
114 | - $sets[ 'record_update_user' ] = $this->recordUser; |
|
114 | + $sets['record_update_user'] = $this->recordUser; |
|
115 | 115 | |
116 | - if ( ! isset($sets[ 'record_update_timestamp' ])) { |
|
117 | - $sets[ 'record_update_timestamp' ] = $timestamp; |
|
116 | + if ( ! isset($sets['record_update_timestamp'])) { |
|
117 | + $sets['record_update_timestamp'] = $timestamp; |
|
118 | 118 | } elseif ($this->unixTimestamp) { |
119 | - $sets[ 'record_update_timestamp' ] = strtotime($sets[ 'record_update_timestamp' ]); |
|
119 | + $sets['record_update_timestamp'] = strtotime($sets['record_update_timestamp']); |
|
120 | 120 | } |
121 | 121 | } |
122 | 122 | |
123 | 123 | protected function updateRecordSets(array &$sets) |
124 | 124 | { |
125 | - $sets[ 'record_status' ] = $this->recordStatus; |
|
126 | - $sets[ 'record_update_user' ] = $this->recordUser; |
|
125 | + $sets['record_status'] = $this->recordStatus; |
|
126 | + $sets['record_update_user'] = $this->recordUser; |
|
127 | 127 | |
128 | 128 | $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s'); |
129 | 129 | |
130 | - if ( ! isset($sets[ 'record_update_timestamp' ])) { |
|
131 | - $sets[ 'record_update_timestamp' ] = $timestamp; |
|
130 | + if ( ! isset($sets['record_update_timestamp'])) { |
|
131 | + $sets['record_update_timestamp'] = $timestamp; |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 |
@@ -30,7 +30,7 @@ |
||
30 | 30 | $referenceModel, |
31 | 31 | $foreignKey = null |
32 | 32 | ) { |
33 | - $this->currentModel =& $currentModel; |
|
33 | + $this->currentModel = & $currentModel; |
|
34 | 34 | $this->currentTable = $currentModel->table; |
35 | 35 | $this->currentPrimaryKey = $currentModel->primaryKey; |
36 | 36 |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $intermediaryReferenceForeignKey = null |
41 | 41 | ) { |
42 | 42 | |
43 | - $this->currentModel =& $currentModel; |
|
43 | + $this->currentModel = & $currentModel; |
|
44 | 44 | $this->currentTable = $currentModel->table; |
45 | 45 | $this->currentPrimaryKey = $currentModel->primaryKey; |
46 | 46 |
@@ -85,11 +85,11 @@ |
||
85 | 85 | $subNamespace |
86 | 86 | )) . '\\'; |
87 | 87 | |
88 | - $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m'); |
|
89 | - $vars[ 'NAMESPACE' ] = trim($classNamespace, '\\'); |
|
90 | - $vars[ 'PACKAGE' ] = '\\' . trim($classNamespace, '\\'); |
|
91 | - $vars[ 'CLASS' ] = $className; |
|
92 | - $vars[ 'FILEPATH' ] = $filePath; |
|
88 | + $vars['CREATE_DATETIME'] = date('d/m/Y H:m'); |
|
89 | + $vars['NAMESPACE'] = trim($classNamespace, '\\'); |
|
90 | + $vars['PACKAGE'] = '\\' . trim($classNamespace, '\\'); |
|
91 | + $vars['CLASS'] = $className; |
|
92 | + $vars['FILEPATH'] = $filePath; |
|
93 | 93 | |
94 | 94 | $phpTemplate = <<<PHPTEMPLATE |
95 | 95 | <?php |
@@ -85,11 +85,11 @@ |
||
85 | 85 | $subNamespace |
86 | 86 | )) . '\\'; |
87 | 87 | |
88 | - $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m'); |
|
89 | - $vars[ 'NAMESPACE' ] = trim($classNamespace, '\\'); |
|
90 | - $vars[ 'PACKAGE' ] = '\\' . trim($classNamespace, '\\'); |
|
91 | - $vars[ 'CLASS' ] = $className; |
|
92 | - $vars[ 'FILEPATH' ] = $filePath; |
|
88 | + $vars['CREATE_DATETIME'] = date('d/m/Y H:m'); |
|
89 | + $vars['NAMESPACE'] = trim($classNamespace, '\\'); |
|
90 | + $vars['PACKAGE'] = '\\' . trim($classNamespace, '\\'); |
|
91 | + $vars['CLASS'] = $className; |
|
92 | + $vars['FILEPATH'] = $filePath; |
|
93 | 93 | |
94 | 94 | $phpTemplate = <<<PHPTEMPLATE |
95 | 95 | <?php |
@@ -85,11 +85,11 @@ |
||
85 | 85 | $subNamespace |
86 | 86 | )) . '\\'; |
87 | 87 | |
88 | - $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m'); |
|
89 | - $vars[ 'NAMESPACE' ] = trim($classNamespace, '\\'); |
|
90 | - $vars[ 'PACKAGE' ] = '\\' . trim($classNamespace, '\\'); |
|
91 | - $vars[ 'CLASS' ] = $className; |
|
92 | - $vars[ 'FILEPATH' ] = $filePath; |
|
88 | + $vars['CREATE_DATETIME'] = date('d/m/Y H:m'); |
|
89 | + $vars['NAMESPACE'] = trim($classNamespace, '\\'); |
|
90 | + $vars['PACKAGE'] = '\\' . trim($classNamespace, '\\'); |
|
91 | + $vars['CLASS'] = $className; |
|
92 | + $vars['FILEPATH'] = $filePath; |
|
93 | 93 | |
94 | 94 | $phpTemplate = <<<PHPTEMPLATE |
95 | 95 | <?php |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | loader()->addNamespace($reflection->name, $subModelPath); |
157 | 157 | |
158 | 158 | foreach (glob($subModelPath . '*.php') as $filepath) { |
159 | - $this->validSubModels[ strtolower(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath; |
|
159 | + $this->validSubModels[strtolower(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath; |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | } |
@@ -183,24 +183,24 @@ discard block |
||
183 | 183 | |
184 | 184 | public function &__get($property) |
185 | 185 | { |
186 | - $get[ $property ] = false; |
|
186 | + $get[$property] = false; |
|
187 | 187 | |
188 | 188 | if (services()->has($property)) { |
189 | - $get[ $property ] = services()->get($property); |
|
189 | + $get[$property] = services()->get($property); |
|
190 | 190 | } elseif (array_key_exists($property, $this->validSubModels)) { |
191 | - $get[ $property ] = $this->loadSubModel($property); |
|
191 | + $get[$property] = $this->loadSubModel($property); |
|
192 | 192 | } elseif (o2system()->__isset($property)) { |
193 | - $get[ $property ] = o2system()->__get($property); |
|
193 | + $get[$property] = o2system()->__get($property); |
|
194 | 194 | } |
195 | 195 | |
196 | - return $get[ $property ]; |
|
196 | + return $get[$property]; |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | // ------------------------------------------------------------------------ |
200 | 200 | |
201 | 201 | final protected function loadSubModel($model) |
202 | 202 | { |
203 | - if (is_file($this->validSubModels[ $model ])) { |
|
203 | + if (is_file($this->validSubModels[$model])) { |
|
204 | 204 | $className = '\\' . get_called_class() . '\\' . ucfirst($model); |
205 | 205 | $className = str_replace('\Base\\Model', '\Models', $className); |
206 | 206 |