@@ -89,12 +89,10 @@ |
||
| 89 | 89 | foreach( $data as $item ) { |
| 90 | 90 | $response[] = $build( $item, $childItems, $listItems ); |
| 91 | 91 | } |
| 92 | -} |
|
| 93 | -elseif( $data !== null ) |
|
| 92 | +} elseif( $data !== null ) |
|
| 94 | 93 | { |
| 95 | 94 | $response = $build( $data, $childItems, $listItems ); |
| 96 | -} |
|
| 97 | -else |
|
| 95 | +} else |
|
| 98 | 96 | { |
| 99 | 97 | $response = null; |
| 100 | 98 | } |
@@ -79,12 +79,10 @@ |
||
| 79 | 79 | foreach( $data as $item ) { |
| 80 | 80 | $response[] = $build( $item, $childItems ); |
| 81 | 81 | } |
| 82 | -} |
|
| 83 | -elseif( $data !== null ) |
|
| 82 | +} elseif( $data !== null ) |
|
| 84 | 83 | { |
| 85 | 84 | $response = $build( $data, $childItems ); |
| 86 | -} |
|
| 87 | -else |
|
| 85 | +} else |
|
| 88 | 86 | { |
| 89 | 87 | $response = null; |
| 90 | 88 | } |
@@ -85,12 +85,10 @@ |
||
| 85 | 85 | foreach( $data as $item ) { |
| 86 | 86 | $response[] = $build( $item, $listItems ); |
| 87 | 87 | } |
| 88 | -} |
|
| 89 | -elseif( $data !== null ) |
|
| 88 | +} elseif( $data !== null ) |
|
| 90 | 89 | { |
| 91 | 90 | $response = $build( $data, $listItems ); |
| 92 | -} |
|
| 93 | -else |
|
| 91 | +} else |
|
| 94 | 92 | { |
| 95 | 93 | $response = null; |
| 96 | 94 | } |
@@ -66,12 +66,10 @@ |
||
| 66 | 66 | foreach( $data as $item ) { |
| 67 | 67 | $response[] = $build( $item ); |
| 68 | 68 | } |
| 69 | -} |
|
| 70 | -elseif( $data !== null ) |
|
| 69 | +} elseif( $data !== null ) |
|
| 71 | 70 | { |
| 72 | 71 | $response = $build( $data ); |
| 73 | -} |
|
| 74 | -else |
|
| 72 | +} else |
|
| 75 | 73 | { |
| 76 | 74 | $response = null; |
| 77 | 75 | } |
@@ -79,12 +79,10 @@ |
||
| 79 | 79 | foreach( $data as $item ) { |
| 80 | 80 | $response[] = $build( $item, $childItems ); |
| 81 | 81 | } |
| 82 | -} |
|
| 83 | -elseif( $data !== null ) |
|
| 82 | +} elseif( $data !== null ) |
|
| 84 | 83 | { |
| 85 | 84 | $response = $build( $data, $childItems ); |
| 86 | -} |
|
| 87 | -else |
|
| 85 | +} else |
|
| 88 | 86 | { |
| 89 | 87 | $response = null; |
| 90 | 88 | } |
@@ -118,16 +118,14 @@ |
||
| 118 | 118 | { |
| 119 | 119 | $response = $this->getItems( $view, $request, $response ); |
| 120 | 120 | $status = 200; |
| 121 | - } |
|
| 122 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 121 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 123 | 122 | { |
| 124 | 123 | $status = 404; |
| 125 | 124 | $view->errors = array( array( |
| 126 | 125 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 127 | 126 | 'detail' => $e->getTraceAsString(), |
| 128 | 127 | ) ); |
| 129 | - } |
|
| 130 | - catch( \Exception $e ) |
|
| 128 | + } catch( \Exception $e ) |
|
| 131 | 129 | { |
| 132 | 130 | $status = 500; |
| 133 | 131 | $view->errors = array( array( |
@@ -118,16 +118,14 @@ |
||
| 118 | 118 | { |
| 119 | 119 | $response = $this->getItems( $view, $request, $response ); |
| 120 | 120 | $status = 200; |
| 121 | - } |
|
| 122 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 121 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 123 | 122 | { |
| 124 | 123 | $status = 404; |
| 125 | 124 | $view->errors = array( array( |
| 126 | 125 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 127 | 126 | 'detail' => $e->getTraceAsString(), |
| 128 | 127 | ) ); |
| 129 | - } |
|
| 130 | - catch( \Exception $e ) |
|
| 128 | + } catch( \Exception $e ) |
|
| 131 | 129 | { |
| 132 | 130 | $status = 500; |
| 133 | 131 | $view->errors = array( array( |
@@ -118,16 +118,14 @@ |
||
| 118 | 118 | { |
| 119 | 119 | $response = $this->getItems( $view, $request, $response ); |
| 120 | 120 | $status = 200; |
| 121 | - } |
|
| 122 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 121 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 123 | 122 | { |
| 124 | 123 | $status = 404; |
| 125 | 124 | $view->errors = array( array( |
| 126 | 125 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
| 127 | 126 | 'detail' => $e->getTraceAsString(), |
| 128 | 127 | ) ); |
| 129 | - } |
|
| 130 | - catch( \Exception $e ) |
|
| 128 | + } catch( \Exception $e ) |
|
| 131 | 129 | { |
| 132 | 130 | $status = 500; |
| 133 | 131 | $view->errors = array( array( |
@@ -99,8 +99,7 @@ |
||
| 99 | 99 | $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] ); |
| 100 | 100 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
| 101 | 101 | } |
| 102 | - } |
|
| 103 | - else |
|
| 102 | + } else |
|
| 104 | 103 | { |
| 105 | 104 | $classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
| 106 | 105 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |