@@ -136,8 +136,7 @@ |
||
136 | 136 | if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) { |
137 | 137 | throw new \Aimeos\Admin\JsonAdm\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 | } |
@@ -79,12 +79,10 @@ |
||
79 | 79 | foreach( $data as $item ) { |
80 | 80 | $response[] = $build( $this, $item, $fields, $childItems, $listItems ); |
81 | 81 | } |
82 | -} |
|
83 | -elseif( $data !== null ) |
|
82 | +} elseif( $data !== null ) |
|
84 | 83 | { |
85 | 84 | $response = $build( $this, $data, $fields, $childItems, $listItems ); |
86 | -} |
|
87 | -else |
|
85 | +} else |
|
88 | 86 | { |
89 | 87 | $response = null; |
90 | 88 | } |
@@ -67,12 +67,10 @@ |
||
67 | 67 | foreach( $data as $item ) { |
68 | 68 | $response[] = $build( $this, $item, $fields, $childItems ); |
69 | 69 | } |
70 | -} |
|
71 | -elseif( $data !== null ) |
|
70 | +} elseif( $data !== null ) |
|
72 | 71 | { |
73 | 72 | $response = $build( $this, $data, $fields, $childItems ); |
74 | -} |
|
75 | -else |
|
73 | +} else |
|
76 | 74 | { |
77 | 75 | $response = null; |
78 | 76 | } |
@@ -58,12 +58,10 @@ |
||
58 | 58 | foreach( $data as $item ) { |
59 | 59 | $response[] = $build( $this, $item, $fields ); |
60 | 60 | } |
61 | -} |
|
62 | -elseif( $data !== null ) |
|
61 | +} elseif( $data !== null ) |
|
63 | 62 | { |
64 | 63 | $response = $build( $this, $data, $fields ); |
65 | -} |
|
66 | -else |
|
64 | +} else |
|
67 | 65 | { |
68 | 66 | $response = null; |
69 | 67 | } |
@@ -75,12 +75,10 @@ |
||
75 | 75 | foreach( $data as $item ) { |
76 | 76 | $response[] = $build( $this, $item, $fields, $listItems ); |
77 | 77 | } |
78 | -} |
|
79 | -elseif( $data !== null ) |
|
78 | +} elseif( $data !== null ) |
|
80 | 79 | { |
81 | 80 | $response = $build( $this, $data, $fields, $listItems ); |
82 | -} |
|
83 | -else |
|
81 | +} else |
|
84 | 82 | { |
85 | 83 | $response = null; |
86 | 84 | } |
@@ -67,12 +67,10 @@ |
||
67 | 67 | foreach( $data as $item ) { |
68 | 68 | $response[] = $build( $this, $item, $fields, $childItems ); |
69 | 69 | } |
70 | -} |
|
71 | -elseif( $data !== null ) |
|
70 | +} elseif( $data !== null ) |
|
72 | 71 | { |
73 | 72 | $response = $build( $this, $data, $fields, $childItems ); |
74 | -} |
|
75 | -else |
|
73 | +} else |
|
76 | 74 | { |
77 | 75 | $response = null; |
78 | 76 | } |
@@ -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 = $this->getChildItems( $view->data, $include ); |
185 | - } |
|
186 | - else |
|
185 | + } else |
|
187 | 186 | { |
188 | 187 | $view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search ); |
189 | 188 | $view->listItems = $this->getListItems( array( $id => $view->data ), $include ); |
@@ -240,8 +239,7 @@ discard block |
||
240 | 239 | if( isset( $entry->parentid ) && $targetId !== null ) { |
241 | 240 | $manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId ); |
242 | 241 | } |
243 | - } |
|
244 | - else |
|
242 | + } else |
|
245 | 243 | { |
246 | 244 | $item = $manager->createItem(); |
247 | 245 | $item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() ); |
@@ -101,8 +101,7 @@ |
||
101 | 101 | $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] ); |
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\\Admin\\JsonAdm\\Common\\Decorator\\'; |
108 | 107 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
@@ -175,8 +175,7 @@ discard block |
||
175 | 175 | { |
176 | 176 | $view->data = $manager->searchItems( $search, [], $total ); |
177 | 177 | $view->childItems = $this->getChildItems( $view->data, $include ); |
178 | - } |
|
179 | - else |
|
178 | + } else |
|
180 | 179 | { |
181 | 180 | $view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search ); |
182 | 181 | $view->childItems = $this->getChildItems( array( $view->data ), $include ); |
@@ -211,8 +210,7 @@ discard block |
||
211 | 210 | if( isset( $entry->parentid ) && $targetId !== null ) { |
212 | 211 | $manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId ); |
213 | 212 | } |
214 | - } |
|
215 | - else |
|
213 | + } else |
|
216 | 214 | { |
217 | 215 | $item = $manager->createItem(); |
218 | 216 | $item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() ); |