@@ -33,11 +33,11 @@ discard block |
||
| 33 | 33 | * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface) |
| 34 | 34 | * @param string $path Path describing the client to clear, e.g. "product/lists/type" |
| 35 | 35 | */ |
| 36 | - static public function clear( $id = null, $path = null ) |
|
| 36 | + static public function clear($id = null, $path = null) |
|
| 37 | 37 | { |
| 38 | - if( $id !== null ) |
|
| 38 | + if ($id !== null) |
|
| 39 | 39 | { |
| 40 | - if( $path !== null ) { |
|
| 40 | + if ($path !== null) { |
|
| 41 | 41 | self::$clients[$id][$path] = null; |
| 42 | 42 | } else { |
| 43 | 43 | self::$clients[$id] = []; |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
| 66 | 66 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
| 67 | 67 | */ |
| 68 | - static public function createClient( \Aimeos\MShop\Context\Item\Iface $context, |
|
| 69 | - \Aimeos\Bootstrap $aimeos, $path, $name = null ) |
|
| 68 | + static public function createClient(\Aimeos\MShop\Context\Item\Iface $context, |
|
| 69 | + \Aimeos\Bootstrap $aimeos, $path, $name = null) |
|
| 70 | 70 | { |
| 71 | - $path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) ); |
|
| 71 | + $path = strtolower(trim($path, "/ \n\t\r\0\x0B")); |
|
| 72 | 72 | $id = (string) $context; |
| 73 | 73 | |
| 74 | - if( self::$cache === false || !isset( self::$clients[$id][$path] ) ) |
|
| 74 | + if (self::$cache === false || !isset(self::$clients[$id][$path])) |
|
| 75 | 75 | { |
| 76 | - if( empty( $path ) ) { |
|
| 77 | - self::$clients[$id][$path] = self::createClientRoot( $context, $aimeos, $path, $name ); |
|
| 76 | + if (empty($path)) { |
|
| 77 | + self::$clients[$id][$path] = self::createClientRoot($context, $aimeos, $path, $name); |
|
| 78 | 78 | } else { |
| 79 | - self::$clients[$id][$path] = self::createClientNew( $context, $aimeos, $path, $name ); |
|
| 79 | + self::$clients[$id][$path] = self::createClientNew($context, $aimeos, $path, $name); |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * @param boolean $value True to enable caching, false to disable it. |
| 91 | 91 | * @return boolean Previous cache setting |
| 92 | 92 | */ |
| 93 | - static public function setCache( $value ) |
|
| 93 | + static public function setCache($value) |
|
| 94 | 94 | { |
| 95 | 95 | $old = self::$cache; |
| 96 | 96 | self::$cache = (boolean) $value; |
@@ -109,53 +109,53 @@ discard block |
||
| 109 | 109 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
| 110 | 110 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
| 111 | 111 | */ |
| 112 | - protected static function createClientNew( \Aimeos\MShop\Context\Item\Iface $context, |
|
| 113 | - \Aimeos\Bootstrap $aimeos, $path, $name ) |
|
| 112 | + protected static function createClientNew(\Aimeos\MShop\Context\Item\Iface $context, |
|
| 113 | + \Aimeos\Bootstrap $aimeos, $path, $name) |
|
| 114 | 114 | { |
| 115 | 115 | $pname = $name; |
| 116 | - $parts = explode( '/', $path ); |
|
| 116 | + $parts = explode('/', $path); |
|
| 117 | 117 | |
| 118 | - foreach( $parts as $key => $part ) |
|
| 118 | + foreach ($parts as $key => $part) |
|
| 119 | 119 | { |
| 120 | - if( ctype_alnum( $part ) === false ) |
|
| 120 | + if (ctype_alnum($part) === false) |
|
| 121 | 121 | { |
| 122 | - $msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path ); |
|
| 123 | - throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 ); |
|
| 122 | + $msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path); |
|
| 123 | + throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - $parts[$key] = ucwords( $part ); |
|
| 126 | + $parts[$key] = ucwords($part); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - if( $pname === null ) { |
|
| 130 | - $pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' ); |
|
| 129 | + if ($pname === null) { |
|
| 130 | + $pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard'); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | $view = $context->getView(); |
| 134 | 134 | $config = $context->getConfig(); |
| 135 | 135 | |
| 136 | - if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) { |
|
| 137 | - throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JsonAdm "%1$s" client', $path ) ); |
|
| 136 | + if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) { |
|
| 137 | + throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JsonAdm "%1$s" client', $path)); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | |
| 141 | 141 | $view = $context->getView(); |
| 142 | 142 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
| 143 | - $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname; |
|
| 143 | + $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname; |
|
| 144 | 144 | |
| 145 | - if( ctype_alnum( $pname ) === false ) |
|
| 145 | + if (ctype_alnum($pname) === false) |
|
| 146 | 146 | { |
| 147 | - $classname = is_string( $pname ) ? $classname : '<not a string>'; |
|
| 148 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
| 147 | + $classname = is_string($pname) ? $classname : '<not a string>'; |
|
| 148 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - if( class_exists( $classname ) === false ) { |
|
| 152 | - return self::createClientRoot( $context, $aimeos, $path, $name ); |
|
| 151 | + if (class_exists($classname) === false) { |
|
| 152 | + return self::createClientRoot($context, $aimeos, $path, $name); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - $client = self::createClientBase( $classname, $iface, $context, $path ); |
|
| 156 | - $client = self::addClientDecorators( $client, $context, $path ); |
|
| 155 | + $client = self::createClientBase($classname, $iface, $context, $path); |
|
| 156 | + $client = self::addClientDecorators($client, $context, $path); |
|
| 157 | 157 | |
| 158 | - return $client->setAimeos( $aimeos )->setView( $view ); |
|
| 158 | + return $client->setAimeos($aimeos)->setView($view); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
| 170 | 170 | * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created |
| 171 | 171 | */ |
| 172 | - protected static function createClientRoot( \Aimeos\MShop\Context\Item\Iface $context, |
|
| 173 | - \Aimeos\Bootstrap $aimeos, $path, $name = null ) |
|
| 172 | + protected static function createClientRoot(\Aimeos\MShop\Context\Item\Iface $context, |
|
| 173 | + \Aimeos\Bootstrap $aimeos, $path, $name = null) |
|
| 174 | 174 | { |
| 175 | 175 | /** admin/jsonadm/name |
| 176 | 176 | * Class name of the used JSON API client implementation |
@@ -205,21 +205,21 @@ discard block |
||
| 205 | 205 | * @since 2015.12 |
| 206 | 206 | * @category Developer |
| 207 | 207 | */ |
| 208 | - if( $name === null ) { |
|
| 209 | - $name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' ); |
|
| 208 | + if ($name === null) { |
|
| 209 | + $name = $context->getConfig()->get('admin/jsonadm/name', 'Standard'); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | - if( ctype_alnum( $name ) === false ) |
|
| 212 | + if (ctype_alnum($name) === false) |
|
| 213 | 213 | { |
| 214 | - $classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
| 215 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
| 214 | + $classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
| 215 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | $view = $context->getView(); |
| 219 | 219 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
| 220 | 220 | $classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name; |
| 221 | 221 | |
| 222 | - $client = self::createClientBase( $classname, $iface, $context, $path ); |
|
| 222 | + $client = self::createClientBase($classname, $iface, $context, $path); |
|
| 223 | 223 | |
| 224 | 224 | /** admin/jsonadm/decorators/excludes |
| 225 | 225 | * Excludes decorators added by the "common" option from the JSON API clients |
@@ -299,8 +299,8 @@ discard block |
||
| 299 | 299 | * @see admin/jsonadm/decorators/global |
| 300 | 300 | */ |
| 301 | 301 | |
| 302 | - $client = self::addClientDecorators( $client, $context, $path ); |
|
| 302 | + $client = self::addClientDecorators($client, $context, $path); |
|
| 303 | 303 | |
| 304 | - return $client->setAimeos( $aimeos )->setView( $view ); |
|
| 304 | + return $client->setAimeos($aimeos)->setView($view); |
|
| 305 | 305 | } |
| 306 | 306 | } |
@@ -26,5 +26,5 @@ |
||
| 26 | 26 | * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object |
| 27 | 27 | * @param string $path Name of the client separated by slashes, e.g "order/base" |
| 28 | 28 | */ |
| 29 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, $path ); |
|
| 29 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, $path); |
|
| 30 | 30 | } |
@@ -110,30 +110,30 @@ 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 | $view = $this->getView(); |
| 116 | 116 | |
| 117 | 117 | try |
| 118 | 118 | { |
| 119 | - $response = $this->getItems( $view, $request, $response ); |
|
| 119 | + $response = $this->getItems($view, $request, $response); |
|
| 120 | 120 | $status = 200; |
| 121 | 121 | } |
| 122 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 122 | + catch (\Aimeos\MShop\Exception $e) |
|
| 123 | 123 | { |
| 124 | 124 | $status = 404; |
| 125 | - $view->errors = array( array( |
|
| 126 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 125 | + $view->errors = array(array( |
|
| 126 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
| 127 | 127 | 'detail' => $e->getTraceAsString(), |
| 128 | - ) ); |
|
| 128 | + )); |
|
| 129 | 129 | } |
| 130 | - catch( \Exception $e ) |
|
| 130 | + catch (\Exception $e) |
|
| 131 | 131 | { |
| 132 | 132 | $status = 500; |
| 133 | - $view->errors = array( array( |
|
| 133 | + $view->errors = array(array( |
|
| 134 | 134 | 'title' => $e->getMessage(), |
| 135 | 135 | 'detail' => $e->getTraceAsString(), |
| 136 | - ) ); |
|
| 136 | + )); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** admin/jsonadm/coupon/config/template-get |
@@ -158,11 +158,11 @@ discard block |
||
| 158 | 158 | $tplconf = 'admin/jsonadm/coupon/config/template-get'; |
| 159 | 159 | $default = 'config-standard.php'; |
| 160 | 160 | |
| 161 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 161 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 162 | 162 | |
| 163 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 164 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 165 | - ->withStatus( $status ); |
|
| 163 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 164 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 165 | + ->withStatus($status); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | |
@@ -174,18 +174,18 @@ discard block |
||
| 174 | 174 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 175 | 175 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 176 | 176 | */ |
| 177 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 177 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 178 | 178 | { |
| 179 | - if( ( $id = $view->param( 'id' ) ) == null ) { |
|
| 180 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
|
| 179 | + if (($id = $view->param('id')) == null) { |
|
| 180 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' ); |
|
| 183 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon'); |
|
| 184 | 184 | |
| 185 | 185 | $item = $manager->createItem(); |
| 186 | - $item->setProvider( $id ); |
|
| 186 | + $item->setProvider($id); |
|
| 187 | 187 | |
| 188 | - $view->configItems = $manager->getProvider( $item, null )->getConfigBE(); |
|
| 188 | + $view->configItems = $manager->getProvider($item, null)->getConfigBE(); |
|
| 189 | 189 | |
| 190 | 190 | return $response; |
| 191 | 191 | } |
@@ -110,30 +110,30 @@ 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 | $view = $this->getView(); |
| 116 | 116 | |
| 117 | 117 | try |
| 118 | 118 | { |
| 119 | - $response = $this->getItems( $view, $request, $response ); |
|
| 119 | + $response = $this->getItems($view, $request, $response); |
|
| 120 | 120 | $status = 200; |
| 121 | 121 | } |
| 122 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 122 | + catch (\Aimeos\MShop\Exception $e) |
|
| 123 | 123 | { |
| 124 | 124 | $status = 404; |
| 125 | - $view->errors = array( array( |
|
| 126 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 125 | + $view->errors = array(array( |
|
| 126 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
| 127 | 127 | 'detail' => $e->getTraceAsString(), |
| 128 | - ) ); |
|
| 128 | + )); |
|
| 129 | 129 | } |
| 130 | - catch( \Exception $e ) |
|
| 130 | + catch (\Exception $e) |
|
| 131 | 131 | { |
| 132 | 132 | $status = 500; |
| 133 | - $view->errors = array( array( |
|
| 133 | + $view->errors = array(array( |
|
| 134 | 134 | 'title' => $e->getMessage(), |
| 135 | 135 | 'detail' => $e->getTraceAsString(), |
| 136 | - ) ); |
|
| 136 | + )); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** admin/jsonadm/plugin/config/template-get |
@@ -158,11 +158,11 @@ discard block |
||
| 158 | 158 | $tplconf = 'admin/jsonadm/plugin/config/template-get'; |
| 159 | 159 | $default = 'config-standard.php'; |
| 160 | 160 | |
| 161 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 161 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 162 | 162 | |
| 163 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 164 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 165 | - ->withStatus( $status ); |
|
| 163 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 164 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 165 | + ->withStatus($status); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | |
@@ -174,16 +174,16 @@ discard block |
||
| 174 | 174 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 175 | 175 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 176 | 176 | */ |
| 177 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 177 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 178 | 178 | { |
| 179 | - if( ( $id = $view->param( 'id' ) ) == null ) { |
|
| 180 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
|
| 179 | + if (($id = $view->param('id')) == null) { |
|
| 180 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'plugin' ); |
|
| 184 | - $item = $manager->createItem()->setProvider( $id ); |
|
| 183 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin'); |
|
| 184 | + $item = $manager->createItem()->setProvider($id); |
|
| 185 | 185 | |
| 186 | - $view->configItems = $manager->getProvider( $item, 'order' )->getConfigBE(); |
|
| 186 | + $view->configItems = $manager->getProvider($item, 'order')->getConfigBE(); |
|
| 187 | 187 | |
| 188 | 188 | return $response; |
| 189 | 189 | } |
@@ -110,30 +110,30 @@ 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 | $view = $this->getView(); |
| 116 | 116 | |
| 117 | 117 | try |
| 118 | 118 | { |
| 119 | - $response = $this->getItems( $view, $request, $response ); |
|
| 119 | + $response = $this->getItems($view, $request, $response); |
|
| 120 | 120 | $status = 200; |
| 121 | 121 | } |
| 122 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 122 | + catch (\Aimeos\MShop\Exception $e) |
|
| 123 | 123 | { |
| 124 | 124 | $status = 404; |
| 125 | - $view->errors = array( array( |
|
| 126 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
| 125 | + $view->errors = array(array( |
|
| 126 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
| 127 | 127 | 'detail' => $e->getTraceAsString(), |
| 128 | - ) ); |
|
| 128 | + )); |
|
| 129 | 129 | } |
| 130 | - catch( \Exception $e ) |
|
| 130 | + catch (\Exception $e) |
|
| 131 | 131 | { |
| 132 | 132 | $status = 500; |
| 133 | - $view->errors = array( array( |
|
| 133 | + $view->errors = array(array( |
|
| 134 | 134 | 'title' => $e->getMessage(), |
| 135 | 135 | 'detail' => $e->getTraceAsString(), |
| 136 | - ) ); |
|
| 136 | + )); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** admin/jsonadm/service/config/template-get |
@@ -158,11 +158,11 @@ discard block |
||
| 158 | 158 | $tplconf = 'admin/jsonadm/service/config/template-get'; |
| 159 | 159 | $default = 'config-standard.php'; |
| 160 | 160 | |
| 161 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
| 161 | + $body = $view->render($view->config($tplconf, $default)); |
|
| 162 | 162 | |
| 163 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
| 164 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
| 165 | - ->withStatus( $status ); |
|
| 163 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
| 164 | + ->withBody($view->response()->createStreamFromString($body)) |
|
| 165 | + ->withStatus($status); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | |
@@ -174,16 +174,16 @@ discard block |
||
| 174 | 174 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 175 | 175 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 176 | 176 | */ |
| 177 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 177 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 178 | 178 | { |
| 179 | - if( ( $id = $view->param( 'id' ) ) == null ) { |
|
| 180 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
|
| 179 | + if (($id = $view->param('id')) == null) { |
|
| 180 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' ); |
|
| 184 | - $item = $manager->createItem()->setProvider( $id ); |
|
| 183 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service'); |
|
| 184 | + $item = $manager->createItem()->setProvider($id); |
|
| 185 | 185 | |
| 186 | - $view->configItems = $manager->getProvider( $item, $view->param( 'type', 'payment' ) )->getConfigBE(); |
|
| 186 | + $view->configItems = $manager->getProvider($item, $view->param('type', 'payment'))->getConfigBE(); |
|
| 187 | 187 | |
| 188 | 188 | return $response; |
| 189 | 189 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * @see admin/jsonadm/url/action |
| 23 | 23 | * @see admin/jsonadm/url/config |
| 24 | 24 | */ |
| 25 | -$target = $this->config( 'admin/jsonadm/url/target' ); |
|
| 25 | +$target = $this->config('admin/jsonadm/url/target'); |
|
| 26 | 26 | |
| 27 | 27 | /** admin/jsonadm/url/controller |
| 28 | 28 | * Name of the client whose action should be called |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * @see admin/jsonadm/url/action |
| 39 | 39 | * @see admin/jsonadm/url/config |
| 40 | 40 | */ |
| 41 | -$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); |
|
| 41 | +$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); |
|
| 42 | 42 | |
| 43 | 43 | /** admin/jsonadm/url/action |
| 44 | 44 | * Name of the action that should create the output |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @see admin/jsonadm/url/controller |
| 55 | 55 | * @see admin/jsonadm/url/config |
| 56 | 56 | */ |
| 57 | -$action = $this->config( 'admin/jsonadm/url/action', 'get' ); |
|
| 57 | +$action = $this->config('admin/jsonadm/url/action', 'get'); |
|
| 58 | 58 | |
| 59 | 59 | /** admin/jsonadm/url/config |
| 60 | 60 | * Associative list of configuration options used for generating the URL |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @see admin/jsonadm/url/controller |
| 77 | 77 | * @see admin/jsonadm/url/action |
| 78 | 78 | */ |
| 79 | -$config = $this->config( 'admin/jsonadm/url/config', [] ); |
|
| 79 | +$config = $this->config('admin/jsonadm/url/config', []); |
|
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | /** admin/jsonadm/partials/template-errors |
@@ -128,22 +128,22 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | |
| 130 | 130 | |
| 131 | -$total = $this->get( 'total', 0 ); |
|
| 132 | -$offset = max( $this->param( 'page/offset', 0 ), 0 ); |
|
| 133 | -$limit = max( $this->param( 'page/limit', 25 ), 1 ); |
|
| 131 | +$total = $this->get('total', 0); |
|
| 132 | +$offset = max($this->param('page/offset', 0), 0); |
|
| 133 | +$limit = max($this->param('page/limit', 25), 1); |
|
| 134 | 134 | |
| 135 | -$first = ( $offset > 0 ? 0 : null ); |
|
| 136 | -$prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
|
| 137 | -$next = ( $offset + $limit < $total ? $offset + $limit : null ); |
|
| 138 | -$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
| 135 | +$first = ($offset > 0 ? 0 : null); |
|
| 136 | +$prev = ($offset - $limit >= 0 ? $offset - $limit : null); |
|
| 137 | +$next = ($offset + $limit < $total ? $offset + $limit : null); |
|
| 138 | +$last = (((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null); |
|
| 139 | 139 | |
| 140 | 140 | |
| 141 | -$ref = array( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' ); |
|
| 142 | -$params = array_intersect_key( $this->param(), array_flip( $ref ) ) + ['id' => '']; |
|
| 143 | -$fields = $this->param( 'fields', [] ); |
|
| 141 | +$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields'); |
|
| 142 | +$params = array_intersect_key($this->param(), array_flip($ref)) + ['id' => '']; |
|
| 143 | +$fields = $this->param('fields', []); |
|
| 144 | 144 | |
| 145 | -foreach( (array) $fields as $resource => $list ) { |
|
| 146 | - $fields[$resource] = array_flip( explode( ',', $list ) ); |
|
| 145 | +foreach ((array) $fields as $resource => $list) { |
|
| 146 | + $fields[$resource] = array_flip(explode(',', $list)); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | "meta": { |
| 153 | 153 | "total": <?= $total; ?> |
| 154 | 154 | |
| 155 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
| 155 | + <?php if ($this->csrf()->name() != '') : ?> |
|
| 156 | 156 | , "csrf": { |
| 157 | 157 | "name": "<?= $this->csrf()->name(); ?>", |
| 158 | 158 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -163,42 +163,42 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | "links": { |
| 165 | 165 | |
| 166 | - <?php if( is_array( $this->get( 'data' ) ) ) : ?> |
|
| 166 | + <?php if (is_array($this->get('data'))) : ?> |
|
| 167 | 167 | |
| 168 | - <?php if( $first !== null ) : ?> |
|
| 168 | + <?php if ($first !== null) : ?> |
|
| 169 | 169 | |
| 170 | - "first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
| 170 | + "first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
| 171 | 171 | |
| 172 | 172 | <?php endif; ?> |
| 173 | - <?php if( $prev !== null ) : ?> |
|
| 173 | + <?php if ($prev !== null) : ?> |
|
| 174 | 174 | |
| 175 | - "prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
| 175 | + "prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
| 176 | 176 | |
| 177 | 177 | <?php endif; ?> |
| 178 | - <?php if( $next !== null ) : ?> |
|
| 178 | + <?php if ($next !== null) : ?> |
|
| 179 | 179 | |
| 180 | - "next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
| 180 | + "next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
| 181 | 181 | |
| 182 | 182 | <?php endif; ?> |
| 183 | - <?php if( $last !== null ) : ?> |
|
| 183 | + <?php if ($last !== null) : ?> |
|
| 184 | 184 | |
| 185 | - "last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
| 185 | + "last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
| 186 | 186 | |
| 187 | 187 | <?php endif; ?> |
| 188 | 188 | <?php endif; ?> |
| 189 | 189 | |
| 190 | - "self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>" |
|
| 190 | + "self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, [], $config); ?>" |
|
| 191 | 191 | }, |
| 192 | 192 | |
| 193 | - <?php if( isset( $this->errors ) ) : ?> |
|
| 193 | + <?php if (isset($this->errors)) : ?> |
|
| 194 | 194 | |
| 195 | - "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
| 195 | + "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
| 196 | 196 | |
| 197 | - <?php elseif( isset( $this->data ) ) : ?> |
|
| 197 | + <?php elseif (isset($this->data)) : ?> |
|
| 198 | 198 | |
| 199 | - "data": <?= $this->partial( $this->config( $this->get( 'partial-data', 'admin/jsonadm/partials/template-data' ), 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ), 'childItems' => $this->get( 'childItems', [] ), 'listItems' => $this->get( 'listItems', [] ) ) ); ?>, |
|
| 199 | + "data": <?= $this->partial($this->config($this->get('partial-data', 'admin/jsonadm/partials/template-data'), 'partials/data-standard.php'), array('data' => $this->get('data'), 'childItems' => $this->get('childItems', []), 'listItems' => $this->get('listItems', []))); ?>, |
|
| 200 | 200 | |
| 201 | - "included": <?= $this->partial( $this->config( $this->get( 'partial-included', 'admin/jsonadm/partials/template-included' ), 'partials/included-standard.php' ), array( 'childItems' => $this->get( 'childItems', [] ), 'refItems' => $this->get( 'refItems', [] ) ) ); ?> |
|
| 201 | + "included": <?= $this->partial($this->config($this->get('partial-included', 'admin/jsonadm/partials/template-included'), 'partials/included-standard.php'), array('childItems' => $this->get('childItems', []), 'refItems' => $this->get('refItems', []))); ?> |
|
| 202 | 202 | |
| 203 | 203 | <?php endif; ?> |
| 204 | 204 | |
@@ -10,9 +10,9 @@ |
||
| 10 | 10 | |
| 11 | 11 | ?> |
| 12 | 12 | { |
| 13 | - <?php if( isset( $this->errors ) ) : ?> |
|
| 13 | + <?php if (isset($this->errors)) : ?> |
|
| 14 | 14 | |
| 15 | - "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
| 15 | + "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
| 16 | 16 | |
| 17 | 17 | <?php endif; ?> |
| 18 | 18 | |
@@ -8,32 +8,32 @@ discard block |
||
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | 10 | |
| 11 | -$target = $this->config( 'admin/jsonadm/url/target' ); |
|
| 12 | -$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); |
|
| 13 | -$action = $this->config( 'admin/jsonadm/url/action', 'get' ); |
|
| 14 | -$config = $this->config( 'admin/jsonadm/url/config', [] ); |
|
| 11 | +$target = $this->config('admin/jsonadm/url/target'); |
|
| 12 | +$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); |
|
| 13 | +$action = $this->config('admin/jsonadm/url/action', 'get'); |
|
| 14 | +$config = $this->config('admin/jsonadm/url/config', []); |
|
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | $resources = $attributes = []; |
| 18 | -$site = $this->param( 'site', 'default' ); |
|
| 18 | +$site = $this->param('site', 'default'); |
|
| 19 | 19 | |
| 20 | -foreach( $this->get( 'resources', [] ) as $resource ) { |
|
| 21 | - $resources[$resource] = $this->url( $target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config ); |
|
| 20 | +foreach ($this->get('resources', []) as $resource) { |
|
| 21 | + $resources[$resource] = $this->url($target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | -foreach( $this->get( 'attributes', [] ) as $attr ) { |
|
| 25 | - $attributes[$attr->getCode()] = $attr->toArray( true ); |
|
| 24 | +foreach ($this->get('attributes', []) as $attr) { |
|
| 25 | + $attributes[$attr->getCode()] = $attr->toArray(true); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | ?> |
| 30 | 30 | { |
| 31 | 31 | "meta": { |
| 32 | - "prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>, |
|
| 33 | - "resources": <?= json_encode( $resources ); ?>, |
|
| 34 | - "attributes": <?= json_encode( $attributes ); ?> |
|
| 32 | + "prefix": <?= json_encode($this->get('prefix')); ?>, |
|
| 33 | + "resources": <?= json_encode($resources); ?>, |
|
| 34 | + "attributes": <?= json_encode($attributes); ?> |
|
| 35 | 35 | |
| 36 | - <?php if( $this->csrf()->name() != '' ) : ?> |
|
| 36 | + <?php if ($this->csrf()->name() != '') : ?> |
|
| 37 | 37 | , "csrf": { |
| 38 | 38 | "name": "<?= $this->csrf()->name(); ?>", |
| 39 | 39 | "value": "<?= $this->csrf()->value(); ?>" |
@@ -41,9 +41,9 @@ discard block |
||
| 41 | 41 | <?php endif; ?> |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - <?php if( isset( $this->errors ) ) : ?> |
|
| 44 | + <?php if (isset($this->errors)) : ?> |
|
| 45 | 45 | |
| 46 | - ,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
| 46 | + ,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
| 47 | 47 | |
| 48 | 48 | <?php endif; ?> |
| 49 | 49 | |
@@ -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.php' ), array( 'errors' => $this->errors ) ); ?> |
|
| 27 | + , "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), 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.php' ), array( 'data' => $this->get( 'data' ) ) ); ?> |
|
| 31 | + , "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?> |
|
| 32 | 32 | |
| 33 | 33 | <?php endif; ?> |
| 34 | 34 | |