@@ -23,7 +23,7 @@ |
||
23 | 23 | $first = ( $offset > 0 ? 0 : null ); |
24 | 24 | $prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
25 | 25 | $next = ( $offset + $limit < $total ? $offset + $limit : null ); |
26 | -$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
26 | +$last = ( ( (int) ( $total / $limit ) ) * $limit > $offset ? ( (int) ( $total / $limit ) ) * $limit : null ); |
|
27 | 27 | |
28 | 28 | |
29 | 29 | $ref = array( 'resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields' ); |
@@ -285,8 +285,7 @@ |
||
285 | 285 | $data[] = $entryFcn( $item ); |
286 | 286 | $included = array_merge( $included, $flatFcn( $inclFcn( $item ) ) ); |
287 | 287 | } |
288 | - } |
|
289 | - else |
|
288 | + } else |
|
290 | 289 | { |
291 | 290 | $data = $entryFcn( $items ); |
292 | 291 | $included = $flatFcn( $inclFcn( $items ) ); |
@@ -44,13 +44,11 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | $status = 200; |
47 | - } |
|
48 | - catch( \Aimeos\MShop\Exception $e ) |
|
47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
49 | 48 | { |
50 | 49 | $status = 404; |
51 | 50 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
52 | - } |
|
53 | - catch( \Exception $e ) |
|
51 | + } catch( \Exception $e ) |
|
54 | 52 | { |
55 | 53 | $status = 500; |
56 | 54 | $view->errors = $this->getErrorDetails( $e ); |
@@ -123,6 +123,9 @@ |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | |
126 | + /** |
|
127 | + * @param string $name |
|
128 | + */ |
|
126 | 129 | protected function access( $name ) |
127 | 130 | { |
128 | 131 | $class = new \ReflectionClass( \Aimeos\Client\JsonApi\Common\Factory\Base::class ); |
@@ -351,6 +351,9 @@ |
||
351 | 351 | } |
352 | 352 | |
353 | 353 | |
354 | + /** |
|
355 | + * @param string $name |
|
356 | + */ |
|
354 | 357 | protected function access( $name ) |
355 | 358 | { |
356 | 359 | $class = new \ReflectionClass( \Aimeos\Client\JsonApi\Order\Standard::class ); |
@@ -374,7 +374,7 @@ |
||
374 | 374 | $baseManager = \Aimeos\MShop::create( $this->context, 'order/base' ); |
375 | 375 | |
376 | 376 | $search = $baseManager->createSearch(); |
377 | - $search->setConditions( $search->compare( '==', 'order.base.price', '672.00') ); |
|
377 | + $search->setConditions( $search->compare( '==', 'order.base.price', '672.00' ) ); |
|
378 | 378 | |
379 | 379 | $items = $baseManager->searchItems( $search ); |
380 | 380 |
@@ -84,6 +84,9 @@ |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | |
87 | + /** |
|
88 | + * @param string $site |
|
89 | + */ |
|
87 | 90 | private static function createContext( $site ) |
88 | 91 | { |
89 | 92 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
@@ -374,7 +374,7 @@ |
||
374 | 374 | $baseManager = \Aimeos\MShop::create( $this->context, 'order/base' ); |
375 | 375 | |
376 | 376 | $search = $baseManager->createSearch(); |
377 | - $search->setConditions( $search->compare( '==', 'order.base.price', '672.00') ); |
|
377 | + $search->setConditions( $search->compare( '==', 'order.base.price', '672.00' ) ); |
|
378 | 378 | |
379 | 379 | $items = $baseManager->searchItems( $search ); |
380 | 380 |
@@ -40,18 +40,15 @@ discard block |
||
40 | 40 | $cntl = \Aimeos\Controller\Frontend\Factory::create( $this->getContext(), 'customer' ); |
41 | 41 | $cntl->deleteItem( $view->param( 'id' ) ); |
42 | 42 | $status = 200; |
43 | - } |
|
44 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
43 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
45 | 44 | { |
46 | 45 | $status = 403; |
47 | 46 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
48 | - } |
|
49 | - catch( \Aimeos\MShop\Exception $e ) |
|
47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
50 | 48 | { |
51 | 49 | $status = 404; |
52 | 50 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
53 | - } |
|
54 | - catch( \Exception $e ) |
|
51 | + } catch( \Exception $e ) |
|
55 | 52 | { |
56 | 53 | $status = 500; |
57 | 54 | $view->errors = $this->getErrorDetails( $e ); |
@@ -84,18 +81,15 @@ discard block |
||
84 | 81 | |
85 | 82 | $view->item = $cntl->getItem( $view->param( 'id' ), $ref ); |
86 | 83 | $status = 200; |
87 | - } |
|
88 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
84 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
89 | 85 | { |
90 | 86 | $status = 403; |
91 | 87 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
92 | - } |
|
93 | - catch( \Aimeos\MShop\Exception $e ) |
|
88 | + } catch( \Aimeos\MShop\Exception $e ) |
|
94 | 89 | { |
95 | 90 | $status = 404; |
96 | 91 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
97 | - } |
|
98 | - catch( \Exception $e ) |
|
92 | + } catch( \Exception $e ) |
|
99 | 93 | { |
100 | 94 | $status = 500; |
101 | 95 | $view->errors = $this->getErrorDetails( $e ); |
@@ -128,18 +122,15 @@ discard block |
||
128 | 122 | |
129 | 123 | $view->item = $cntl->editItem( $view->param( 'id' ), (array) $payload->data->attributes ); |
130 | 124 | $status = 200; |
131 | - } |
|
132 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
125 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
133 | 126 | { |
134 | 127 | $status = 403; |
135 | 128 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
136 | - } |
|
137 | - catch( \Aimeos\MShop\Exception $e ) |
|
129 | + } catch( \Aimeos\MShop\Exception $e ) |
|
138 | 130 | { |
139 | 131 | $status = 404; |
140 | 132 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
141 | - } |
|
142 | - catch( \Exception $e ) |
|
133 | + } catch( \Exception $e ) |
|
143 | 134 | { |
144 | 135 | $status = 500; |
145 | 136 | $view->errors = $this->getErrorDetails( $e ); |
@@ -173,18 +164,15 @@ discard block |
||
173 | 164 | $view->item = $cntl->addItem( (array) $payload->data->attributes ); |
174 | 165 | $view->nodata = true; // only expose customer ID to attackers |
175 | 166 | $status = 201; |
176 | - } |
|
177 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
167 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
178 | 168 | { |
179 | 169 | $status = 403; |
180 | 170 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
181 | - } |
|
182 | - catch( \Aimeos\MShop\Exception $e ) |
|
171 | + } catch( \Aimeos\MShop\Exception $e ) |
|
183 | 172 | { |
184 | 173 | $status = 404; |
185 | 174 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
186 | - } |
|
187 | - catch( \Exception $e ) |
|
175 | + } catch( \Exception $e ) |
|
188 | 176 | { |
189 | 177 | $status = 500; |
190 | 178 | $view->errors = $this->getErrorDetails( $e ); |
@@ -129,8 +129,7 @@ |
||
129 | 129 | if( ( $client = @call_user_func_array( array( $factory, 'create' ), $args ) ) === false ) { |
130 | 130 | throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 ); |
131 | 131 | } |
132 | - } |
|
133 | - else |
|
132 | + } else |
|
134 | 133 | { |
135 | 134 | $client = self::createRoot( $context, $path, $name ); |
136 | 135 | } |