@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | ?> |
12 | 12 | { |
13 | 13 | "meta": { |
14 | - "total": <?= $this->get( 'total', 0 ); ?> |
|
14 | + "total": <?= $this->get('total', 0); ?> |
|
15 | 15 | |
16 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
16 | + <?php if ($this->csrf()->name() != '') : ?> |
|
17 | 17 | , "csrf": { |
18 | 18 | "name": "<?= $this->csrf()->name(); ?>", |
19 | 19 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -22,13 +22,13 @@ discard block |
||
22 | 22 | |
23 | 23 | } |
24 | 24 | |
25 | - <?php if( isset( $this->errors ) ) : ?> |
|
25 | + <?php if (isset($this->errors)) : ?> |
|
26 | 26 | |
27 | - , "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard' ), array( 'errors' => $this->errors ) ); ?> |
|
27 | + , "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), array('errors' => $this->errors)); ?> |
|
28 | 28 | |
29 | - <?php elseif( isset( $this->data ) ) : ?> |
|
29 | + <?php elseif (isset($this->data)) : ?> |
|
30 | 30 | |
31 | - , "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard' ), array( 'data' => $this->get( 'data' ) ) ); ?> |
|
31 | + , "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard'), array('data' => $this->get('data'))); ?> |
|
32 | 32 | |
33 | 33 | <?php endif; ?> |
34 | 34 |
@@ -180,8 +180,7 @@ |
||
180 | 180 | } |
181 | 181 | |
182 | 182 | $item = $manager->saveItem( $item ); |
183 | - } |
|
184 | - else |
|
183 | + } else |
|
185 | 184 | { |
186 | 185 | $item = $manager->createItem(); |
187 | 186 |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
111 | 111 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
112 | 112 | */ |
113 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
113 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
114 | 114 | { |
115 | 115 | /** admin/jsonadm/partials/locale/site/template-data |
116 | 116 | * Relative path to the data partial template file for the locale site client |
@@ -127,9 +127,9 @@ discard block |
||
127 | 127 | * @since 2016.07 |
128 | 128 | * @category Developer |
129 | 129 | */ |
130 | - $this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/locale/site/template-data' ) ); |
|
130 | + $this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/locale/site/template-data')); |
|
131 | 131 | |
132 | - return parent::get( $request, $response ); |
|
132 | + return parent::get($request, $response); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
@@ -141,16 +141,16 @@ discard block |
||
141 | 141 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
142 | 142 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
143 | 143 | */ |
144 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
144 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
145 | 145 | { |
146 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'locale/site' ); |
|
147 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
146 | + $manager = \Aimeos\MShop::create($this->getContext(), 'locale/site'); |
|
147 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
148 | 148 | $total = 1; |
149 | 149 | |
150 | - if( ( $id = $view->param( 'id' ) ) == null ) { |
|
151 | - $view->data = $manager->searchItems( $search, [], $total ); |
|
150 | + if (($id = $view->param('id')) == null) { |
|
151 | + $view->data = $manager->searchItems($search, [], $total); |
|
152 | 152 | } else { |
153 | - $view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search ); |
|
153 | + $view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | $view->childItems = []; |
@@ -169,33 +169,33 @@ discard block |
||
169 | 169 | * @param \stdClass $entry Object including "id" and "attributes" elements |
170 | 170 | * @return \Aimeos\MShop\Common\Item\Iface New or updated item |
171 | 171 | */ |
172 | - protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry ) |
|
172 | + protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry) |
|
173 | 173 | { |
174 | - if( isset( $entry->id ) ) |
|
174 | + if (isset($entry->id)) |
|
175 | 175 | { |
176 | - $item = $manager->getItem( $entry->id ); |
|
176 | + $item = $manager->getItem($entry->id); |
|
177 | 177 | |
178 | - if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) { |
|
179 | - $item = $item->fromArray( $attr ); |
|
178 | + if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) { |
|
179 | + $item = $item->fromArray($attr); |
|
180 | 180 | } |
181 | 181 | |
182 | - $item = $manager->saveItem( $item ); |
|
182 | + $item = $manager->saveItem($item); |
|
183 | 183 | } |
184 | 184 | else |
185 | 185 | { |
186 | 186 | $item = $manager->createItem(); |
187 | 187 | |
188 | - if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) { |
|
189 | - $item = $item->fromArray( $attr ); |
|
188 | + if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) { |
|
189 | + $item = $item->fromArray($attr); |
|
190 | 190 | } |
191 | 191 | |
192 | - $manager->insertItem( $item ); |
|
192 | + $manager->insertItem($item); |
|
193 | 193 | } |
194 | 194 | |
195 | - if( isset( $entry->relationships ) ) { |
|
196 | - $this->saveRelationships( $manager, $item, $entry->relationships ); |
|
195 | + if (isset($entry->relationships)) { |
|
196 | + $this->saveRelationships($manager, $item, $entry->relationships); |
|
197 | 197 | } |
198 | 198 | |
199 | - return $manager->getItem( $item->getId() ); |
|
199 | + return $manager->getItem($item->getId()); |
|
200 | 200 | } |
201 | 201 | } |
@@ -182,8 +182,7 @@ discard block |
||
182 | 182 | $view->data = $manager->searchItems( $search, [], $total ); |
183 | 183 | $view->listItems = $this->getListItems( $view->data, $include ); |
184 | 184 | $view->childItems = []; |
185 | - } |
|
186 | - else |
|
185 | + } else |
|
187 | 186 | { |
188 | 187 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE; |
189 | 188 | if( in_array( 'catalog', $include ) ) { |
@@ -249,8 +248,7 @@ discard block |
||
249 | 248 | if( isset( $entry->parentid ) && $targetId !== null ) { |
250 | 249 | $manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId ); |
251 | 250 | } |
252 | - } |
|
253 | - else |
|
251 | + } else |
|
254 | 252 | { |
255 | 253 | $item = $manager->createItem(); |
256 | 254 |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
111 | 111 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
112 | 112 | */ |
113 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
113 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
114 | 114 | { |
115 | 115 | /** admin/jsonadm/partials/catalog/template-data |
116 | 116 | * Relative path to the data partial template file for the catalog client |
@@ -127,9 +127,9 @@ discard block |
||
127 | 127 | * @since 2016.07 |
128 | 128 | * @category Developer |
129 | 129 | */ |
130 | - $this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/catalog/template-data' ) ); |
|
130 | + $this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/catalog/template-data')); |
|
131 | 131 | |
132 | - return parent::get( $request, $response ); |
|
132 | + return parent::get($request, $response); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | * @param array $include List of resource types that should be fetched |
141 | 141 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
142 | 142 | */ |
143 | - protected function getChildItems( array $items, array $include ) |
|
143 | + protected function getChildItems(array $items, array $include) |
|
144 | 144 | { |
145 | 145 | $list = []; |
146 | 146 | |
147 | - if( in_array( 'catalog', $include ) ) |
|
147 | + if (in_array('catalog', $include)) |
|
148 | 148 | { |
149 | - foreach( $items as $item ) { |
|
150 | - $list = array_merge( $list, [$item], $this->getChildItems( $item->getChildren(), $include ) ); |
|
149 | + foreach ($items as $item) { |
|
150 | + $list = array_merge($list, [$item], $this->getChildItems($item->getChildren(), $include)); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
@@ -162,40 +162,40 @@ discard block |
||
162 | 162 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
163 | 163 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
164 | 164 | */ |
165 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
165 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
166 | 166 | { |
167 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'catalog' ); |
|
167 | + $manager = \Aimeos\MShop::create($this->getContext(), 'catalog'); |
|
168 | 168 | |
169 | - if( ( $key = $view->param( 'aggregate' ) ) !== null ) |
|
169 | + if (($key = $view->param('aggregate')) !== null) |
|
170 | 170 | { |
171 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
172 | - $view->data = $manager->aggregate( $search, $key ); |
|
171 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
172 | + $view->data = $manager->aggregate($search, $key); |
|
173 | 173 | return $response; |
174 | 174 | } |
175 | 175 | |
176 | - $include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] ); |
|
177 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
176 | + $include = (($include = $view->param('include')) !== null ? explode(',', $include) : []); |
|
177 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
178 | 178 | $total = 1; |
179 | 179 | |
180 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
180 | + if (($id = $view->param('id')) == null) |
|
181 | 181 | { |
182 | - $view->data = $manager->searchItems( $search, [], $total ); |
|
183 | - $view->listItems = $this->getListItems( $view->data, $include ); |
|
182 | + $view->data = $manager->searchItems($search, [], $total); |
|
183 | + $view->listItems = $this->getListItems($view->data, $include); |
|
184 | 184 | $view->childItems = []; |
185 | 185 | } |
186 | 186 | else |
187 | 187 | { |
188 | 188 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE; |
189 | - if( in_array( 'catalog', $include ) ) { |
|
189 | + if (in_array('catalog', $include)) { |
|
190 | 190 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST; |
191 | 191 | } |
192 | 192 | |
193 | - $view->data = $manager->getTree( $id, $include, $level, $search ); |
|
194 | - $view->listItems = $this->getListItems( array( $id => $view->data ), $include ); |
|
195 | - $view->childItems = $this->getChildItems( $view->data->getChildren(), $include ); |
|
193 | + $view->data = $manager->getTree($id, $include, $level, $search); |
|
194 | + $view->listItems = $this->getListItems(array($id => $view->data), $include); |
|
195 | + $view->childItems = $this->getChildItems($view->data->getChildren(), $include); |
|
196 | 196 | } |
197 | 197 | |
198 | - $view->refItems = $this->getRefItems( $view->listItems ); |
|
198 | + $view->refItems = $this->getRefItems($view->listItems); |
|
199 | 199 | $view->total = $total; |
200 | 200 | |
201 | 201 | return $response; |
@@ -209,18 +209,18 @@ discard block |
||
209 | 209 | * @param array $include List of resource types that should be fetched |
210 | 210 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
211 | 211 | */ |
212 | - protected function getListItems( array $items, array $include ) |
|
212 | + protected function getListItems(array $items, array $include) |
|
213 | 213 | { |
214 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'catalog/lists' ); |
|
214 | + $manager = \Aimeos\MShop::create($this->getContext(), 'catalog/lists'); |
|
215 | 215 | |
216 | 216 | $search = $manager->createSearch(); |
217 | 217 | $expr = array( |
218 | - $search->compare( '==', 'catalog.lists.parentid', array_keys( $items ) ), |
|
219 | - $search->compare( '==', 'catalog.lists.domain', $include ), |
|
218 | + $search->compare('==', 'catalog.lists.parentid', array_keys($items)), |
|
219 | + $search->compare('==', 'catalog.lists.domain', $include), |
|
220 | 220 | ); |
221 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
221 | + $search->setConditions($search->combine('&&', $expr)); |
|
222 | 222 | |
223 | - return $manager->searchItems( $search ); |
|
223 | + return $manager->searchItems($search); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | |
@@ -231,40 +231,40 @@ discard block |
||
231 | 231 | * @param \stdClass $entry Object including "id" and "attributes" elements |
232 | 232 | * @return \Aimeos\MShop\Common\Item\Iface New or updated item |
233 | 233 | */ |
234 | - protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry ) |
|
234 | + protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry) |
|
235 | 235 | { |
236 | - $targetId = ( isset( $entry->targetid ) ? $entry->targetid : null ); |
|
237 | - $refId = ( isset( $entry->refid ) ? $entry->refid : null ); |
|
236 | + $targetId = (isset($entry->targetid) ? $entry->targetid : null); |
|
237 | + $refId = (isset($entry->refid) ? $entry->refid : null); |
|
238 | 238 | |
239 | - if( isset( $entry->id ) ) |
|
239 | + if (isset($entry->id)) |
|
240 | 240 | { |
241 | - $item = $manager->getItem( $entry->id ); |
|
241 | + $item = $manager->getItem($entry->id); |
|
242 | 242 | |
243 | - if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) { |
|
244 | - $item = $item->fromArray( $attr ); |
|
243 | + if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) { |
|
244 | + $item = $item->fromArray($attr); |
|
245 | 245 | } |
246 | 246 | |
247 | - $item = $manager->saveItem( $item ); |
|
247 | + $item = $manager->saveItem($item); |
|
248 | 248 | |
249 | - if( isset( $entry->parentid ) && $targetId !== null ) { |
|
250 | - $manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId ); |
|
249 | + if (isset($entry->parentid) && $targetId !== null) { |
|
250 | + $manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId); |
|
251 | 251 | } |
252 | 252 | } |
253 | 253 | else |
254 | 254 | { |
255 | 255 | $item = $manager->createItem(); |
256 | 256 | |
257 | - if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) { |
|
258 | - $item = $item->fromArray( $attr ); |
|
257 | + if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) { |
|
258 | + $item = $item->fromArray($attr); |
|
259 | 259 | } |
260 | 260 | |
261 | - $manager->insertItem( $item, $targetId, $refId ); |
|
261 | + $manager->insertItem($item, $targetId, $refId); |
|
262 | 262 | } |
263 | 263 | |
264 | - if( isset( $entry->relationships ) ) { |
|
265 | - $this->saveRelationships( $manager, $item, $entry->relationships ); |
|
264 | + if (isset($entry->relationships)) { |
|
265 | + $this->saveRelationships($manager, $item, $entry->relationships); |
|
266 | 266 | } |
267 | 267 | |
268 | - return $manager->getItem( $item->getId() ); |
|
268 | + return $manager->getItem($item->getId()); |
|
269 | 269 | } |
270 | 270 | } |
@@ -16,9 +16,9 @@ discard block |
||
16 | 16 | $context = \TestHelperJadm::getContext(); |
17 | 17 | $aimeos = \TestHelperJadm::getAimeos(); |
18 | 18 | |
19 | - $client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' ); |
|
20 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
21 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client ); |
|
19 | + $client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order'); |
|
20 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
21 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | $context = \TestHelperJadm::getContext(); |
28 | 28 | $aimeos = \TestHelperJadm::getAimeos(); |
29 | 29 | |
30 | - $client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' ); |
|
31 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
32 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client ); |
|
30 | + $client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base'); |
|
31 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
32 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | $context = \TestHelperJadm::getContext(); |
39 | 39 | $aimeos = \TestHelperJadm::getAimeos(); |
40 | 40 | |
41 | - $client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'stock/type' ); |
|
42 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
43 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client ); |
|
41 | + $client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'stock/type'); |
|
42 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
43 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | $context = \TestHelperJadm::getContext(); |
50 | 50 | $aimeos = \TestHelperJadm::getAimeos(); |
51 | 51 | |
52 | - $client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, '' ); |
|
53 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
54 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client ); |
|
52 | + $client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, ''); |
|
53 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
54 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | $context = \TestHelperJadm::getContext(); |
61 | 61 | $aimeos = \TestHelperJadm::getAimeos(); |
62 | 62 | |
63 | - $this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' ); |
|
64 | - \Aimeos\Admin\JsonAdm::create( $context, $aimeos, '%^' ); |
|
63 | + $this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception'); |
|
64 | + \Aimeos\Admin\JsonAdm::create($context, $aimeos, '%^'); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
@@ -70,69 +70,69 @@ discard block |
||
70 | 70 | $context = \TestHelperJadm::getContext(); |
71 | 71 | $aimeos = \TestHelperJadm::getAimeos(); |
72 | 72 | |
73 | - $this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' ); |
|
74 | - \Aimeos\Admin\JsonAdm::create( $context, $aimeos, '', '%^' ); |
|
73 | + $this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception'); |
|
74 | + \Aimeos\Admin\JsonAdm::create($context, $aimeos, '', '%^'); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | |
78 | 78 | public function testClear() |
79 | 79 | { |
80 | - $cache = \Aimeos\Admin\JsonAdm::cache( true ); |
|
80 | + $cache = \Aimeos\Admin\JsonAdm::cache(true); |
|
81 | 81 | |
82 | 82 | $context = \TestHelperJadm::getContext(); |
83 | 83 | $aimeos = \TestHelperJadm::getAimeos(); |
84 | 84 | |
85 | - $client1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' ); |
|
85 | + $client1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order'); |
|
86 | 86 | \Aimeos\Admin\JsonAdm::clear(); |
87 | - $client2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' ); |
|
87 | + $client2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order'); |
|
88 | 88 | |
89 | - \Aimeos\Admin\JsonAdm::cache( $cache ); |
|
89 | + \Aimeos\Admin\JsonAdm::cache($cache); |
|
90 | 90 | |
91 | - $this->assertNotSame( $client1, $client2 ); |
|
91 | + $this->assertNotSame($client1, $client2); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | |
95 | 95 | public function testClearSite() |
96 | 96 | { |
97 | - $cache = \Aimeos\Admin\JsonAdm::cache( true ); |
|
97 | + $cache = \Aimeos\Admin\JsonAdm::cache(true); |
|
98 | 98 | |
99 | 99 | $context = \TestHelperJadm::getContext(); |
100 | 100 | $aimeos = \TestHelperJadm::getAimeos(); |
101 | 101 | |
102 | - $cntlA1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' ); |
|
103 | - $cntlB1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' ); |
|
102 | + $cntlA1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order'); |
|
103 | + $cntlB1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base'); |
|
104 | 104 | |
105 | - \Aimeos\Admin\JsonAdm::clear( (string) $context ); |
|
105 | + \Aimeos\Admin\JsonAdm::clear((string) $context); |
|
106 | 106 | |
107 | - $cntlA2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' ); |
|
108 | - $cntlB2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' ); |
|
107 | + $cntlA2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order'); |
|
108 | + $cntlB2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base'); |
|
109 | 109 | |
110 | - \Aimeos\Admin\JsonAdm::cache( $cache ); |
|
110 | + \Aimeos\Admin\JsonAdm::cache($cache); |
|
111 | 111 | |
112 | - $this->assertNotSame( $cntlA1, $cntlA2 ); |
|
113 | - $this->assertNotSame( $cntlB1, $cntlB2 ); |
|
112 | + $this->assertNotSame($cntlA1, $cntlA2); |
|
113 | + $this->assertNotSame($cntlB1, $cntlB2); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | |
117 | 117 | public function testClearSpecific() |
118 | 118 | { |
119 | - $cache = \Aimeos\Admin\JsonAdm::cache( true ); |
|
119 | + $cache = \Aimeos\Admin\JsonAdm::cache(true); |
|
120 | 120 | |
121 | 121 | $context = \TestHelperJadm::getContext(); |
122 | 122 | $aimeos = \TestHelperJadm::getAimeos(); |
123 | 123 | |
124 | - $cntlA1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' ); |
|
125 | - $cntlB1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' ); |
|
124 | + $cntlA1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order'); |
|
125 | + $cntlB1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base'); |
|
126 | 126 | |
127 | - \Aimeos\Admin\JsonAdm::clear( (string) $context, 'order' ); |
|
127 | + \Aimeos\Admin\JsonAdm::clear((string) $context, 'order'); |
|
128 | 128 | |
129 | - $cntlA2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' ); |
|
130 | - $cntlB2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' ); |
|
129 | + $cntlA2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order'); |
|
130 | + $cntlB2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base'); |
|
131 | 131 | |
132 | - \Aimeos\Admin\JsonAdm::cache( $cache ); |
|
132 | + \Aimeos\Admin\JsonAdm::cache($cache); |
|
133 | 133 | |
134 | - $this->assertNotSame( $cntlA1, $cntlA2 ); |
|
135 | - $this->assertSame( $cntlB1, $cntlB2 ); |
|
134 | + $this->assertNotSame($cntlA1, $cntlA2); |
|
135 | + $this->assertSame($cntlB1, $cntlB2); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | } |
139 | 139 | \ No newline at end of file |
@@ -107,17 +107,17 @@ |
||
107 | 107 | * @param array $include List of resource types that should be fetched |
108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
109 | 109 | */ |
110 | - protected function getListItems( array $items, array $include ) |
|
110 | + protected function getListItems(array $items, array $include) |
|
111 | 111 | { |
112 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'media/lists' ); |
|
112 | + $manager = \Aimeos\MShop::create($this->getContext(), 'media/lists'); |
|
113 | 113 | |
114 | 114 | $search = $manager->createSearch(); |
115 | 115 | $expr = array( |
116 | - $search->compare( '==', 'media.lists.parentid', array_keys( $items ) ), |
|
117 | - $search->compare( '==', 'media.lists.domain', $include ), |
|
116 | + $search->compare('==', 'media.lists.parentid', array_keys($items)), |
|
117 | + $search->compare('==', 'media.lists.domain', $include), |
|
118 | 118 | ); |
119 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
119 | + $search->setConditions($search->combine('&&', $expr)); |
|
120 | 120 | |
121 | - return $manager->searchItems( $search ); |
|
121 | + return $manager->searchItems($search); |
|
122 | 122 | } |
123 | 123 | } |
@@ -107,17 +107,17 @@ |
||
107 | 107 | * @param array $include List of resource types that should be fetched |
108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
109 | 109 | */ |
110 | - protected function getListItems( array $items, array $include ) |
|
110 | + protected function getListItems(array $items, array $include) |
|
111 | 111 | { |
112 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'service/lists' ); |
|
112 | + $manager = \Aimeos\MShop::create($this->getContext(), 'service/lists'); |
|
113 | 113 | |
114 | 114 | $search = $manager->createSearch(); |
115 | 115 | $expr = array( |
116 | - $search->compare( '==', 'service.lists.parentid', array_keys( $items ) ), |
|
117 | - $search->compare( '==', 'service.lists.domain', $include ), |
|
116 | + $search->compare('==', 'service.lists.parentid', array_keys($items)), |
|
117 | + $search->compare('==', 'service.lists.domain', $include), |
|
118 | 118 | ); |
119 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
119 | + $search->setConditions($search->combine('&&', $expr)); |
|
120 | 120 | |
121 | - return $manager->searchItems( $search ); |
|
121 | + return $manager->searchItems($search); |
|
122 | 122 | } |
123 | 123 | } |
@@ -107,20 +107,20 @@ discard block |
||
107 | 107 | * @param array $include List of resource types that should be fetched |
108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
109 | 109 | */ |
110 | - protected function getChildItems( array $items, array $include ) |
|
110 | + protected function getChildItems(array $items, array $include) |
|
111 | 111 | { |
112 | 112 | $list = []; |
113 | - $refIds = array_keys( $items ); |
|
114 | - $include = array_intersect( $include, array( 'customer/address' ) ); |
|
113 | + $refIds = array_keys($items); |
|
114 | + $include = array_intersect($include, array('customer/address')); |
|
115 | 115 | |
116 | - foreach( $include as $type ) |
|
116 | + foreach ($include as $type) |
|
117 | 117 | { |
118 | - $manager = \Aimeos\MShop::create( $this->getContext(), $type ); |
|
118 | + $manager = \Aimeos\MShop::create($this->getContext(), $type); |
|
119 | 119 | |
120 | 120 | $search = $manager->createSearch(); |
121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $refIds ) ); |
|
121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $refIds)); |
|
122 | 122 | |
123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | return $list; |
@@ -134,17 +134,17 @@ discard block |
||
134 | 134 | * @param array $include List of resource types that should be fetched |
135 | 135 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
136 | 136 | */ |
137 | - protected function getListItems( array $items, array $include ) |
|
137 | + protected function getListItems(array $items, array $include) |
|
138 | 138 | { |
139 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'customer/lists' ); |
|
139 | + $manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists'); |
|
140 | 140 | |
141 | 141 | $search = $manager->createSearch(); |
142 | 142 | $expr = array( |
143 | - $search->compare( '==', 'customer.lists.parentid', array_keys( $items ) ), |
|
144 | - $search->compare( '==', 'customer.lists.domain', $include ), |
|
143 | + $search->compare('==', 'customer.lists.parentid', array_keys($items)), |
|
144 | + $search->compare('==', 'customer.lists.domain', $include), |
|
145 | 145 | ); |
146 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
146 | + $search->setConditions($search->combine('&&', $expr)); |
|
147 | 147 | |
148 | - return $manager->searchItems( $search ); |
|
148 | + return $manager->searchItems($search); |
|
149 | 149 | } |
150 | 150 | } |
@@ -107,20 +107,20 @@ discard block |
||
107 | 107 | * @param array $include List of resource types that should be fetched |
108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
109 | 109 | */ |
110 | - protected function getChildItems( array $items, array $include ) |
|
110 | + protected function getChildItems(array $items, array $include) |
|
111 | 111 | { |
112 | 112 | $list = []; |
113 | - $refIds = array_keys( $items ); |
|
114 | - $include = array_intersect( $include, array( 'supplier/address' ) ); |
|
113 | + $refIds = array_keys($items); |
|
114 | + $include = array_intersect($include, array('supplier/address')); |
|
115 | 115 | |
116 | - foreach( $include as $type ) |
|
116 | + foreach ($include as $type) |
|
117 | 117 | { |
118 | - $manager = \Aimeos\MShop::create( $this->getContext(), $type ); |
|
118 | + $manager = \Aimeos\MShop::create($this->getContext(), $type); |
|
119 | 119 | |
120 | 120 | $search = $manager->createSearch(); |
121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $refIds ) ); |
|
121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $refIds)); |
|
122 | 122 | |
123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | return $list; |
@@ -134,17 +134,17 @@ discard block |
||
134 | 134 | * @param array $include List of resource types that should be fetched |
135 | 135 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
136 | 136 | */ |
137 | - protected function getListItems( array $items, array $include ) |
|
137 | + protected function getListItems(array $items, array $include) |
|
138 | 138 | { |
139 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/lists' ); |
|
139 | + $manager = \Aimeos\MShop::create($this->getContext(), 'supplier/lists'); |
|
140 | 140 | |
141 | 141 | $search = $manager->createSearch(); |
142 | 142 | $expr = array( |
143 | - $search->compare( '==', 'supplier.lists.parentid', array_keys( $items ) ), |
|
144 | - $search->compare( '==', 'supplier.lists.domain', $include ), |
|
143 | + $search->compare('==', 'supplier.lists.parentid', array_keys($items)), |
|
144 | + $search->compare('==', 'supplier.lists.domain', $include), |
|
145 | 145 | ); |
146 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
146 | + $search->setConditions($search->combine('&&', $expr)); |
|
147 | 147 | |
148 | - return $manager->searchItems( $search ); |
|
148 | + return $manager->searchItems($search); |
|
149 | 149 | } |
150 | 150 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
111 | 111 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
112 | 112 | */ |
113 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
113 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
114 | 114 | { |
115 | 115 | /** admin/jsonadm/partials/order/base/template-data |
116 | 116 | * Relative path to the data partial template file for the order base client |
@@ -127,9 +127,9 @@ discard block |
||
127 | 127 | * @since 2016.01 |
128 | 128 | * @category Developer |
129 | 129 | */ |
130 | - $this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/order/base/template-data' ) ); |
|
130 | + $this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/order/base/template-data')); |
|
131 | 131 | |
132 | - return parent::get( $request, $response ); |
|
132 | + return parent::get($request, $response); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
@@ -140,21 +140,21 @@ discard block |
||
140 | 140 | * @param array $include List of resource types that should be fetched |
141 | 141 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
142 | 142 | */ |
143 | - protected function getChildItems( array $items, array $include ) |
|
143 | + protected function getChildItems(array $items, array $include) |
|
144 | 144 | { |
145 | 145 | $list = []; |
146 | - $ids = array_keys( $items ); |
|
147 | - $keys = array( 'order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service' ); |
|
148 | - $include = array_intersect( $include, $keys ); |
|
146 | + $ids = array_keys($items); |
|
147 | + $keys = array('order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service'); |
|
148 | + $include = array_intersect($include, $keys); |
|
149 | 149 | |
150 | - foreach( $include as $type ) |
|
150 | + foreach ($include as $type) |
|
151 | 151 | { |
152 | - $manager = \Aimeos\MShop::create( $this->getContext(), $type ); |
|
152 | + $manager = \Aimeos\MShop::create($this->getContext(), $type); |
|
153 | 153 | |
154 | 154 | $search = $manager->createSearch(); |
155 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.baseid', $ids ) ); |
|
155 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.baseid', $ids)); |
|
156 | 156 | |
157 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
157 | + $list = array_merge($list, $manager->searchItems($search)); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | return $list; |