@@ -39,16 +39,14 @@ |
||
| 39 | 39 | { |
| 40 | 40 | $response = $this->getItem( $view, $request, $response ); |
| 41 | 41 | $status = 200; |
| 42 | - } |
|
| 43 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 42 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 44 | 43 | { |
| 45 | 44 | $status = 404; |
| 46 | 45 | $view->errors = array( array( |
| 47 | 46 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 48 | 47 | 'detail' => $e->getTraceAsString(), |
| 49 | 48 | ) ); |
| 50 | - } |
|
| 51 | - catch( \Exception $e ) |
|
| 49 | + } catch( \Exception $e ) |
|
| 52 | 50 | { |
| 53 | 51 | $status = 500; |
| 54 | 52 | $view->errors = array( array( |
@@ -101,8 +101,7 @@ |
||
| 101 | 101 | $decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/local', array() ); |
| 102 | 102 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
| 103 | 103 | } |
| 104 | - } |
|
| 105 | - else |
|
| 104 | + } else |
|
| 106 | 105 | { |
| 107 | 106 | $classprefix = '\\Aimeos\\Client\\JsonApi\\Common\\Decorator\\'; |
| 108 | 107 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
@@ -44,16 +44,14 @@ |
||
| 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 = array( array( |
| 52 | 51 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 53 | 52 | 'detail' => $e->getTraceAsString(), |
| 54 | 53 | ) ); |
| 55 | - } |
|
| 56 | - catch( \Exception $e ) |
|
| 54 | + } catch( \Exception $e ) |
|
| 57 | 55 | { |
| 58 | 56 | $status = 500; |
| 59 | 57 | $view->errors = array( array( |
@@ -60,8 +60,7 @@ |
||
| 60 | 60 | $view->resources = (array) $resources; |
| 61 | 61 | $view->prefix = $prefix; |
| 62 | 62 | $status = 200; |
| 63 | - } |
|
| 64 | - catch( \Exception $e ) |
|
| 63 | + } catch( \Exception $e ) |
|
| 65 | 64 | { |
| 66 | 65 | $status = 500; |
| 67 | 66 | $view->errors = array( array( |
@@ -136,8 +136,7 @@ |
||
| 136 | 136 | if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) { |
| 137 | 137 | throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 ); |
| 138 | 138 | } |
| 139 | - } |
|
| 140 | - else |
|
| 139 | + } else |
|
| 141 | 140 | { |
| 142 | 141 | $client = self::createClientRoot( $context, $view, $templatePaths, $path, $name ); |
| 143 | 142 | } |
@@ -44,16 +44,14 @@ |
||
| 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 = array( array( |
| 52 | 51 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 53 | 52 | 'detail' => $e->getTraceAsString(), |
| 54 | 53 | ) ); |
| 55 | - } |
|
| 56 | - catch( \Exception $e ) |
|
| 54 | + } catch( \Exception $e ) |
|
| 57 | 55 | { |
| 58 | 56 | $status = 500; |
| 59 | 57 | $view->errors = array( array( |
@@ -44,16 +44,14 @@ |
||
| 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 = array( array( |
| 52 | 51 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 53 | 52 | 'detail' => $e->getTraceAsString(), |
| 54 | 53 | ) ); |
| 55 | - } |
|
| 56 | - catch( \Exception $e ) |
|
| 54 | + } catch( \Exception $e ) |
|
| 57 | 55 | { |
| 58 | 56 | $status = 500; |
| 59 | 57 | $view->errors = array( array( |
@@ -59,16 +59,14 @@ discard block |
||
| 59 | 59 | $status = 200; |
| 60 | 60 | $type = $view->param( 'id', 'default' ); |
| 61 | 61 | $view->item = $this->controller->setType( $type )->clear()->get(); |
| 62 | - } |
|
| 63 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 62 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 64 | 63 | { |
| 65 | 64 | $status = 404; |
| 66 | 65 | $view->errors = array( array( |
| 67 | 66 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 68 | 67 | 'detail' => $e->getTraceAsString(), |
| 69 | 68 | ) ); |
| 70 | - } |
|
| 71 | - catch( \Exception $e ) |
|
| 69 | + } catch( \Exception $e ) |
|
| 72 | 70 | { |
| 73 | 71 | $status = 500; |
| 74 | 72 | $view->errors = array( array( |
@@ -99,24 +97,21 @@ discard block |
||
| 99 | 97 | try |
| 100 | 98 | { |
| 101 | 99 | $view->item = $this->controller->load( $id, $this->getParts( $view ) ); |
| 102 | - } |
|
| 103 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 100 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 104 | 101 | { |
| 105 | 102 | $view->item = $this->controller->setType( $id )->get(); |
| 106 | 103 | $allow = true; |
| 107 | 104 | } |
| 108 | 105 | |
| 109 | 106 | $status = 200; |
| 110 | - } |
|
| 111 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 107 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 112 | 108 | { |
| 113 | 109 | $status = 404; |
| 114 | 110 | $view->errors = array( array( |
| 115 | 111 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 116 | 112 | 'detail' => $e->getTraceAsString(), |
| 117 | 113 | ) ); |
| 118 | - } |
|
| 119 | - catch( \Exception $e ) |
|
| 114 | + } catch( \Exception $e ) |
|
| 120 | 115 | { |
| 121 | 116 | $status = 500; |
| 122 | 117 | $view->errors = array( array( |
@@ -153,16 +148,14 @@ discard block |
||
| 153 | 148 | |
| 154 | 149 | $view->item = $basket; |
| 155 | 150 | $status = 200; |
| 156 | - } |
|
| 157 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 151 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 158 | 152 | { |
| 159 | 153 | $status = 404; |
| 160 | 154 | $view->errors = array( array( |
| 161 | 155 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 162 | 156 | 'detail' => $e->getTraceAsString(), |
| 163 | 157 | ) ); |
| 164 | - } |
|
| 165 | - catch( \Exception $e ) |
|
| 158 | + } catch( \Exception $e ) |
|
| 166 | 159 | { |
| 167 | 160 | $status = 500; |
| 168 | 161 | $view->errors = array( array( |
@@ -192,16 +185,14 @@ discard block |
||
| 192 | 185 | |
| 193 | 186 | $view->item = $this->controller->store(); |
| 194 | 187 | $status = 200; |
| 195 | - } |
|
| 196 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 188 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 197 | 189 | { |
| 198 | 190 | $status = 404; |
| 199 | 191 | $view->errors = array( array( |
| 200 | 192 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 201 | 193 | 'detail' => $e->getTraceAsString(), |
| 202 | 194 | ) ); |
| 203 | - } |
|
| 204 | - catch( \Exception $e ) |
|
| 195 | + } catch( \Exception $e ) |
|
| 205 | 196 | { |
| 206 | 197 | $status = 500; |
| 207 | 198 | $view->errors = array( array( |
@@ -78,8 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | $this->controller->setAddress( $entry->id, null ); |
| 80 | 80 | } |
| 81 | - } |
|
| 82 | - else |
|
| 81 | + } else |
|
| 83 | 82 | { |
| 84 | 83 | $this->controller->setAddress( $relId, null ); |
| 85 | 84 | } |
@@ -87,16 +86,14 @@ discard block |
||
| 87 | 86 | |
| 88 | 87 | $view->item = $this->controller->get(); |
| 89 | 88 | $status = 200; |
| 90 | - } |
|
| 91 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 89 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 92 | 90 | { |
| 93 | 91 | $status = 404; |
| 94 | 92 | $view->errors = array( array( |
| 95 | 93 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 96 | 94 | 'detail' => $e->getTraceAsString(), |
| 97 | 95 | ) ); |
| 98 | - } |
|
| 99 | - catch( \Exception $e ) |
|
| 96 | + } catch( \Exception $e ) |
|
| 100 | 97 | { |
| 101 | 98 | $status = 500; |
| 102 | 99 | $view->errors = array( array( |
@@ -145,16 +142,14 @@ discard block |
||
| 145 | 142 | |
| 146 | 143 | $view->item = $this->controller->get(); |
| 147 | 144 | $status = 201; |
| 148 | - } |
|
| 149 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 145 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 150 | 146 | { |
| 151 | 147 | $status = 404; |
| 152 | 148 | $view->errors = array( array( |
| 153 | 149 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 154 | 150 | 'detail' => $e->getTraceAsString(), |
| 155 | 151 | ) ); |
| 156 | - } |
|
| 157 | - catch( \Exception $e ) |
|
| 152 | + } catch( \Exception $e ) |
|
| 158 | 153 | { |
| 159 | 154 | $status = 500; |
| 160 | 155 | $view->errors = array( array( |