@@ -66,6 +66,13 @@ discard block |
||
66 | 66 | |
67 | 67 | private $mode; |
68 | 68 | |
69 | + /** |
|
70 | + * @param string $magicSql |
|
71 | + * @param string $magicSqlCount |
|
72 | + * @param WeakrefObjectStorage $objectStorage |
|
73 | + * @param string|null $className |
|
74 | + * @param integer $mode |
|
75 | + */ |
|
69 | 76 | public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode) |
70 | 77 | { |
71 | 78 | $this->magicSql = $magicSql; |
@@ -147,6 +154,7 @@ discard block |
||
147 | 154 | |
148 | 155 | /** |
149 | 156 | * @param int $offset |
157 | + * @param integer $limit |
|
150 | 158 | * |
151 | 159 | * @return PageIterator |
152 | 160 | */ |
@@ -30,239 +30,239 @@ |
||
30 | 30 | */ |
31 | 31 | class ResultIterator implements Result, \ArrayAccess, \JsonSerializable |
32 | 32 | { |
33 | - /** |
|
34 | - * @var Statement |
|
35 | - */ |
|
36 | - protected $statement; |
|
33 | + /** |
|
34 | + * @var Statement |
|
35 | + */ |
|
36 | + protected $statement; |
|
37 | 37 | |
38 | - protected $fetchStarted = false; |
|
39 | - private $objectStorage; |
|
40 | - private $className; |
|
38 | + protected $fetchStarted = false; |
|
39 | + private $objectStorage; |
|
40 | + private $className; |
|
41 | 41 | |
42 | - private $tdbmService; |
|
43 | - private $magicSql; |
|
44 | - private $magicSqlCount; |
|
45 | - private $parameters; |
|
46 | - private $columnDescriptors; |
|
47 | - private $magicQuery; |
|
42 | + private $tdbmService; |
|
43 | + private $magicSql; |
|
44 | + private $magicSqlCount; |
|
45 | + private $parameters; |
|
46 | + private $columnDescriptors; |
|
47 | + private $magicQuery; |
|
48 | 48 | |
49 | - /** |
|
50 | - * @var InnerResultIterator |
|
51 | - */ |
|
52 | - private $innerResultIterator; |
|
49 | + /** |
|
50 | + * @var InnerResultIterator |
|
51 | + */ |
|
52 | + private $innerResultIterator; |
|
53 | 53 | |
54 | - /** |
|
55 | - * The key of the current retrieved object. |
|
56 | - * |
|
57 | - * @var int |
|
58 | - */ |
|
59 | - protected $key = -1; |
|
54 | + /** |
|
55 | + * The key of the current retrieved object. |
|
56 | + * |
|
57 | + * @var int |
|
58 | + */ |
|
59 | + protected $key = -1; |
|
60 | 60 | |
61 | - protected $current = null; |
|
61 | + protected $current = null; |
|
62 | 62 | |
63 | - private $databasePlatform; |
|
63 | + private $databasePlatform; |
|
64 | 64 | |
65 | - private $totalCount; |
|
65 | + private $totalCount; |
|
66 | 66 | |
67 | - private $mode; |
|
67 | + private $mode; |
|
68 | 68 | |
69 | - public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode) |
|
70 | - { |
|
71 | - $this->magicSql = $magicSql; |
|
72 | - $this->magicSqlCount = $magicSqlCount; |
|
73 | - $this->objectStorage = $objectStorage; |
|
74 | - $this->className = $className; |
|
75 | - $this->tdbmService = $tdbmService; |
|
76 | - $this->parameters = $parameters; |
|
77 | - $this->columnDescriptors = $columnDescriptors; |
|
78 | - $this->magicQuery = $magicQuery; |
|
79 | - $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform(); |
|
80 | - $this->mode = $mode; |
|
81 | - } |
|
69 | + public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode) |
|
70 | + { |
|
71 | + $this->magicSql = $magicSql; |
|
72 | + $this->magicSqlCount = $magicSqlCount; |
|
73 | + $this->objectStorage = $objectStorage; |
|
74 | + $this->className = $className; |
|
75 | + $this->tdbmService = $tdbmService; |
|
76 | + $this->parameters = $parameters; |
|
77 | + $this->columnDescriptors = $columnDescriptors; |
|
78 | + $this->magicQuery = $magicQuery; |
|
79 | + $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform(); |
|
80 | + $this->mode = $mode; |
|
81 | + } |
|
82 | 82 | |
83 | - protected function executeCountQuery() |
|
84 | - { |
|
85 | - $sql = $this->magicQuery->build($this->magicSqlCount, $this->parameters); |
|
86 | - $this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters); |
|
87 | - } |
|
83 | + protected function executeCountQuery() |
|
84 | + { |
|
85 | + $sql = $this->magicQuery->build($this->magicSqlCount, $this->parameters); |
|
86 | + $this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters); |
|
87 | + } |
|
88 | 88 | |
89 | - /** |
|
90 | - * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings). |
|
91 | - * |
|
92 | - * @return int |
|
93 | - */ |
|
94 | - public function count() |
|
95 | - { |
|
96 | - if ($this->totalCount === null) { |
|
97 | - $this->executeCountQuery(); |
|
98 | - } |
|
89 | + /** |
|
90 | + * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings). |
|
91 | + * |
|
92 | + * @return int |
|
93 | + */ |
|
94 | + public function count() |
|
95 | + { |
|
96 | + if ($this->totalCount === null) { |
|
97 | + $this->executeCountQuery(); |
|
98 | + } |
|
99 | 99 | |
100 | - return $this->totalCount; |
|
101 | - } |
|
100 | + return $this->totalCount; |
|
101 | + } |
|
102 | 102 | |
103 | - /** |
|
104 | - * Casts the result set to a PHP array. |
|
105 | - * |
|
106 | - * @return array |
|
107 | - */ |
|
108 | - public function toArray() |
|
109 | - { |
|
110 | - return iterator_to_array($this->getIterator()); |
|
111 | - } |
|
103 | + /** |
|
104 | + * Casts the result set to a PHP array. |
|
105 | + * |
|
106 | + * @return array |
|
107 | + */ |
|
108 | + public function toArray() |
|
109 | + { |
|
110 | + return iterator_to_array($this->getIterator()); |
|
111 | + } |
|
112 | 112 | |
113 | - /** |
|
114 | - * Returns a new iterator mapping any call using the $callable function. |
|
115 | - * |
|
116 | - * @param callable $callable |
|
117 | - * |
|
118 | - * @return MapIterator |
|
119 | - */ |
|
120 | - public function map(callable $callable) |
|
121 | - { |
|
122 | - return new MapIterator($this->getIterator(), $callable); |
|
123 | - } |
|
113 | + /** |
|
114 | + * Returns a new iterator mapping any call using the $callable function. |
|
115 | + * |
|
116 | + * @param callable $callable |
|
117 | + * |
|
118 | + * @return MapIterator |
|
119 | + */ |
|
120 | + public function map(callable $callable) |
|
121 | + { |
|
122 | + return new MapIterator($this->getIterator(), $callable); |
|
123 | + } |
|
124 | 124 | |
125 | - /** |
|
126 | - * Retrieve an external iterator. |
|
127 | - * |
|
128 | - * @link http://php.net/manual/en/iteratoraggregate.getiterator.php |
|
129 | - * |
|
130 | - * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or |
|
131 | - * <b>Traversable</b> |
|
132 | - * |
|
133 | - * @since 5.0.0 |
|
134 | - */ |
|
135 | - public function getIterator() |
|
136 | - { |
|
137 | - if ($this->innerResultIterator === null) { |
|
138 | - if ($this->mode === TDBMService::MODE_CURSOR) { |
|
139 | - $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
140 | - } else { |
|
141 | - $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
142 | - } |
|
143 | - } |
|
125 | + /** |
|
126 | + * Retrieve an external iterator. |
|
127 | + * |
|
128 | + * @link http://php.net/manual/en/iteratoraggregate.getiterator.php |
|
129 | + * |
|
130 | + * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or |
|
131 | + * <b>Traversable</b> |
|
132 | + * |
|
133 | + * @since 5.0.0 |
|
134 | + */ |
|
135 | + public function getIterator() |
|
136 | + { |
|
137 | + if ($this->innerResultIterator === null) { |
|
138 | + if ($this->mode === TDBMService::MODE_CURSOR) { |
|
139 | + $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
140 | + } else { |
|
141 | + $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
142 | + } |
|
143 | + } |
|
144 | 144 | |
145 | - return $this->innerResultIterator; |
|
146 | - } |
|
145 | + return $this->innerResultIterator; |
|
146 | + } |
|
147 | 147 | |
148 | - /** |
|
149 | - * @param int $offset |
|
150 | - * |
|
151 | - * @return PageIterator |
|
152 | - */ |
|
153 | - public function take($offset, $limit) |
|
154 | - { |
|
155 | - return new PageIterator($this, $this->magicSql, $this->parameters, $limit, $offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode); |
|
156 | - } |
|
148 | + /** |
|
149 | + * @param int $offset |
|
150 | + * |
|
151 | + * @return PageIterator |
|
152 | + */ |
|
153 | + public function take($offset, $limit) |
|
154 | + { |
|
155 | + return new PageIterator($this, $this->magicSql, $this->parameters, $limit, $offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode); |
|
156 | + } |
|
157 | 157 | |
158 | - /** |
|
159 | - * Whether a offset exists. |
|
160 | - * |
|
161 | - * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
162 | - * |
|
163 | - * @param mixed $offset <p> |
|
164 | - * An offset to check for. |
|
165 | - * </p> |
|
166 | - * |
|
167 | - * @return bool true on success or false on failure. |
|
168 | - * </p> |
|
169 | - * <p> |
|
170 | - * The return value will be casted to boolean if non-boolean was returned. |
|
171 | - * |
|
172 | - * @since 5.0.0 |
|
173 | - */ |
|
174 | - public function offsetExists($offset) |
|
175 | - { |
|
176 | - return $this->getIterator()->offsetExists($offset); |
|
177 | - } |
|
158 | + /** |
|
159 | + * Whether a offset exists. |
|
160 | + * |
|
161 | + * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
162 | + * |
|
163 | + * @param mixed $offset <p> |
|
164 | + * An offset to check for. |
|
165 | + * </p> |
|
166 | + * |
|
167 | + * @return bool true on success or false on failure. |
|
168 | + * </p> |
|
169 | + * <p> |
|
170 | + * The return value will be casted to boolean if non-boolean was returned. |
|
171 | + * |
|
172 | + * @since 5.0.0 |
|
173 | + */ |
|
174 | + public function offsetExists($offset) |
|
175 | + { |
|
176 | + return $this->getIterator()->offsetExists($offset); |
|
177 | + } |
|
178 | 178 | |
179 | - /** |
|
180 | - * Offset to retrieve. |
|
181 | - * |
|
182 | - * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
183 | - * |
|
184 | - * @param mixed $offset <p> |
|
185 | - * The offset to retrieve. |
|
186 | - * </p> |
|
187 | - * |
|
188 | - * @return mixed Can return all value types. |
|
189 | - * |
|
190 | - * @since 5.0.0 |
|
191 | - */ |
|
192 | - public function offsetGet($offset) |
|
193 | - { |
|
194 | - return $this->getIterator()->offsetGet($offset); |
|
195 | - } |
|
179 | + /** |
|
180 | + * Offset to retrieve. |
|
181 | + * |
|
182 | + * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
183 | + * |
|
184 | + * @param mixed $offset <p> |
|
185 | + * The offset to retrieve. |
|
186 | + * </p> |
|
187 | + * |
|
188 | + * @return mixed Can return all value types. |
|
189 | + * |
|
190 | + * @since 5.0.0 |
|
191 | + */ |
|
192 | + public function offsetGet($offset) |
|
193 | + { |
|
194 | + return $this->getIterator()->offsetGet($offset); |
|
195 | + } |
|
196 | 196 | |
197 | - /** |
|
198 | - * Offset to set. |
|
199 | - * |
|
200 | - * @link http://php.net/manual/en/arrayaccess.offsetset.php |
|
201 | - * |
|
202 | - * @param mixed $offset <p> |
|
203 | - * The offset to assign the value to. |
|
204 | - * </p> |
|
205 | - * @param mixed $value <p> |
|
206 | - * The value to set. |
|
207 | - * </p> |
|
208 | - * |
|
209 | - * @since 5.0.0 |
|
210 | - */ |
|
211 | - public function offsetSet($offset, $value) |
|
212 | - { |
|
213 | - return $this->getIterator()->offsetSet($offset, $value); |
|
214 | - } |
|
197 | + /** |
|
198 | + * Offset to set. |
|
199 | + * |
|
200 | + * @link http://php.net/manual/en/arrayaccess.offsetset.php |
|
201 | + * |
|
202 | + * @param mixed $offset <p> |
|
203 | + * The offset to assign the value to. |
|
204 | + * </p> |
|
205 | + * @param mixed $value <p> |
|
206 | + * The value to set. |
|
207 | + * </p> |
|
208 | + * |
|
209 | + * @since 5.0.0 |
|
210 | + */ |
|
211 | + public function offsetSet($offset, $value) |
|
212 | + { |
|
213 | + return $this->getIterator()->offsetSet($offset, $value); |
|
214 | + } |
|
215 | 215 | |
216 | - /** |
|
217 | - * Offset to unset. |
|
218 | - * |
|
219 | - * @link http://php.net/manual/en/arrayaccess.offsetunset.php |
|
220 | - * |
|
221 | - * @param mixed $offset <p> |
|
222 | - * The offset to unset. |
|
223 | - * </p> |
|
224 | - * |
|
225 | - * @since 5.0.0 |
|
226 | - */ |
|
227 | - public function offsetUnset($offset) |
|
228 | - { |
|
229 | - return $this->getIterator()->offsetUnset($offset); |
|
230 | - } |
|
216 | + /** |
|
217 | + * Offset to unset. |
|
218 | + * |
|
219 | + * @link http://php.net/manual/en/arrayaccess.offsetunset.php |
|
220 | + * |
|
221 | + * @param mixed $offset <p> |
|
222 | + * The offset to unset. |
|
223 | + * </p> |
|
224 | + * |
|
225 | + * @since 5.0.0 |
|
226 | + */ |
|
227 | + public function offsetUnset($offset) |
|
228 | + { |
|
229 | + return $this->getIterator()->offsetUnset($offset); |
|
230 | + } |
|
231 | 231 | |
232 | - /** |
|
233 | - * Specify data which should be serialized to JSON. |
|
234 | - * |
|
235 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
236 | - * |
|
237 | - * @param bool $stopRecursion Parameter used internally by TDBM to |
|
238 | - * stop embedded objects from embedding |
|
239 | - * other objects. |
|
240 | - * |
|
241 | - * @return mixed data which can be serialized by <b>json_encode</b>, |
|
242 | - * which is a value of any type other than a resource. |
|
243 | - * |
|
244 | - * @since 5.4.0 |
|
245 | - */ |
|
246 | - public function jsonSerialize($stopRecursion = false) |
|
247 | - { |
|
248 | - return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) { |
|
249 | - return $item->jsonSerialize($stopRecursion); |
|
250 | - }, $this->toArray()); |
|
251 | - } |
|
232 | + /** |
|
233 | + * Specify data which should be serialized to JSON. |
|
234 | + * |
|
235 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
236 | + * |
|
237 | + * @param bool $stopRecursion Parameter used internally by TDBM to |
|
238 | + * stop embedded objects from embedding |
|
239 | + * other objects. |
|
240 | + * |
|
241 | + * @return mixed data which can be serialized by <b>json_encode</b>, |
|
242 | + * which is a value of any type other than a resource. |
|
243 | + * |
|
244 | + * @since 5.4.0 |
|
245 | + */ |
|
246 | + public function jsonSerialize($stopRecursion = false) |
|
247 | + { |
|
248 | + return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) { |
|
249 | + return $item->jsonSerialize($stopRecursion); |
|
250 | + }, $this->toArray()); |
|
251 | + } |
|
252 | 252 | |
253 | - /** |
|
254 | - * Returns only one value (the first) of the result set. |
|
255 | - * Returns null if no value exists. |
|
256 | - * |
|
257 | - * @return mixed|null |
|
258 | - */ |
|
259 | - public function first() |
|
260 | - { |
|
261 | - $page = $this->take(0, 1); |
|
262 | - foreach ($page as $bean) { |
|
263 | - return $bean; |
|
264 | - } |
|
253 | + /** |
|
254 | + * Returns only one value (the first) of the result set. |
|
255 | + * Returns null if no value exists. |
|
256 | + * |
|
257 | + * @return mixed|null |
|
258 | + */ |
|
259 | + public function first() |
|
260 | + { |
|
261 | + $page = $this->take(0, 1); |
|
262 | + foreach ($page as $bean) { |
|
263 | + return $bean; |
|
264 | + } |
|
265 | 265 | |
266 | - return; |
|
267 | - } |
|
266 | + return; |
|
267 | + } |
|
268 | 268 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | <input type="hidden" id="selfedit" name="selfedit" value="<?php echo plainstring_to_htmlprotected($this->selfedit) ?>" /> |
9 | 9 | |
10 | 10 | <?php if (!$this->autoloadDetected) { |
11 | - ?> |
|
11 | + ?> |
|
12 | 12 | <div class="alert">Warning! TDBM could not detect the autoload section of your composer.json file. |
13 | 13 | Unless you are developing your own autoload system, you should configure <strong>composer.json</strong> to <a href="http://getcomposer.org/doc/01-basic-usage.md#autoloading" target="_blank">define a source directory and a root namespace using PSR-0</a>.</div> |
14 | 14 | <?php |
@@ -31,117 +31,117 @@ |
||
31 | 31 | */ |
32 | 32 | class WeakrefObjectStorage |
33 | 33 | { |
34 | - /** |
|
35 | - * An array of fetched object, accessible via table name and primary key. |
|
36 | - * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
37 | - * |
|
38 | - * @var array<string, WeakMap<string, TDBMObject>> |
|
39 | - */ |
|
40 | - private $objects = array(); |
|
34 | + /** |
|
35 | + * An array of fetched object, accessible via table name and primary key. |
|
36 | + * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
37 | + * |
|
38 | + * @var array<string, WeakMap<string, TDBMObject>> |
|
39 | + */ |
|
40 | + private $objects = array(); |
|
41 | 41 | |
42 | - /** |
|
43 | - * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances |
|
44 | - * are removed if they are no more valid. |
|
45 | - * This is to avoid having memory used by dangling WeakRef instances. |
|
46 | - * |
|
47 | - * @var int |
|
48 | - */ |
|
49 | - private $garbageCollectorCount = 0; |
|
42 | + /** |
|
43 | + * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances |
|
44 | + * are removed if they are no more valid. |
|
45 | + * This is to avoid having memory used by dangling WeakRef instances. |
|
46 | + * |
|
47 | + * @var int |
|
48 | + */ |
|
49 | + private $garbageCollectorCount = 0; |
|
50 | 50 | |
51 | - /** |
|
52 | - * Sets an object in the storage. |
|
53 | - * |
|
54 | - * @param string $tableName |
|
55 | - * @param string $id |
|
56 | - * @param DbRow $dbRow |
|
57 | - */ |
|
58 | - public function set($tableName, $id, DbRow $dbRow) |
|
59 | - { |
|
60 | - $this->objects[$tableName][$id] = new \WeakRef($dbRow); |
|
61 | - ++$this->garbageCollectorCount; |
|
62 | - if ($this->garbageCollectorCount == 10000) { |
|
63 | - $this->garbageCollectorCount = 0; |
|
64 | - $this->cleanupDanglingWeakRefs(); |
|
65 | - } |
|
66 | - } |
|
51 | + /** |
|
52 | + * Sets an object in the storage. |
|
53 | + * |
|
54 | + * @param string $tableName |
|
55 | + * @param string $id |
|
56 | + * @param DbRow $dbRow |
|
57 | + */ |
|
58 | + public function set($tableName, $id, DbRow $dbRow) |
|
59 | + { |
|
60 | + $this->objects[$tableName][$id] = new \WeakRef($dbRow); |
|
61 | + ++$this->garbageCollectorCount; |
|
62 | + if ($this->garbageCollectorCount == 10000) { |
|
63 | + $this->garbageCollectorCount = 0; |
|
64 | + $this->cleanupDanglingWeakRefs(); |
|
65 | + } |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * Checks if an object is in the storage. |
|
70 | - * |
|
71 | - * @param string $tableName |
|
72 | - * @param string $id |
|
73 | - * |
|
74 | - * @return bool |
|
75 | - */ |
|
76 | - public function has($tableName, $id) |
|
77 | - { |
|
78 | - if (isset($this->objects[$tableName][$id])) { |
|
79 | - if ($this->objects[$tableName][$id]->valid()) { |
|
80 | - return true; |
|
81 | - } else { |
|
82 | - unset($this->objects[$tableName][$id]); |
|
83 | - } |
|
84 | - } |
|
68 | + /** |
|
69 | + * Checks if an object is in the storage. |
|
70 | + * |
|
71 | + * @param string $tableName |
|
72 | + * @param string $id |
|
73 | + * |
|
74 | + * @return bool |
|
75 | + */ |
|
76 | + public function has($tableName, $id) |
|
77 | + { |
|
78 | + if (isset($this->objects[$tableName][$id])) { |
|
79 | + if ($this->objects[$tableName][$id]->valid()) { |
|
80 | + return true; |
|
81 | + } else { |
|
82 | + unset($this->objects[$tableName][$id]); |
|
83 | + } |
|
84 | + } |
|
85 | 85 | |
86 | - return false; |
|
87 | - } |
|
86 | + return false; |
|
87 | + } |
|
88 | 88 | |
89 | - /** |
|
90 | - * Returns an object from the storage (or null if no object is set). |
|
91 | - * |
|
92 | - * @param string $tableName |
|
93 | - * @param string $id |
|
94 | - * |
|
95 | - * @return DbRow |
|
96 | - */ |
|
97 | - public function get($tableName, $id) |
|
98 | - { |
|
99 | - if (isset($this->objects[$tableName][$id])) { |
|
100 | - if ($this->objects[$tableName][$id]->valid()) { |
|
101 | - return $this->objects[$tableName][$id]->get(); |
|
102 | - } |
|
103 | - } else { |
|
104 | - return; |
|
105 | - } |
|
106 | - } |
|
89 | + /** |
|
90 | + * Returns an object from the storage (or null if no object is set). |
|
91 | + * |
|
92 | + * @param string $tableName |
|
93 | + * @param string $id |
|
94 | + * |
|
95 | + * @return DbRow |
|
96 | + */ |
|
97 | + public function get($tableName, $id) |
|
98 | + { |
|
99 | + if (isset($this->objects[$tableName][$id])) { |
|
100 | + if ($this->objects[$tableName][$id]->valid()) { |
|
101 | + return $this->objects[$tableName][$id]->get(); |
|
102 | + } |
|
103 | + } else { |
|
104 | + return; |
|
105 | + } |
|
106 | + } |
|
107 | 107 | |
108 | - /** |
|
109 | - * Removes an object from the storage. |
|
110 | - * |
|
111 | - * @param string $tableName |
|
112 | - * @param string $id |
|
113 | - */ |
|
114 | - public function remove($tableName, $id) |
|
115 | - { |
|
116 | - unset($this->objects[$tableName][$id]); |
|
117 | - } |
|
108 | + /** |
|
109 | + * Removes an object from the storage. |
|
110 | + * |
|
111 | + * @param string $tableName |
|
112 | + * @param string $id |
|
113 | + */ |
|
114 | + public function remove($tableName, $id) |
|
115 | + { |
|
116 | + unset($this->objects[$tableName][$id]); |
|
117 | + } |
|
118 | 118 | |
119 | - /** |
|
120 | - * Applies the callback to all objects. |
|
121 | - * |
|
122 | - * @param callable $callback |
|
123 | - */ |
|
124 | - public function apply(callable $callback) |
|
125 | - { |
|
126 | - foreach ($this->objects as $tableName => $table) { |
|
127 | - foreach ($table as $id => $obj) { |
|
128 | - if ($obj->valid()) { |
|
129 | - $callback($obj->get(), $tableName, $id); |
|
130 | - } else { |
|
131 | - unset($this->objects[$tableName][$id]); |
|
132 | - } |
|
133 | - } |
|
134 | - } |
|
135 | - } |
|
119 | + /** |
|
120 | + * Applies the callback to all objects. |
|
121 | + * |
|
122 | + * @param callable $callback |
|
123 | + */ |
|
124 | + public function apply(callable $callback) |
|
125 | + { |
|
126 | + foreach ($this->objects as $tableName => $table) { |
|
127 | + foreach ($table as $id => $obj) { |
|
128 | + if ($obj->valid()) { |
|
129 | + $callback($obj->get(), $tableName, $id); |
|
130 | + } else { |
|
131 | + unset($this->objects[$tableName][$id]); |
|
132 | + } |
|
133 | + } |
|
134 | + } |
|
135 | + } |
|
136 | 136 | |
137 | - private function cleanupDanglingWeakRefs() |
|
138 | - { |
|
139 | - foreach ($this->objects as $tableName => $table) { |
|
140 | - foreach ($table as $id => $obj) { |
|
141 | - if (!$obj->valid()) { |
|
142 | - unset($this->objects[$tableName][$id]); |
|
143 | - } |
|
144 | - } |
|
145 | - } |
|
146 | - } |
|
137 | + private function cleanupDanglingWeakRefs() |
|
138 | + { |
|
139 | + foreach ($this->objects as $tableName => $table) { |
|
140 | + foreach ($table as $id => $obj) { |
|
141 | + if (!$obj->valid()) { |
|
142 | + unset($this->objects[$tableName][$id]); |
|
143 | + } |
|
144 | + } |
|
145 | + } |
|
146 | + } |
|
147 | 147 | } |
@@ -27,100 +27,100 @@ |
||
27 | 27 | */ |
28 | 28 | class InnerResultArray extends InnerResultIterator |
29 | 29 | { |
30 | - /** |
|
31 | - * The list of results already fetched. |
|
32 | - * |
|
33 | - * @var AbstractTDBMObject[] |
|
34 | - */ |
|
35 | - private $results = []; |
|
30 | + /** |
|
31 | + * The list of results already fetched. |
|
32 | + * |
|
33 | + * @var AbstractTDBMObject[] |
|
34 | + */ |
|
35 | + private $results = []; |
|
36 | 36 | |
37 | - /** |
|
38 | - * Whether a offset exists. |
|
39 | - * |
|
40 | - * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
41 | - * |
|
42 | - * @param mixed $offset <p> |
|
43 | - * An offset to check for. |
|
44 | - * </p> |
|
45 | - * |
|
46 | - * @return bool true on success or false on failure. |
|
47 | - * </p> |
|
48 | - * <p> |
|
49 | - * The return value will be casted to boolean if non-boolean was returned. |
|
50 | - * |
|
51 | - * @since 5.0.0 |
|
52 | - */ |
|
53 | - public function offsetExists($offset) |
|
54 | - { |
|
55 | - try { |
|
56 | - $this->toIndex($offset); |
|
57 | - } catch (TDBMInvalidOffsetException $e) { |
|
58 | - return false; |
|
59 | - } |
|
37 | + /** |
|
38 | + * Whether a offset exists. |
|
39 | + * |
|
40 | + * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
41 | + * |
|
42 | + * @param mixed $offset <p> |
|
43 | + * An offset to check for. |
|
44 | + * </p> |
|
45 | + * |
|
46 | + * @return bool true on success or false on failure. |
|
47 | + * </p> |
|
48 | + * <p> |
|
49 | + * The return value will be casted to boolean if non-boolean was returned. |
|
50 | + * |
|
51 | + * @since 5.0.0 |
|
52 | + */ |
|
53 | + public function offsetExists($offset) |
|
54 | + { |
|
55 | + try { |
|
56 | + $this->toIndex($offset); |
|
57 | + } catch (TDBMInvalidOffsetException $e) { |
|
58 | + return false; |
|
59 | + } |
|
60 | 60 | |
61 | - return true; |
|
62 | - } |
|
61 | + return true; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * Offset to retrieve. |
|
66 | - * |
|
67 | - * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
68 | - * |
|
69 | - * @param mixed $offset <p> |
|
70 | - * The offset to retrieve. |
|
71 | - * </p> |
|
72 | - * |
|
73 | - * @return mixed Can return all value types. |
|
74 | - * |
|
75 | - * @since 5.0.0 |
|
76 | - */ |
|
77 | - public function offsetGet($offset) |
|
78 | - { |
|
79 | - $this->toIndex($offset); |
|
64 | + /** |
|
65 | + * Offset to retrieve. |
|
66 | + * |
|
67 | + * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
68 | + * |
|
69 | + * @param mixed $offset <p> |
|
70 | + * The offset to retrieve. |
|
71 | + * </p> |
|
72 | + * |
|
73 | + * @return mixed Can return all value types. |
|
74 | + * |
|
75 | + * @since 5.0.0 |
|
76 | + */ |
|
77 | + public function offsetGet($offset) |
|
78 | + { |
|
79 | + $this->toIndex($offset); |
|
80 | 80 | |
81 | - return $this->results[$offset]; |
|
82 | - } |
|
81 | + return $this->results[$offset]; |
|
82 | + } |
|
83 | 83 | |
84 | - private function toIndex($offset) |
|
85 | - { |
|
86 | - if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
87 | - throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.'); |
|
88 | - } |
|
89 | - if ($this->statement === null) { |
|
90 | - $this->executeQuery(); |
|
91 | - } |
|
92 | - while (!isset($this->results[$offset])) { |
|
93 | - $this->next(); |
|
94 | - if ($this->current === null) { |
|
95 | - throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.'); |
|
96 | - } |
|
97 | - } |
|
98 | - } |
|
84 | + private function toIndex($offset) |
|
85 | + { |
|
86 | + if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
87 | + throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.'); |
|
88 | + } |
|
89 | + if ($this->statement === null) { |
|
90 | + $this->executeQuery(); |
|
91 | + } |
|
92 | + while (!isset($this->results[$offset])) { |
|
93 | + $this->next(); |
|
94 | + if ($this->current === null) { |
|
95 | + throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.'); |
|
96 | + } |
|
97 | + } |
|
98 | + } |
|
99 | 99 | |
100 | - public function next() |
|
101 | - { |
|
102 | - // Let's overload the next() method to store the result. |
|
103 | - if (isset($this->results[$this->key + 1])) { |
|
104 | - ++$this->key; |
|
105 | - $this->current = $this->results[$this->key]; |
|
106 | - } else { |
|
107 | - parent::next(); |
|
108 | - if ($this->current !== null) { |
|
109 | - $this->results[$this->key] = $this->current; |
|
110 | - } |
|
111 | - } |
|
112 | - } |
|
100 | + public function next() |
|
101 | + { |
|
102 | + // Let's overload the next() method to store the result. |
|
103 | + if (isset($this->results[$this->key + 1])) { |
|
104 | + ++$this->key; |
|
105 | + $this->current = $this->results[$this->key]; |
|
106 | + } else { |
|
107 | + parent::next(); |
|
108 | + if ($this->current !== null) { |
|
109 | + $this->results[$this->key] = $this->current; |
|
110 | + } |
|
111 | + } |
|
112 | + } |
|
113 | 113 | |
114 | - /** |
|
115 | - * Overloads the rewind implementation. |
|
116 | - * Do not reexecute the query. |
|
117 | - */ |
|
118 | - public function rewind() |
|
119 | - { |
|
120 | - if (!$this->fetchStarted) { |
|
121 | - $this->executeQuery(); |
|
122 | - } |
|
123 | - $this->key = -1; |
|
124 | - $this->next(); |
|
125 | - } |
|
114 | + /** |
|
115 | + * Overloads the rewind implementation. |
|
116 | + * Do not reexecute the query. |
|
117 | + */ |
|
118 | + public function rewind() |
|
119 | + { |
|
120 | + if (!$this->fetchStarted) { |
|
121 | + $this->executeQuery(); |
|
122 | + } |
|
123 | + $this->key = -1; |
|
124 | + $this->next(); |
|
125 | + } |
|
126 | 126 | } |
@@ -27,10 +27,10 @@ |
||
27 | 27 | */ |
28 | 28 | final class TDBMObjectStateEnum extends AbstractTDBMObject |
29 | 29 | { |
30 | - const STATE_DETACHED = 'detached'; |
|
31 | - const STATE_NEW = 'new'; |
|
32 | - const STATE_NOT_LOADED = 'not loaded'; |
|
33 | - const STATE_LOADED = 'loaded'; |
|
34 | - const STATE_DIRTY = 'dirty'; |
|
35 | - const STATE_DELETED = 'deleted'; |
|
30 | + const STATE_DETACHED = 'detached'; |
|
31 | + const STATE_NEW = 'new'; |
|
32 | + const STATE_NOT_LOADED = 'not loaded'; |
|
33 | + const STATE_LOADED = 'loaded'; |
|
34 | + const STATE_DIRTY = 'dirty'; |
|
35 | + const STATE_DELETED = 'deleted'; |
|
36 | 36 | } |
@@ -30,78 +30,78 @@ |
||
30 | 30 | */ |
31 | 31 | class StandardObjectStorage |
32 | 32 | { |
33 | - /** |
|
34 | - * An array of fetched object, accessible via table name and primary key. |
|
35 | - * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
36 | - * |
|
37 | - * @var array<string, array<string, TDBMObject>> |
|
38 | - */ |
|
39 | - private $objects = array(); |
|
33 | + /** |
|
34 | + * An array of fetched object, accessible via table name and primary key. |
|
35 | + * If the primary key is split on several columns, access is done by an array of columns, serialized. |
|
36 | + * |
|
37 | + * @var array<string, array<string, TDBMObject>> |
|
38 | + */ |
|
39 | + private $objects = array(); |
|
40 | 40 | |
41 | - /** |
|
42 | - * Sets an object in the storage. |
|
43 | - * |
|
44 | - * @param string $tableName |
|
45 | - * @param string $id |
|
46 | - * @param TDBMObject $dbRow |
|
47 | - */ |
|
48 | - public function set($tableName, $id, DbRow $dbRow) |
|
49 | - { |
|
50 | - $this->objects[$tableName][$id] = $dbRow; |
|
51 | - } |
|
41 | + /** |
|
42 | + * Sets an object in the storage. |
|
43 | + * |
|
44 | + * @param string $tableName |
|
45 | + * @param string $id |
|
46 | + * @param TDBMObject $dbRow |
|
47 | + */ |
|
48 | + public function set($tableName, $id, DbRow $dbRow) |
|
49 | + { |
|
50 | + $this->objects[$tableName][$id] = $dbRow; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * Checks if an object is in the storage. |
|
55 | - * |
|
56 | - * @param string $tableName |
|
57 | - * @param string $id |
|
58 | - * |
|
59 | - * @return bool |
|
60 | - */ |
|
61 | - public function has($tableName, $id) |
|
62 | - { |
|
63 | - return isset($this->objects[$tableName][$id]); |
|
64 | - } |
|
53 | + /** |
|
54 | + * Checks if an object is in the storage. |
|
55 | + * |
|
56 | + * @param string $tableName |
|
57 | + * @param string $id |
|
58 | + * |
|
59 | + * @return bool |
|
60 | + */ |
|
61 | + public function has($tableName, $id) |
|
62 | + { |
|
63 | + return isset($this->objects[$tableName][$id]); |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Returns an object from the storage (or null if no object is set). |
|
68 | - * |
|
69 | - * @param string $tableName |
|
70 | - * @param string $id |
|
71 | - * |
|
72 | - * @return DbRow |
|
73 | - */ |
|
74 | - public function get($tableName, $id) |
|
75 | - { |
|
76 | - if (isset($this->objects[$tableName][$id])) { |
|
77 | - return $this->objects[$tableName][$id]; |
|
78 | - } else { |
|
79 | - return; |
|
80 | - } |
|
81 | - } |
|
66 | + /** |
|
67 | + * Returns an object from the storage (or null if no object is set). |
|
68 | + * |
|
69 | + * @param string $tableName |
|
70 | + * @param string $id |
|
71 | + * |
|
72 | + * @return DbRow |
|
73 | + */ |
|
74 | + public function get($tableName, $id) |
|
75 | + { |
|
76 | + if (isset($this->objects[$tableName][$id])) { |
|
77 | + return $this->objects[$tableName][$id]; |
|
78 | + } else { |
|
79 | + return; |
|
80 | + } |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * Removes an object from the storage. |
|
85 | - * |
|
86 | - * @param string $tableName |
|
87 | - * @param string $id |
|
88 | - */ |
|
89 | - public function remove($tableName, $id) |
|
90 | - { |
|
91 | - unset($this->objects[$tableName][$id]); |
|
92 | - } |
|
83 | + /** |
|
84 | + * Removes an object from the storage. |
|
85 | + * |
|
86 | + * @param string $tableName |
|
87 | + * @param string $id |
|
88 | + */ |
|
89 | + public function remove($tableName, $id) |
|
90 | + { |
|
91 | + unset($this->objects[$tableName][$id]); |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * Applies the callback to all objects. |
|
96 | - * |
|
97 | - * @param callable $callback |
|
98 | - */ |
|
99 | - public function apply(callable $callback) |
|
100 | - { |
|
101 | - foreach ($this->objects as $tableName => $table) { |
|
102 | - foreach ($table as $id => $obj) { |
|
103 | - $callback($obj, $tableName, $id); |
|
104 | - } |
|
105 | - } |
|
106 | - } |
|
94 | + /** |
|
95 | + * Applies the callback to all objects. |
|
96 | + * |
|
97 | + * @param callable $callback |
|
98 | + */ |
|
99 | + public function apply(callable $callback) |
|
100 | + { |
|
101 | + foreach ($this->objects as $tableName => $table) { |
|
102 | + foreach ($table as $id => $obj) { |
|
103 | + $callback($obj, $tableName, $id); |
|
104 | + } |
|
105 | + } |
|
106 | + } |
|
107 | 107 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | <input type="hidden" id="selfedit" name="selfedit" value="<?php echo plainstring_to_htmlprotected($this->selfedit) ?>" /> |
9 | 9 | |
10 | 10 | <?php if (!$this->autoloadDetected) { |
11 | - ?> |
|
11 | + ?> |
|
12 | 12 | <div class="alert">Warning! TDBM could not detect the autoload section of your composer.json file. |
13 | 13 | Unless you are developing your own autoload system, you should configure <strong>composer.json</strong> to <a href="http://getcomposer.org/doc/01-basic-usage.md#autoloading" target="_blank">define a source directory and a root namespace using PSR-0</a>.</div> |
14 | 14 | <?php |
@@ -181,6 +181,9 @@ |
||
181 | 181 | |
182 | 182 | protected $errorMsg; |
183 | 183 | |
184 | + /** |
|
185 | + * @param string $msg |
|
186 | + */ |
|
184 | 187 | private function displayErrorMsg($msg) |
185 | 188 | { |
186 | 189 | $this->errorMsg = $msg; |
@@ -15,168 +15,168 @@ |
||
15 | 15 | */ |
16 | 16 | class TdbmInstallController extends Controller |
17 | 17 | { |
18 | - /** |
|
19 | - * @var HtmlBlock |
|
20 | - */ |
|
21 | - public $content; |
|
22 | - |
|
23 | - public $selfedit; |
|
24 | - |
|
25 | - /** |
|
26 | - * The active MoufManager to be edited/viewed. |
|
27 | - * |
|
28 | - * @var MoufManager |
|
29 | - */ |
|
30 | - public $moufManager; |
|
31 | - |
|
32 | - /** |
|
33 | - * The template used by the main page for mouf. |
|
34 | - * |
|
35 | - * @Property |
|
36 | - * @Compulsory |
|
37 | - * |
|
38 | - * @var TemplateInterface |
|
39 | - */ |
|
40 | - public $template; |
|
41 | - |
|
42 | - /** |
|
43 | - * Displays the first install screen. |
|
44 | - * |
|
45 | - * @Action |
|
46 | - * @Logged |
|
47 | - * |
|
48 | - * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only) |
|
49 | - */ |
|
50 | - public function defaultAction($selfedit = 'false') |
|
51 | - { |
|
52 | - $this->selfedit = $selfedit; |
|
53 | - |
|
54 | - if ($selfedit == 'true') { |
|
55 | - $this->moufManager = MoufManager::getMoufManager(); |
|
56 | - } else { |
|
57 | - $this->moufManager = MoufManager::getMoufManagerHiddenInstance(); |
|
58 | - } |
|
59 | - |
|
60 | - $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this); |
|
61 | - $this->template->toHtml(); |
|
62 | - } |
|
63 | - |
|
64 | - /** |
|
65 | - * Skips the install process. |
|
66 | - * |
|
67 | - * @Action |
|
68 | - * @Logged |
|
69 | - * |
|
70 | - * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only) |
|
71 | - */ |
|
72 | - public function skip($selfedit = 'false') |
|
73 | - { |
|
74 | - InstallUtils::continueInstall($selfedit == 'true'); |
|
75 | - } |
|
76 | - |
|
77 | - protected $daoNamespace; |
|
78 | - protected $beanNamespace; |
|
79 | - protected $autoloadDetected; |
|
80 | - protected $storeInUtc; |
|
81 | - protected $useCustomComposer = false; |
|
82 | - |
|
83 | - /** |
|
84 | - * Displays the second install screen. |
|
85 | - * |
|
86 | - * @Action |
|
87 | - * @Logged |
|
88 | - * |
|
89 | - * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only) |
|
90 | - */ |
|
91 | - public function configure($selfedit = 'false') |
|
92 | - { |
|
93 | - $this->selfedit = $selfedit; |
|
94 | - |
|
95 | - if ($selfedit == 'true') { |
|
96 | - $this->moufManager = MoufManager::getMoufManager(); |
|
97 | - } else { |
|
98 | - $this->moufManager = MoufManager::getMoufManagerHiddenInstance(); |
|
99 | - } |
|
100 | - |
|
101 | - // Let's start by performing basic checks about the instances we assume to exist. |
|
102 | - if (!$this->moufManager->instanceExists('dbalConnection')) { |
|
103 | - $this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance."); |
|
104 | - |
|
105 | - return; |
|
106 | - } |
|
107 | - |
|
108 | - $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService'); |
|
109 | - $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService'); |
|
110 | - |
|
111 | - if ($this->daoNamespace == null && $this->beanNamespace == null) { |
|
112 | - $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
113 | - |
|
114 | - $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
|
115 | - if ($autoloadNamespaces) { |
|
116 | - $this->autoloadDetected = true; |
|
117 | - $rootNamespace = $autoloadNamespaces[0]; |
|
118 | - $this->daoNamespace = $rootNamespace.'Model\\Dao'; |
|
119 | - $this->beanNamespace = $rootNamespace.'Model\\Bean'; |
|
120 | - } else { |
|
121 | - $this->autoloadDetected = false; |
|
122 | - $this->daoNamespace = 'YourApplication\\Model\\Dao'; |
|
123 | - $this->beanNamespace = 'YourApplication\\Model\\Bean'; |
|
124 | - } |
|
125 | - } else { |
|
126 | - $this->autoloadDetected = true; |
|
127 | - } |
|
128 | - $this->defaultPath = true; |
|
129 | - $this->storePath = ''; |
|
130 | - |
|
131 | - $this->castDatesToDateTime = true; |
|
132 | - |
|
133 | - $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep2.php', $this); |
|
134 | - $this->template->toHtml(); |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * This action generates the TDBM instance, then the DAOs and Beans. |
|
139 | - * |
|
140 | - * @Action |
|
141 | - * |
|
142 | - * @param string $daonamespace |
|
143 | - * @param string $beannamespace |
|
144 | - * @param int $storeInUtc |
|
145 | - * @param string $selfedit |
|
146 | - * |
|
147 | - * @throws \Mouf\MoufException |
|
148 | - */ |
|
149 | - public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = 'false', $defaultPath = false, $storePath = '') |
|
150 | - { |
|
151 | - $this->selfedit = $selfedit; |
|
152 | - |
|
153 | - if ($selfedit == 'true') { |
|
154 | - $this->moufManager = MoufManager::getMoufManager(); |
|
155 | - } else { |
|
156 | - $this->moufManager = MoufManager::getMoufManagerHiddenInstance(); |
|
157 | - } |
|
158 | - |
|
159 | - $doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache'); |
|
160 | - |
|
161 | - if (!$this->moufManager->instanceExists('tdbmService')) { |
|
162 | - $tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService'); |
|
163 | - $tdbmService->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection')); |
|
164 | - $tdbmService->getConstructorArgumentProperty('cache')->setValue($doctrineCache); |
|
165 | - } |
|
166 | - |
|
167 | - $this->moufManager->rewriteMouf(); |
|
168 | - |
|
169 | - TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'DaoFactory', 'daoFactory', $selfedit, $storeInUtc, $defaultPath, $storePath); |
|
170 | - |
|
171 | - InstallUtils::continueInstall($selfedit == 'true'); |
|
172 | - } |
|
173 | - |
|
174 | - protected $errorMsg; |
|
175 | - |
|
176 | - private function displayErrorMsg($msg) |
|
177 | - { |
|
178 | - $this->errorMsg = $msg; |
|
179 | - $this->content->addFile(dirname(__FILE__).'/../../../../views/installError.php', $this); |
|
180 | - $this->template->toHtml(); |
|
181 | - } |
|
18 | + /** |
|
19 | + * @var HtmlBlock |
|
20 | + */ |
|
21 | + public $content; |
|
22 | + |
|
23 | + public $selfedit; |
|
24 | + |
|
25 | + /** |
|
26 | + * The active MoufManager to be edited/viewed. |
|
27 | + * |
|
28 | + * @var MoufManager |
|
29 | + */ |
|
30 | + public $moufManager; |
|
31 | + |
|
32 | + /** |
|
33 | + * The template used by the main page for mouf. |
|
34 | + * |
|
35 | + * @Property |
|
36 | + * @Compulsory |
|
37 | + * |
|
38 | + * @var TemplateInterface |
|
39 | + */ |
|
40 | + public $template; |
|
41 | + |
|
42 | + /** |
|
43 | + * Displays the first install screen. |
|
44 | + * |
|
45 | + * @Action |
|
46 | + * @Logged |
|
47 | + * |
|
48 | + * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only) |
|
49 | + */ |
|
50 | + public function defaultAction($selfedit = 'false') |
|
51 | + { |
|
52 | + $this->selfedit = $selfedit; |
|
53 | + |
|
54 | + if ($selfedit == 'true') { |
|
55 | + $this->moufManager = MoufManager::getMoufManager(); |
|
56 | + } else { |
|
57 | + $this->moufManager = MoufManager::getMoufManagerHiddenInstance(); |
|
58 | + } |
|
59 | + |
|
60 | + $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this); |
|
61 | + $this->template->toHtml(); |
|
62 | + } |
|
63 | + |
|
64 | + /** |
|
65 | + * Skips the install process. |
|
66 | + * |
|
67 | + * @Action |
|
68 | + * @Logged |
|
69 | + * |
|
70 | + * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only) |
|
71 | + */ |
|
72 | + public function skip($selfedit = 'false') |
|
73 | + { |
|
74 | + InstallUtils::continueInstall($selfedit == 'true'); |
|
75 | + } |
|
76 | + |
|
77 | + protected $daoNamespace; |
|
78 | + protected $beanNamespace; |
|
79 | + protected $autoloadDetected; |
|
80 | + protected $storeInUtc; |
|
81 | + protected $useCustomComposer = false; |
|
82 | + |
|
83 | + /** |
|
84 | + * Displays the second install screen. |
|
85 | + * |
|
86 | + * @Action |
|
87 | + * @Logged |
|
88 | + * |
|
89 | + * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only) |
|
90 | + */ |
|
91 | + public function configure($selfedit = 'false') |
|
92 | + { |
|
93 | + $this->selfedit = $selfedit; |
|
94 | + |
|
95 | + if ($selfedit == 'true') { |
|
96 | + $this->moufManager = MoufManager::getMoufManager(); |
|
97 | + } else { |
|
98 | + $this->moufManager = MoufManager::getMoufManagerHiddenInstance(); |
|
99 | + } |
|
100 | + |
|
101 | + // Let's start by performing basic checks about the instances we assume to exist. |
|
102 | + if (!$this->moufManager->instanceExists('dbalConnection')) { |
|
103 | + $this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance."); |
|
104 | + |
|
105 | + return; |
|
106 | + } |
|
107 | + |
|
108 | + $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService'); |
|
109 | + $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService'); |
|
110 | + |
|
111 | + if ($this->daoNamespace == null && $this->beanNamespace == null) { |
|
112 | + $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
113 | + |
|
114 | + $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
|
115 | + if ($autoloadNamespaces) { |
|
116 | + $this->autoloadDetected = true; |
|
117 | + $rootNamespace = $autoloadNamespaces[0]; |
|
118 | + $this->daoNamespace = $rootNamespace.'Model\\Dao'; |
|
119 | + $this->beanNamespace = $rootNamespace.'Model\\Bean'; |
|
120 | + } else { |
|
121 | + $this->autoloadDetected = false; |
|
122 | + $this->daoNamespace = 'YourApplication\\Model\\Dao'; |
|
123 | + $this->beanNamespace = 'YourApplication\\Model\\Bean'; |
|
124 | + } |
|
125 | + } else { |
|
126 | + $this->autoloadDetected = true; |
|
127 | + } |
|
128 | + $this->defaultPath = true; |
|
129 | + $this->storePath = ''; |
|
130 | + |
|
131 | + $this->castDatesToDateTime = true; |
|
132 | + |
|
133 | + $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep2.php', $this); |
|
134 | + $this->template->toHtml(); |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * This action generates the TDBM instance, then the DAOs and Beans. |
|
139 | + * |
|
140 | + * @Action |
|
141 | + * |
|
142 | + * @param string $daonamespace |
|
143 | + * @param string $beannamespace |
|
144 | + * @param int $storeInUtc |
|
145 | + * @param string $selfedit |
|
146 | + * |
|
147 | + * @throws \Mouf\MoufException |
|
148 | + */ |
|
149 | + public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = 'false', $defaultPath = false, $storePath = '') |
|
150 | + { |
|
151 | + $this->selfedit = $selfedit; |
|
152 | + |
|
153 | + if ($selfedit == 'true') { |
|
154 | + $this->moufManager = MoufManager::getMoufManager(); |
|
155 | + } else { |
|
156 | + $this->moufManager = MoufManager::getMoufManagerHiddenInstance(); |
|
157 | + } |
|
158 | + |
|
159 | + $doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache'); |
|
160 | + |
|
161 | + if (!$this->moufManager->instanceExists('tdbmService')) { |
|
162 | + $tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService'); |
|
163 | + $tdbmService->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection')); |
|
164 | + $tdbmService->getConstructorArgumentProperty('cache')->setValue($doctrineCache); |
|
165 | + } |
|
166 | + |
|
167 | + $this->moufManager->rewriteMouf(); |
|
168 | + |
|
169 | + TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'DaoFactory', 'daoFactory', $selfedit, $storeInUtc, $defaultPath, $storePath); |
|
170 | + |
|
171 | + InstallUtils::continueInstall($selfedit == 'true'); |
|
172 | + } |
|
173 | + |
|
174 | + protected $errorMsg; |
|
175 | + |
|
176 | + private function displayErrorMsg($msg) |
|
177 | + { |
|
178 | + $this->errorMsg = $msg; |
|
179 | + $this->content->addFile(dirname(__FILE__).'/../../../../views/installError.php', $this); |
|
180 | + $this->template->toHtml(); |
|
181 | + } |
|
182 | 182 | } |
@@ -29,232 +29,232 @@ |
||
29 | 29 | */ |
30 | 30 | class PageIterator implements Page, \ArrayAccess, \JsonSerializable |
31 | 31 | { |
32 | - /** |
|
33 | - * @var Statement |
|
34 | - */ |
|
35 | - protected $statement; |
|
32 | + /** |
|
33 | + * @var Statement |
|
34 | + */ |
|
35 | + protected $statement; |
|
36 | 36 | |
37 | - protected $fetchStarted = false; |
|
38 | - private $objectStorage; |
|
39 | - private $className; |
|
37 | + protected $fetchStarted = false; |
|
38 | + private $objectStorage; |
|
39 | + private $className; |
|
40 | 40 | |
41 | - private $parentResult; |
|
42 | - private $tdbmService; |
|
43 | - private $magicSql; |
|
44 | - private $parameters; |
|
45 | - private $limit; |
|
46 | - private $offset; |
|
47 | - private $columnDescriptors; |
|
48 | - private $magicQuery; |
|
41 | + private $parentResult; |
|
42 | + private $tdbmService; |
|
43 | + private $magicSql; |
|
44 | + private $parameters; |
|
45 | + private $limit; |
|
46 | + private $offset; |
|
47 | + private $columnDescriptors; |
|
48 | + private $magicQuery; |
|
49 | 49 | |
50 | - /** |
|
51 | - * The key of the current retrieved object. |
|
52 | - * |
|
53 | - * @var int |
|
54 | - */ |
|
55 | - protected $key = -1; |
|
50 | + /** |
|
51 | + * The key of the current retrieved object. |
|
52 | + * |
|
53 | + * @var int |
|
54 | + */ |
|
55 | + protected $key = -1; |
|
56 | 56 | |
57 | - protected $current = null; |
|
57 | + protected $current = null; |
|
58 | 58 | |
59 | - private $databasePlatform; |
|
59 | + private $databasePlatform; |
|
60 | 60 | |
61 | - private $innerResultIterator; |
|
61 | + private $innerResultIterator; |
|
62 | 62 | |
63 | - private $mode; |
|
63 | + private $mode; |
|
64 | 64 | |
65 | - public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode) |
|
66 | - { |
|
67 | - $this->parentResult = $parentResult; |
|
68 | - $this->magicSql = $magicSql; |
|
69 | - $this->objectStorage = $objectStorage; |
|
70 | - $this->className = $className; |
|
71 | - $this->tdbmService = $tdbmService; |
|
72 | - $this->parameters = $parameters; |
|
73 | - $this->limit = $limit; |
|
74 | - $this->offset = $offset; |
|
75 | - $this->columnDescriptors = $columnDescriptors; |
|
76 | - $this->magicQuery = $magicQuery; |
|
77 | - $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform(); |
|
78 | - $this->mode = $mode; |
|
79 | - } |
|
65 | + public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode) |
|
66 | + { |
|
67 | + $this->parentResult = $parentResult; |
|
68 | + $this->magicSql = $magicSql; |
|
69 | + $this->objectStorage = $objectStorage; |
|
70 | + $this->className = $className; |
|
71 | + $this->tdbmService = $tdbmService; |
|
72 | + $this->parameters = $parameters; |
|
73 | + $this->limit = $limit; |
|
74 | + $this->offset = $offset; |
|
75 | + $this->columnDescriptors = $columnDescriptors; |
|
76 | + $this->magicQuery = $magicQuery; |
|
77 | + $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform(); |
|
78 | + $this->mode = $mode; |
|
79 | + } |
|
80 | 80 | |
81 | - /** |
|
82 | - * Retrieve an external iterator. |
|
83 | - * |
|
84 | - * @link http://php.net/manual/en/iteratoraggregate.getiterator.php |
|
85 | - * |
|
86 | - * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or |
|
87 | - * <b>Traversable</b> |
|
88 | - * |
|
89 | - * @since 5.0.0 |
|
90 | - */ |
|
91 | - public function getIterator() |
|
92 | - { |
|
93 | - if ($this->innerResultIterator === null) { |
|
94 | - if ($this->mode === TDBMService::MODE_CURSOR) { |
|
95 | - $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
96 | - } else { |
|
97 | - $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
98 | - } |
|
99 | - } |
|
81 | + /** |
|
82 | + * Retrieve an external iterator. |
|
83 | + * |
|
84 | + * @link http://php.net/manual/en/iteratoraggregate.getiterator.php |
|
85 | + * |
|
86 | + * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or |
|
87 | + * <b>Traversable</b> |
|
88 | + * |
|
89 | + * @since 5.0.0 |
|
90 | + */ |
|
91 | + public function getIterator() |
|
92 | + { |
|
93 | + if ($this->innerResultIterator === null) { |
|
94 | + if ($this->mode === TDBMService::MODE_CURSOR) { |
|
95 | + $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
96 | + } else { |
|
97 | + $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery); |
|
98 | + } |
|
99 | + } |
|
100 | 100 | |
101 | - return $this->innerResultIterator; |
|
102 | - } |
|
101 | + return $this->innerResultIterator; |
|
102 | + } |
|
103 | 103 | |
104 | - /** |
|
105 | - * @return int |
|
106 | - */ |
|
107 | - public function getCurrentOffset() |
|
108 | - { |
|
109 | - return $this->offset; |
|
110 | - } |
|
104 | + /** |
|
105 | + * @return int |
|
106 | + */ |
|
107 | + public function getCurrentOffset() |
|
108 | + { |
|
109 | + return $this->offset; |
|
110 | + } |
|
111 | 111 | |
112 | - /** |
|
113 | - * @return int |
|
114 | - */ |
|
115 | - public function getCurrentPage() |
|
116 | - { |
|
117 | - return floor($this->offset / $this->limit) + 1; |
|
118 | - } |
|
112 | + /** |
|
113 | + * @return int |
|
114 | + */ |
|
115 | + public function getCurrentPage() |
|
116 | + { |
|
117 | + return floor($this->offset / $this->limit) + 1; |
|
118 | + } |
|
119 | 119 | |
120 | - /** |
|
121 | - * @return int |
|
122 | - */ |
|
123 | - public function getCurrentLimit() |
|
124 | - { |
|
125 | - return $this->limit; |
|
126 | - } |
|
120 | + /** |
|
121 | + * @return int |
|
122 | + */ |
|
123 | + public function getCurrentLimit() |
|
124 | + { |
|
125 | + return $this->limit; |
|
126 | + } |
|
127 | 127 | |
128 | - /** |
|
129 | - * Return the number of results on the current page of the {@link Result}. |
|
130 | - * |
|
131 | - * @return int |
|
132 | - */ |
|
133 | - public function count() |
|
134 | - { |
|
135 | - return $this->getIterator()->count(); |
|
136 | - } |
|
128 | + /** |
|
129 | + * Return the number of results on the current page of the {@link Result}. |
|
130 | + * |
|
131 | + * @return int |
|
132 | + */ |
|
133 | + public function count() |
|
134 | + { |
|
135 | + return $this->getIterator()->count(); |
|
136 | + } |
|
137 | 137 | |
138 | - /** |
|
139 | - * Return the number of ALL results in the paginatable of {@link Result}. |
|
140 | - * |
|
141 | - * @return int |
|
142 | - */ |
|
143 | - public function totalCount() |
|
144 | - { |
|
145 | - return $this->parentResult->count(); |
|
146 | - } |
|
138 | + /** |
|
139 | + * Return the number of ALL results in the paginatable of {@link Result}. |
|
140 | + * |
|
141 | + * @return int |
|
142 | + */ |
|
143 | + public function totalCount() |
|
144 | + { |
|
145 | + return $this->parentResult->count(); |
|
146 | + } |
|
147 | 147 | |
148 | - /** |
|
149 | - * Casts the result set to a PHP array. |
|
150 | - * |
|
151 | - * @return array |
|
152 | - */ |
|
153 | - public function toArray() |
|
154 | - { |
|
155 | - return iterator_to_array($this->getIterator()); |
|
156 | - } |
|
148 | + /** |
|
149 | + * Casts the result set to a PHP array. |
|
150 | + * |
|
151 | + * @return array |
|
152 | + */ |
|
153 | + public function toArray() |
|
154 | + { |
|
155 | + return iterator_to_array($this->getIterator()); |
|
156 | + } |
|
157 | 157 | |
158 | - /** |
|
159 | - * Returns a new iterator mapping any call using the $callable function. |
|
160 | - * |
|
161 | - * @param callable $callable |
|
162 | - * |
|
163 | - * @return MapIterator |
|
164 | - */ |
|
165 | - public function map(callable $callable) |
|
166 | - { |
|
167 | - return new MapIterator($this->getIterator(), $callable); |
|
168 | - } |
|
158 | + /** |
|
159 | + * Returns a new iterator mapping any call using the $callable function. |
|
160 | + * |
|
161 | + * @param callable $callable |
|
162 | + * |
|
163 | + * @return MapIterator |
|
164 | + */ |
|
165 | + public function map(callable $callable) |
|
166 | + { |
|
167 | + return new MapIterator($this->getIterator(), $callable); |
|
168 | + } |
|
169 | 169 | |
170 | - /** |
|
171 | - * Whether a offset exists. |
|
172 | - * |
|
173 | - * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
174 | - * |
|
175 | - * @param mixed $offset <p> |
|
176 | - * An offset to check for. |
|
177 | - * </p> |
|
178 | - * |
|
179 | - * @return bool true on success or false on failure. |
|
180 | - * </p> |
|
181 | - * <p> |
|
182 | - * The return value will be casted to boolean if non-boolean was returned. |
|
183 | - * |
|
184 | - * @since 5.0.0 |
|
185 | - */ |
|
186 | - public function offsetExists($offset) |
|
187 | - { |
|
188 | - return $this->getIterator()->offsetExists($offset); |
|
189 | - } |
|
170 | + /** |
|
171 | + * Whether a offset exists. |
|
172 | + * |
|
173 | + * @link http://php.net/manual/en/arrayaccess.offsetexists.php |
|
174 | + * |
|
175 | + * @param mixed $offset <p> |
|
176 | + * An offset to check for. |
|
177 | + * </p> |
|
178 | + * |
|
179 | + * @return bool true on success or false on failure. |
|
180 | + * </p> |
|
181 | + * <p> |
|
182 | + * The return value will be casted to boolean if non-boolean was returned. |
|
183 | + * |
|
184 | + * @since 5.0.0 |
|
185 | + */ |
|
186 | + public function offsetExists($offset) |
|
187 | + { |
|
188 | + return $this->getIterator()->offsetExists($offset); |
|
189 | + } |
|
190 | 190 | |
191 | - /** |
|
192 | - * Offset to retrieve. |
|
193 | - * |
|
194 | - * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
195 | - * |
|
196 | - * @param mixed $offset <p> |
|
197 | - * The offset to retrieve. |
|
198 | - * </p> |
|
199 | - * |
|
200 | - * @return mixed Can return all value types. |
|
201 | - * |
|
202 | - * @since 5.0.0 |
|
203 | - */ |
|
204 | - public function offsetGet($offset) |
|
205 | - { |
|
206 | - return $this->getIterator()->offsetGet($offset); |
|
207 | - } |
|
191 | + /** |
|
192 | + * Offset to retrieve. |
|
193 | + * |
|
194 | + * @link http://php.net/manual/en/arrayaccess.offsetget.php |
|
195 | + * |
|
196 | + * @param mixed $offset <p> |
|
197 | + * The offset to retrieve. |
|
198 | + * </p> |
|
199 | + * |
|
200 | + * @return mixed Can return all value types. |
|
201 | + * |
|
202 | + * @since 5.0.0 |
|
203 | + */ |
|
204 | + public function offsetGet($offset) |
|
205 | + { |
|
206 | + return $this->getIterator()->offsetGet($offset); |
|
207 | + } |
|
208 | 208 | |
209 | - /** |
|
210 | - * Offset to set. |
|
211 | - * |
|
212 | - * @link http://php.net/manual/en/arrayaccess.offsetset.php |
|
213 | - * |
|
214 | - * @param mixed $offset <p> |
|
215 | - * The offset to assign the value to. |
|
216 | - * </p> |
|
217 | - * @param mixed $value <p> |
|
218 | - * The value to set. |
|
219 | - * </p> |
|
220 | - * |
|
221 | - * @since 5.0.0 |
|
222 | - */ |
|
223 | - public function offsetSet($offset, $value) |
|
224 | - { |
|
225 | - return $this->getIterator()->offsetSet($offset, $value); |
|
226 | - } |
|
209 | + /** |
|
210 | + * Offset to set. |
|
211 | + * |
|
212 | + * @link http://php.net/manual/en/arrayaccess.offsetset.php |
|
213 | + * |
|
214 | + * @param mixed $offset <p> |
|
215 | + * The offset to assign the value to. |
|
216 | + * </p> |
|
217 | + * @param mixed $value <p> |
|
218 | + * The value to set. |
|
219 | + * </p> |
|
220 | + * |
|
221 | + * @since 5.0.0 |
|
222 | + */ |
|
223 | + public function offsetSet($offset, $value) |
|
224 | + { |
|
225 | + return $this->getIterator()->offsetSet($offset, $value); |
|
226 | + } |
|
227 | 227 | |
228 | - /** |
|
229 | - * Offset to unset. |
|
230 | - * |
|
231 | - * @link http://php.net/manual/en/arrayaccess.offsetunset.php |
|
232 | - * |
|
233 | - * @param mixed $offset <p> |
|
234 | - * The offset to unset. |
|
235 | - * </p> |
|
236 | - * |
|
237 | - * @since 5.0.0 |
|
238 | - */ |
|
239 | - public function offsetUnset($offset) |
|
240 | - { |
|
241 | - return $this->getIterator()->offsetUnset($offset); |
|
242 | - } |
|
228 | + /** |
|
229 | + * Offset to unset. |
|
230 | + * |
|
231 | + * @link http://php.net/manual/en/arrayaccess.offsetunset.php |
|
232 | + * |
|
233 | + * @param mixed $offset <p> |
|
234 | + * The offset to unset. |
|
235 | + * </p> |
|
236 | + * |
|
237 | + * @since 5.0.0 |
|
238 | + */ |
|
239 | + public function offsetUnset($offset) |
|
240 | + { |
|
241 | + return $this->getIterator()->offsetUnset($offset); |
|
242 | + } |
|
243 | 243 | |
244 | - /** |
|
245 | - * Specify data which should be serialized to JSON. |
|
246 | - * |
|
247 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
248 | - * |
|
249 | - * @return mixed data which can be serialized by <b>json_encode</b>, |
|
250 | - * which is a value of any type other than a resource. |
|
251 | - * |
|
252 | - * @since 5.4.0 |
|
253 | - */ |
|
254 | - public function jsonSerialize() |
|
255 | - { |
|
256 | - return array_map(function (AbstractTDBMObject $item) { |
|
257 | - return $item->jsonSerialize(); |
|
258 | - }, $this->toArray()); |
|
259 | - } |
|
244 | + /** |
|
245 | + * Specify data which should be serialized to JSON. |
|
246 | + * |
|
247 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
248 | + * |
|
249 | + * @return mixed data which can be serialized by <b>json_encode</b>, |
|
250 | + * which is a value of any type other than a resource. |
|
251 | + * |
|
252 | + * @since 5.4.0 |
|
253 | + */ |
|
254 | + public function jsonSerialize() |
|
255 | + { |
|
256 | + return array_map(function (AbstractTDBMObject $item) { |
|
257 | + return $item->jsonSerialize(); |
|
258 | + }, $this->toArray()); |
|
259 | + } |
|
260 | 260 | } |