@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @param RequestStack $requestStack Current request stack |
| 33 | 33 | * @param Container $container Container object to access parameters |
| 34 | 34 | */ |
| 35 | - public function __construct( RequestStack $requestStack, Container $container ) |
|
| 35 | + public function __construct(RequestStack $requestStack, Container $container) |
|
| 36 | 36 | { |
| 37 | 37 | $this->requestStack = $requestStack; |
| 38 | 38 | $this->container = $container; |
@@ -47,27 +47,27 @@ discard block |
||
| 47 | 47 | * @param string|null $locale Code of the current language or null for no translation |
| 48 | 48 | * @return \Aimeos\MW\View\Iface View object |
| 49 | 49 | */ |
| 50 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
| 50 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
| 51 | 51 | { |
| 52 | - $twig = $this->container->get( 'twig' ); |
|
| 53 | - $engine = new \Aimeos\MW\View\Engine\Twig( $twig ); |
|
| 54 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.html.twig' => $engine ) ); |
|
| 52 | + $twig = $this->container->get('twig'); |
|
| 53 | + $engine = new \Aimeos\MW\View\Engine\Twig($twig); |
|
| 54 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.html.twig' => $engine)); |
|
| 55 | 55 | |
| 56 | 56 | $config = $context->getConfig(); |
| 57 | 57 | $session = $context->getSession(); |
| 58 | 58 | |
| 59 | - $this->addCsrf( $view ); |
|
| 60 | - $this->addAccess( $view, $context ); |
|
| 61 | - $this->addConfig( $view, $config ); |
|
| 62 | - $this->addNumber( $view, $config ); |
|
| 63 | - $this->addParam( $view ); |
|
| 64 | - $this->addRequest( $view ); |
|
| 65 | - $this->addResponse( $view ); |
|
| 66 | - $this->addSession( $view, $session ); |
|
| 67 | - $this->addTranslate( $view, $locale ); |
|
| 68 | - $this->addUrl( $view ); |
|
| 59 | + $this->addCsrf($view); |
|
| 60 | + $this->addAccess($view, $context); |
|
| 61 | + $this->addConfig($view, $config); |
|
| 62 | + $this->addNumber($view, $config); |
|
| 63 | + $this->addParam($view); |
|
| 64 | + $this->addRequest($view); |
|
| 65 | + $this->addResponse($view); |
|
| 66 | + $this->addSession($view, $session); |
|
| 67 | + $this->addTranslate($view, $locale); |
|
| 68 | + $this->addUrl($view); |
|
| 69 | 69 | |
| 70 | - $this->initTwig( $view, $twig ); |
|
| 70 | + $this->initTwig($view, $twig); |
|
| 71 | 71 | |
| 72 | 72 | return $view; |
| 73 | 73 | } |
@@ -80,26 +80,26 @@ discard block |
||
| 80 | 80 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 81 | 81 | * @return \Aimeos\MW\View\Iface Modified view object |
| 82 | 82 | */ |
| 83 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 83 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
| 84 | 84 | { |
| 85 | 85 | $container = $this->container; |
| 86 | - $token = $this->container->get( 'security.token_storage' )->getToken(); |
|
| 86 | + $token = $this->container->get('security.token_storage')->getToken(); |
|
| 87 | 87 | |
| 88 | - if( is_object( $token ) && is_object( $token->getUser() ) |
|
| 89 | - && in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) ) |
|
| 88 | + if (is_object($token) && is_object($token->getUser()) |
|
| 89 | + && in_array('ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles())) |
|
| 90 | 90 | { |
| 91 | - $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
|
| 91 | + $helper = new \Aimeos\MW\View\Helper\Access\All($view); |
|
| 92 | 92 | } |
| 93 | 93 | else |
| 94 | 94 | { |
| 95 | - $fcn = function() use ( $container, $context ) { |
|
| 96 | - return $container->get( 'aimeos_support' )->getGroups( $context ); |
|
| 95 | + $fcn = function() use ($container, $context) { |
|
| 96 | + return $container->get('aimeos_support')->getGroups($context); |
|
| 97 | 97 | }; |
| 98 | 98 | |
| 99 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
| 99 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - $view->addHelper( 'access', $helper ); |
|
| 102 | + $view->addHelper('access', $helper); |
|
| 103 | 103 | |
| 104 | 104 | return $view; |
| 105 | 105 | } |
@@ -112,11 +112,11 @@ discard block |
||
| 112 | 112 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 113 | 113 | * @return \Aimeos\MW\View\Iface Modified view object |
| 114 | 114 | */ |
| 115 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 115 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 116 | 116 | { |
| 117 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
| 118 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 119 | - $view->addHelper( 'config', $helper ); |
|
| 117 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
| 118 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 119 | + $view->addHelper('config', $helper); |
|
| 120 | 120 | |
| 121 | 121 | return $view; |
| 122 | 122 | } |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | * @param \Aimeos\MW\View\Iface $view View object |
| 129 | 129 | * @return \Aimeos\MW\View\Iface Modified view object |
| 130 | 130 | */ |
| 131 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
| 131 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
| 132 | 132 | { |
| 133 | - $token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' ); |
|
| 134 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() ); |
|
| 135 | - $view->addHelper( 'csrf', $helper ); |
|
| 133 | + $token = $this->container->get('security.csrf.token_manager')->getToken('_token'); |
|
| 134 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue()); |
|
| 135 | + $view->addHelper('csrf', $helper); |
|
| 136 | 136 | |
| 137 | 137 | return $view; |
| 138 | 138 | } |
@@ -145,14 +145,14 @@ discard block |
||
| 145 | 145 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 146 | 146 | * @return \Aimeos\MW\View\Iface Modified view object |
| 147 | 147 | */ |
| 148 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 148 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 149 | 149 | { |
| 150 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
| 151 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
| 152 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
| 150 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
| 151 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
| 152 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
| 153 | 153 | |
| 154 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
| 155 | - $view->addHelper( 'number', $helper ); |
|
| 154 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
| 155 | + $view->addHelper('number', $helper); |
|
| 156 | 156 | |
| 157 | 157 | return $view; |
| 158 | 158 | } |
@@ -164,17 +164,17 @@ discard block |
||
| 164 | 164 | * @param \Aimeos\MW\View\Iface $view View object |
| 165 | 165 | * @return \Aimeos\MW\View\Iface Modified view object |
| 166 | 166 | */ |
| 167 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
| 167 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
| 168 | 168 | { |
| 169 | 169 | $params = array(); |
| 170 | 170 | $request = $this->requestStack->getMasterRequest(); |
| 171 | 171 | |
| 172 | - if( $request !== null ) { |
|
| 173 | - $params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' ); |
|
| 172 | + if ($request !== null) { |
|
| 173 | + $params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params'); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 177 | - $view->addHelper( 'param', $helper ); |
|
| 176 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 177 | + $view->addHelper('param', $helper); |
|
| 178 | 178 | |
| 179 | 179 | return $view; |
| 180 | 180 | } |
@@ -186,14 +186,14 @@ discard block |
||
| 186 | 186 | * @param \Aimeos\MW\View\Iface $view View object |
| 187 | 187 | * @return \Aimeos\MW\View\Iface Modified view object |
| 188 | 188 | */ |
| 189 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
| 189 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
| 190 | 190 | { |
| 191 | 191 | $request = $this->requestStack->getMasterRequest(); |
| 192 | 192 | |
| 193 | - if( $request !== null ) |
|
| 193 | + if ($request !== null) |
|
| 194 | 194 | { |
| 195 | - $helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request ); |
|
| 196 | - $view->addHelper( 'request', $helper ); |
|
| 195 | + $helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request); |
|
| 196 | + $view->addHelper('request', $helper); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | return $view; |
@@ -206,10 +206,10 @@ discard block |
||
| 206 | 206 | * @param \Aimeos\MW\View\Iface $view View object |
| 207 | 207 | * @return \Aimeos\MW\View\Iface Modified view object |
| 208 | 208 | */ |
| 209 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) |
|
| 209 | + protected function addResponse(\Aimeos\MW\View\Iface $view) |
|
| 210 | 210 | { |
| 211 | - $helper = new \Aimeos\MW\View\Helper\Response\Symfony2( $view ); |
|
| 212 | - $view->addHelper( 'response', $helper ); |
|
| 211 | + $helper = new \Aimeos\MW\View\Helper\Response\Symfony2($view); |
|
| 212 | + $view->addHelper('response', $helper); |
|
| 213 | 213 | |
| 214 | 214 | return $view; |
| 215 | 215 | } |
@@ -222,10 +222,10 @@ discard block |
||
| 222 | 222 | * @param \Aimeos\MW\Session\Iface $session Session object |
| 223 | 223 | * @return \Aimeos\MW\View\Iface Modified view object |
| 224 | 224 | */ |
| 225 | - protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session ) |
|
| 225 | + protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session) |
|
| 226 | 226 | { |
| 227 | - $helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session ); |
|
| 228 | - $view->addHelper( 'session', $helper ); |
|
| 227 | + $helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session); |
|
| 228 | + $view->addHelper('session', $helper); |
|
| 229 | 229 | |
| 230 | 230 | return $view; |
| 231 | 231 | } |
@@ -238,20 +238,20 @@ discard block |
||
| 238 | 238 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
| 239 | 239 | * @return \Aimeos\MW\View\Iface Modified view object |
| 240 | 240 | */ |
| 241 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) |
|
| 241 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) |
|
| 242 | 242 | { |
| 243 | - if( $locale !== null ) |
|
| 243 | + if ($locale !== null) |
|
| 244 | 244 | { |
| 245 | - $i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) ); |
|
| 245 | + $i18n = $this->container->get('aimeos_i18n')->get(array($locale)); |
|
| 246 | 246 | $translation = $i18n[$locale]; |
| 247 | 247 | } |
| 248 | 248 | else |
| 249 | 249 | { |
| 250 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 250 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 254 | - $view->addHelper( 'translate', $helper ); |
|
| 253 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 254 | + $view->addHelper('translate', $helper); |
|
| 255 | 255 | |
| 256 | 256 | return $view; |
| 257 | 257 | } |
@@ -263,30 +263,30 @@ discard block |
||
| 263 | 263 | * @param \Aimeos\MW\View\Iface $view View object |
| 264 | 264 | * @return \Aimeos\MW\View\Iface Modified view object |
| 265 | 265 | */ |
| 266 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
| 266 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
| 267 | 267 | { |
| 268 | 268 | $fixed = array(); |
| 269 | 269 | $request = $this->requestStack->getMasterRequest(); |
| 270 | 270 | |
| 271 | - if( $request !== null ) |
|
| 271 | + if ($request !== null) |
|
| 272 | 272 | { |
| 273 | 273 | $attr = $request->attributes; |
| 274 | 274 | |
| 275 | - if( ( $site = $attr->get( 'site' ) ) !== null ) { |
|
| 275 | + if (($site = $attr->get('site')) !== null) { |
|
| 276 | 276 | $fixed['site'] = $site; |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | - if( ( $lang = $attr->get( 'locale' ) ) !== null ) { |
|
| 279 | + if (($lang = $attr->get('locale')) !== null) { |
|
| 280 | 280 | $fixed['locale'] = $lang; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - if( ( $currency = $attr->get( 'currency' ) ) !== null ) { |
|
| 283 | + if (($currency = $attr->get('currency')) !== null) { |
|
| 284 | 284 | $fixed['currency'] = $currency; |
| 285 | 285 | } |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - $helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed ); |
|
| 289 | - $view->addHelper( 'url', $helper ); |
|
| 288 | + $helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed); |
|
| 289 | + $view->addHelper('url', $helper); |
|
| 290 | 290 | |
| 291 | 291 | return $view; |
| 292 | 292 | } |
@@ -298,21 +298,21 @@ discard block |
||
| 298 | 298 | * @param \Aimeos\MW\View\Iface $view View object |
| 299 | 299 | * @param \Twig_Environment $twig Twig environment object |
| 300 | 300 | */ |
| 301 | - protected function initTwig( \Aimeos\MW\View\Iface $view, \Twig_Environment $twig ) |
|
| 301 | + protected function initTwig(\Aimeos\MW\View\Iface $view, \Twig_Environment $twig) |
|
| 302 | 302 | { |
| 303 | - $fcn = function( $key, $default = null ) use ( $view ) { |
|
| 304 | - return $view->config( $key, $default ); |
|
| 303 | + $fcn = function($key, $default = null) use ($view) { |
|
| 304 | + return $view->config($key, $default); |
|
| 305 | 305 | }; |
| 306 | - $twig->addFunction( new \Twig_SimpleFunction( 'aiconfig', $fcn ) ); |
|
| 306 | + $twig->addFunction(new \Twig_SimpleFunction('aiconfig', $fcn)); |
|
| 307 | 307 | |
| 308 | - $fcn = function( $singular, array $values = array(), $domain = 'client' ) use ( $view ) { |
|
| 309 | - return vsprintf( $view->translate( $domain, $singular ), $values ); |
|
| 308 | + $fcn = function($singular, array $values = array(), $domain = 'client') use ($view) { |
|
| 309 | + return vsprintf($view->translate($domain, $singular), $values); |
|
| 310 | 310 | }; |
| 311 | - $twig->addFunction( new \Twig_SimpleFunction( 'aitrans', $fcn ) ); |
|
| 311 | + $twig->addFunction(new \Twig_SimpleFunction('aitrans', $fcn)); |
|
| 312 | 312 | |
| 313 | - $fcn = function( $singular, $plural, $number, array $values = array(), $domain = 'client' ) use ( $view ) { |
|
| 314 | - return vsprintf( $view->translate( $domain, $singular, $plural, $number ), $values ); |
|
| 313 | + $fcn = function($singular, $plural, $number, array $values = array(), $domain = 'client') use ($view) { |
|
| 314 | + return vsprintf($view->translate($domain, $singular, $plural, $number), $values); |
|
| 315 | 315 | }; |
| 316 | - $twig->addFunction( new \Twig_SimpleFunction( 'aitransplural', $fcn ) ); |
|
| 316 | + $twig->addFunction(new \Twig_SimpleFunction('aitransplural', $fcn)); |
|
| 317 | 317 | } |
| 318 | 318 | } |
@@ -89,8 +89,7 @@ discard block |
||
| 89 | 89 | && in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) ) |
| 90 | 90 | { |
| 91 | 91 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
| 92 | - } |
|
| 93 | - else |
|
| 92 | + } else |
|
| 94 | 93 | { |
| 95 | 94 | $fcn = function() use ( $container, $context ) { |
| 96 | 95 | return $container->get( 'aimeos_support' )->getGroups( $context ); |
@@ -244,8 +243,7 @@ discard block |
||
| 244 | 243 | { |
| 245 | 244 | $i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) ); |
| 246 | 245 | $translation = $i18n[$locale]; |
| 247 | - } |
|
| 248 | - else |
|
| 246 | + } else |
|
| 249 | 247 | { |
| 250 | 248 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 251 | 249 | } |
@@ -11,312 +11,312 @@ |
||
| 11 | 11 | public function testCount() |
| 12 | 12 | { |
| 13 | 13 | $client = static::createClient(); |
| 14 | - $client->request( 'GET', '/unittest/de/EUR/count' ); |
|
| 14 | + $client->request('GET', '/unittest/de/EUR/count'); |
|
| 15 | 15 | $content = $client->getResponse()->getContent(); |
| 16 | 16 | |
| 17 | - $this->assertContains( '".catalog-filter-count li.cat-item"', $content ); |
|
| 18 | - $this->assertContains( '".catalog-filter-attribute .attribute-lists li.attr-item"', $content ); |
|
| 17 | + $this->assertContains('".catalog-filter-count li.cat-item"', $content); |
|
| 18 | + $this->assertContains('".catalog-filter-attribute .attribute-lists li.attr-item"', $content); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | |
| 22 | 22 | public function testFilterSearch() |
| 23 | 23 | { |
| 24 | 24 | $client = static::createClient(); |
| 25 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 25 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 26 | 26 | |
| 27 | - $this->assertEquals( 1, $crawler->filter( '.catalog-filter-search' )->count() ); |
|
| 27 | + $this->assertEquals(1, $crawler->filter('.catalog-filter-search')->count()); |
|
| 28 | 28 | |
| 29 | - $form = $crawler->filter( '.catalog-filter-search button' )->form(); |
|
| 29 | + $form = $crawler->filter('.catalog-filter-search button')->form(); |
|
| 30 | 30 | $form['f_search'] = 'Unit'; |
| 31 | - $crawler = $client->submit( $form ); |
|
| 31 | + $crawler = $client->submit($form); |
|
| 32 | 32 | |
| 33 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Test Selection")' )->count() ); |
|
| 34 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Empty Selection")' )->count() ); |
|
| 35 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->count() ); |
|
| 33 | + $this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Test Selection")')->count()); |
|
| 34 | + $this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Empty Selection")')->count()); |
|
| 35 | + $this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->count()); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testFilterTree() |
| 40 | 40 | { |
| 41 | 41 | $client = static::createClient(); |
| 42 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 42 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 43 | 43 | |
| 44 | - $this->assertEquals( 1, $crawler->filter( '.catalog-filter-tree' )->count() ); |
|
| 44 | + $this->assertEquals(1, $crawler->filter('.catalog-filter-tree')->count()); |
|
| 45 | 45 | |
| 46 | - $link = $crawler->filter( '.catalog-filter-tree a.cat-item' )->link(); |
|
| 47 | - $crawler = $client->click( $link ); |
|
| 46 | + $link = $crawler->filter('.catalog-filter-tree a.cat-item')->link(); |
|
| 47 | + $crawler = $client->click($link); |
|
| 48 | 48 | |
| 49 | - $link = $crawler->filter( '.catalog-filter-tree .categories a.cat-item' )->link(); |
|
| 50 | - $crawler = $client->click( $link ); |
|
| 49 | + $link = $crawler->filter('.catalog-filter-tree .categories a.cat-item')->link(); |
|
| 50 | + $crawler = $client->click($link); |
|
| 51 | 51 | |
| 52 | - $link = $crawler->filter( '.catalog-filter-tree .coffee a.cat-item' )->link(); |
|
| 53 | - $crawler = $client->click( $link ); |
|
| 52 | + $link = $crawler->filter('.catalog-filter-tree .coffee a.cat-item')->link(); |
|
| 53 | + $crawler = $client->click($link); |
|
| 54 | 54 | |
| 55 | - $this->assertEquals( 3, $crawler->filter( '.catalog-stage-breadcrumb li' )->count() ); |
|
| 56 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-promo .product a:contains("Cafe Noire Expresso")' )->count() ); |
|
| 55 | + $this->assertEquals(3, $crawler->filter('.catalog-stage-breadcrumb li')->count()); |
|
| 56 | + $this->assertEquals(1, $crawler->filter('.catalog-list-promo .product a:contains("Cafe Noire Expresso")')->count()); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | public function testFilterAttribute() |
| 61 | 61 | { |
| 62 | 62 | $client = static::createClient(); |
| 63 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 63 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 64 | 64 | |
| 65 | - $this->assertEquals( 1, $crawler->filter( '.catalog-filter-attribute' )->count() ); |
|
| 65 | + $this->assertEquals(1, $crawler->filter('.catalog-filter-attribute')->count()); |
|
| 66 | 66 | |
| 67 | - $nodes = $crawler->filter( '.catalog-filter-attribute .attr-size span:contains("XS")' ); |
|
| 68 | - $id = $nodes->parents()->filter( '.attr-item' )->attr( 'data-id'); |
|
| 67 | + $nodes = $crawler->filter('.catalog-filter-attribute .attr-size span:contains("XS")'); |
|
| 68 | + $id = $nodes->parents()->filter('.attr-item')->attr('data-id'); |
|
| 69 | 69 | |
| 70 | - $form = $crawler->filter( '.catalog-filter .btn-primary' )->form(); |
|
| 70 | + $form = $crawler->filter('.catalog-filter .btn-primary')->form(); |
|
| 71 | 71 | $values = $form->getPhpValues(); |
| 72 | - $values['f_attrid'] = array( $id ); |
|
| 73 | - $crawler = $client->request( $form->getMethod(), $form->getUri(), $values, $form->getPhpFiles() ); |
|
| 72 | + $values['f_attrid'] = array($id); |
|
| 73 | + $crawler = $client->request($form->getMethod(), $form->getUri(), $values, $form->getPhpFiles()); |
|
| 74 | 74 | |
| 75 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->count() ); |
|
| 76 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Cappuccino")' )->count() ); |
|
| 75 | + $this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->count()); |
|
| 76 | + $this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Cappuccino")')->count()); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | |
| 80 | 80 | public function testStageBreadcrumb() |
| 81 | 81 | { |
| 82 | 82 | $client = static::createClient(); |
| 83 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 83 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 84 | 84 | |
| 85 | - $link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link(); |
|
| 86 | - $crawler = $client->click( $link ); |
|
| 85 | + $link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link(); |
|
| 86 | + $crawler = $client->click($link); |
|
| 87 | 87 | |
| 88 | - $this->assertEquals( 1, $crawler->filter( '.catalog-stage-breadcrumb li' )->count() ); |
|
| 88 | + $this->assertEquals(1, $crawler->filter('.catalog-stage-breadcrumb li')->count()); |
|
| 89 | 89 | |
| 90 | - $link = $crawler->filter( '.catalog-stage-breadcrumb a' )->link(); |
|
| 91 | - $crawler = $client->click( $link ); |
|
| 90 | + $link = $crawler->filter('.catalog-stage-breadcrumb a')->link(); |
|
| 91 | + $crawler = $client->click($link); |
|
| 92 | 92 | |
| 93 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list' )->count() ); |
|
| 94 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->count() ); |
|
| 95 | - $this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Cappuccino")' )->count() ); |
|
| 93 | + $this->assertEquals(1, $crawler->filter('.catalog-list')->count()); |
|
| 94 | + $this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->count()); |
|
| 95 | + $this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Cappuccino")')->count()); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
| 99 | 99 | public function testStageNavigator() |
| 100 | 100 | { |
| 101 | 101 | $client = static::createClient(); |
| 102 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 102 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 103 | 103 | |
| 104 | - $link = $crawler->filter( '.catalog-list .pagination .option-name' )->link(); |
|
| 105 | - $crawler = $client->click( $link ); |
|
| 104 | + $link = $crawler->filter('.catalog-list .pagination .option-name')->link(); |
|
| 105 | + $crawler = $client->click($link); |
|
| 106 | 106 | |
| 107 | - $link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link(); |
|
| 108 | - $crawler = $client->click( $link ); |
|
| 107 | + $link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link(); |
|
| 108 | + $crawler = $client->click($link); |
|
| 109 | 109 | |
| 110 | - $this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() ); |
|
| 111 | - $this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Bundle")' )->count() ); |
|
| 110 | + $this->assertEquals(1, $crawler->filter('.catalog-detail')->count()); |
|
| 111 | + $this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Bundle")')->count()); |
|
| 112 | 112 | |
| 113 | - $link = $crawler->filter( '.catalog-stage-navigator a.next' )->link(); |
|
| 114 | - $crawler = $client->click( $link ); |
|
| 113 | + $link = $crawler->filter('.catalog-stage-navigator a.next')->link(); |
|
| 114 | + $crawler = $client->click($link); |
|
| 115 | 115 | |
| 116 | - $this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() ); |
|
| 117 | - $this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Empty Selection")' )->count() ); |
|
| 116 | + $this->assertEquals(1, $crawler->filter('.catalog-detail')->count()); |
|
| 117 | + $this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Empty Selection")')->count()); |
|
| 118 | 118 | |
| 119 | - $link = $crawler->filter( '.catalog-stage-navigator a.prev' )->link(); |
|
| 120 | - $crawler = $client->click( $link ); |
|
| 119 | + $link = $crawler->filter('.catalog-stage-navigator a.prev')->link(); |
|
| 120 | + $crawler = $client->click($link); |
|
| 121 | 121 | |
| 122 | - $this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() ); |
|
| 123 | - $this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Bundle")' )->count() ); |
|
| 122 | + $this->assertEquals(1, $crawler->filter('.catalog-detail')->count()); |
|
| 123 | + $this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Bundle")')->count()); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | |
| 127 | 127 | public function testListSortationName() |
| 128 | 128 | { |
| 129 | 129 | $client = static::createClient(); |
| 130 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 130 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 131 | 131 | |
| 132 | - $link = $crawler->filter( '.catalog-list .pagination .option-name' )->link(); |
|
| 133 | - $crawler = $client->click( $link ); |
|
| 132 | + $link = $crawler->filter('.catalog-list .pagination .option-name')->link(); |
|
| 133 | + $crawler = $client->click($link); |
|
| 134 | 134 | |
| 135 | - $products = $crawler->filter( '.catalog-list-items .product' ); |
|
| 136 | - $this->assertEquals( 1, $products->eq( 0 )->filter( 'h2:contains("16 discs")' )->count() ); |
|
| 137 | - $this->assertEquals( 1, $products->eq( 1 )->filter( 'h2:contains("Cafe Noire Cappuccino")' )->count() ); |
|
| 138 | - $this->assertEquals( 1, $products->eq( 2 )->filter( 'h2:contains("Cafe Noire Expresso")' )->count() ); |
|
| 139 | - $this->assertEquals( 1, $products->eq( 3 )->filter( 'h2:contains("Unittest: Bundle")' )->count() ); |
|
| 140 | - $this->assertEquals( 1, $products->eq( 4 )->filter( 'h2:contains("Unittest: Empty Selection")' )->count() ); |
|
| 135 | + $products = $crawler->filter('.catalog-list-items .product'); |
|
| 136 | + $this->assertEquals(1, $products->eq(0)->filter('h2:contains("16 discs")')->count()); |
|
| 137 | + $this->assertEquals(1, $products->eq(1)->filter('h2:contains("Cafe Noire Cappuccino")')->count()); |
|
| 138 | + $this->assertEquals(1, $products->eq(2)->filter('h2:contains("Cafe Noire Expresso")')->count()); |
|
| 139 | + $this->assertEquals(1, $products->eq(3)->filter('h2:contains("Unittest: Bundle")')->count()); |
|
| 140 | + $this->assertEquals(1, $products->eq(4)->filter('h2:contains("Unittest: Empty Selection")')->count()); |
|
| 141 | 141 | |
| 142 | - $link = $crawler->filter( '.catalog-list .pagination .option-name' )->link(); |
|
| 143 | - $crawler = $client->click( $link ); |
|
| 142 | + $link = $crawler->filter('.catalog-list .pagination .option-name')->link(); |
|
| 143 | + $crawler = $client->click($link); |
|
| 144 | 144 | |
| 145 | - $products = $crawler->filter( '.catalog-list-items .product' ); |
|
| 145 | + $products = $crawler->filter('.catalog-list-items .product'); |
|
| 146 | 146 | $count = $products->count(); |
| 147 | 147 | |
| 148 | - $this->assertGreaterThan( 2, $count ); |
|
| 149 | - $this->assertEquals( 1, $products->eq( $count - 1 )->filter( 'h2:contains("16 discs")' )->count() ); |
|
| 150 | - $this->assertEquals( 1, $products->eq( $count - 2 )->filter( 'h2:contains("Cafe Noire Cappuccino")' )->count() ); |
|
| 148 | + $this->assertGreaterThan(2, $count); |
|
| 149 | + $this->assertEquals(1, $products->eq($count - 1)->filter('h2:contains("16 discs")')->count()); |
|
| 150 | + $this->assertEquals(1, $products->eq($count - 2)->filter('h2:contains("Cafe Noire Cappuccino")')->count()); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
| 154 | 154 | public function testListSortationPrice() |
| 155 | 155 | { |
| 156 | 156 | $client = static::createClient(); |
| 157 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 157 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 158 | 158 | |
| 159 | - $link = $crawler->filter( '.catalog-list .pagination .option-price' )->link(); |
|
| 160 | - $crawler = $client->click( $link ); |
|
| 159 | + $link = $crawler->filter('.catalog-list .pagination .option-price')->link(); |
|
| 160 | + $crawler = $client->click($link); |
|
| 161 | 161 | |
| 162 | - $products = $crawler->filter( '.catalog-list-items .product' ); |
|
| 162 | + $products = $crawler->filter('.catalog-list-items .product'); |
|
| 163 | 163 | $count = $products->count(); |
| 164 | 164 | |
| 165 | - $this->assertGreaterThan( 2, $count ); |
|
| 166 | - $this->assertEquals( 1, $products->eq( $count - 2 )->filter( '.value:contains("600.00 €")' )->count() ); |
|
| 167 | - $this->assertEquals( 1, $products->eq( $count - 1 )->filter( '.value:contains("600.00 €")' )->count() ); |
|
| 165 | + $this->assertGreaterThan(2, $count); |
|
| 166 | + $this->assertEquals(1, $products->eq($count - 2)->filter('.value:contains("600.00 €")')->count()); |
|
| 167 | + $this->assertEquals(1, $products->eq($count - 1)->filter('.value:contains("600.00 €")')->count()); |
|
| 168 | 168 | |
| 169 | - $link = $crawler->filter( '.catalog-list .pagination .option-price' )->link(); |
|
| 170 | - $crawler = $client->click( $link ); |
|
| 169 | + $link = $crawler->filter('.catalog-list .pagination .option-price')->link(); |
|
| 170 | + $crawler = $client->click($link); |
|
| 171 | 171 | |
| 172 | - $products = $crawler->filter( '.catalog-list-items .product' ); |
|
| 173 | - $this->assertEquals( 1, $products->eq( 0 )->filter( '.value:contains("600.00 €")' )->count() ); |
|
| 174 | - $this->assertEquals( 1, $products->eq( 1 )->filter( '.value:contains("600.00 €")' )->count() ); |
|
| 172 | + $products = $crawler->filter('.catalog-list-items .product'); |
|
| 173 | + $this->assertEquals(1, $products->eq(0)->filter('.value:contains("600.00 €")')->count()); |
|
| 174 | + $this->assertEquals(1, $products->eq(1)->filter('.value:contains("600.00 €")')->count()); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | |
| 178 | 178 | public function testDetailPinned() |
| 179 | 179 | { |
| 180 | 180 | $client = static::createClient(); |
| 181 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 181 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 182 | 182 | |
| 183 | - $link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link(); |
|
| 184 | - $crawler = $client->click( $link ); |
|
| 183 | + $link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link(); |
|
| 184 | + $crawler = $client->click($link); |
|
| 185 | 185 | |
| 186 | - $link = $crawler->filter( '.catalog-detail a.actions-button-pin' )->link(); |
|
| 187 | - $crawler = $client->click( $link ); |
|
| 186 | + $link = $crawler->filter('.catalog-detail a.actions-button-pin')->link(); |
|
| 187 | + $crawler = $client->click($link); |
|
| 188 | 188 | |
| 189 | - $this->assertEquals( 1, $crawler->filter( '.catalog-session-pinned .pinned-item' )->count() ); |
|
| 189 | + $this->assertEquals(1, $crawler->filter('.catalog-session-pinned .pinned-item')->count()); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | |
| 193 | 193 | public function testDetailLastSeen() |
| 194 | 194 | { |
| 195 | 195 | $client = static::createClient(); |
| 196 | - $crawler = $client->request( 'GET', '/unittest/de/EUR/list' ); |
|
| 196 | + $crawler = $client->request('GET', '/unittest/de/EUR/list'); |
|
| 197 | 197 | |
| 198 | - $link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link(); |
|
| 199 | - $crawler = $client->click( $link ); |
|
| 198 | + $link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link(); |
|
| 199 | + $crawler = $client->click($link); |
|
| 200 | 200 | |
| 201 | - $this->assertEquals( 1, $crawler->filter( '.catalog-session-seen .seen-item' )->count() ); |
|
| 201 | + $this->assertEquals(1, $crawler->filter('.catalog-session-seen .seen-item')->count()); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | |
| 205 | 205 | public function testSuggest() |
| 206 | 206 | { |
| 207 | 207 | $client = static::createClient(); |
| 208 | - $client->request( 'GET', '/unittest/de/EUR/suggest', array( 'f_search' => 'unit' ) ); |
|
| 208 | + $client->request('GET', '/unittest/de/EUR/suggest', array('f_search' => 'unit')); |
|
| 209 | 209 | $content = $client->getResponse()->getContent(); |
| 210 | 210 | |
| 211 | - $this->assertStringStartsWith( '[{', $content ); |
|
| 211 | + $this->assertStringStartsWith('[{', $content); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | |
| 215 | 215 | public function testStock() |
| 216 | 216 | { |
| 217 | 217 | $client = static::createClient(); |
| 218 | - $client->request( 'GET', '/unittest/de/EUR/stock' ); |
|
| 218 | + $client->request('GET', '/unittest/de/EUR/stock'); |
|
| 219 | 219 | $content = $client->getResponse()->getContent(); |
| 220 | 220 | |
| 221 | - $this->assertContains( '.aimeos .product .stock', $content ); |
|
| 222 | - $this->assertContains( '.aimeos .catalog-detail-basket', $content ); |
|
| 221 | + $this->assertContains('.aimeos .product .stock', $content); |
|
| 222 | + $this->assertContains('.aimeos .catalog-detail-basket', $content); |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | |
| 226 | 226 | public function testCountComponent() |
| 227 | 227 | { |
| 228 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' ) |
|
| 229 | - ->setMethods( array( 'getOutput' ) ) |
|
| 228 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController') |
|
| 229 | + ->setMethods(array('getOutput')) |
|
| 230 | 230 | ->disableOriginalConstructor() |
| 231 | 231 | ->getMock(); |
| 232 | 232 | |
| 233 | - $response = Response::create( 'test' ); |
|
| 234 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 233 | + $response = Response::create('test'); |
|
| 234 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 235 | 235 | |
| 236 | - $this->assertSame( $response, $mock->countComponentAction() ); |
|
| 236 | + $this->assertSame($response, $mock->countComponentAction()); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
| 240 | 240 | public function testDetailComponent() |
| 241 | 241 | { |
| 242 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' ) |
|
| 243 | - ->setMethods( array( 'getOutput' ) ) |
|
| 242 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController') |
|
| 243 | + ->setMethods(array('getOutput')) |
|
| 244 | 244 | ->disableOriginalConstructor() |
| 245 | 245 | ->getMock(); |
| 246 | 246 | |
| 247 | - $response = Response::create( 'test' ); |
|
| 248 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 247 | + $response = Response::create('test'); |
|
| 248 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 249 | 249 | |
| 250 | - $this->assertSame( $response, $mock->detailComponentAction() ); |
|
| 250 | + $this->assertSame($response, $mock->detailComponentAction()); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | |
| 254 | 254 | public function testFilterComponent() |
| 255 | 255 | { |
| 256 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' ) |
|
| 257 | - ->setMethods( array( 'getOutput' ) ) |
|
| 256 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController') |
|
| 257 | + ->setMethods(array('getOutput')) |
|
| 258 | 258 | ->disableOriginalConstructor() |
| 259 | 259 | ->getMock(); |
| 260 | 260 | |
| 261 | - $response = Response::create( 'test' ); |
|
| 262 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 261 | + $response = Response::create('test'); |
|
| 262 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 263 | 263 | |
| 264 | - $this->assertSame( $response, $mock->filterComponentAction() ); |
|
| 264 | + $this->assertSame($response, $mock->filterComponentAction()); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | |
| 268 | 268 | public function testListComponent() |
| 269 | 269 | { |
| 270 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' ) |
|
| 271 | - ->setMethods( array( 'getOutput' ) ) |
|
| 270 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController') |
|
| 271 | + ->setMethods(array('getOutput')) |
|
| 272 | 272 | ->disableOriginalConstructor() |
| 273 | 273 | ->getMock(); |
| 274 | 274 | |
| 275 | - $response = Response::create( 'test' ); |
|
| 276 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 275 | + $response = Response::create('test'); |
|
| 276 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 277 | 277 | |
| 278 | - $this->assertSame( $response, $mock->listComponentAction() ); |
|
| 278 | + $this->assertSame($response, $mock->listComponentAction()); |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | |
| 282 | 282 | public function testSessionComponent() |
| 283 | 283 | { |
| 284 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' ) |
|
| 285 | - ->setMethods( array( 'getOutput' ) ) |
|
| 284 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController') |
|
| 285 | + ->setMethods(array('getOutput')) |
|
| 286 | 286 | ->disableOriginalConstructor() |
| 287 | 287 | ->getMock(); |
| 288 | 288 | |
| 289 | - $response = Response::create( 'test' ); |
|
| 290 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 289 | + $response = Response::create('test'); |
|
| 290 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 291 | 291 | |
| 292 | - $this->assertSame( $response, $mock->sessionComponentAction() ); |
|
| 292 | + $this->assertSame($response, $mock->sessionComponentAction()); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | |
| 296 | 296 | public function testStageComponent() |
| 297 | 297 | { |
| 298 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' ) |
|
| 299 | - ->setMethods( array( 'getOutput' ) ) |
|
| 298 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController') |
|
| 299 | + ->setMethods(array('getOutput')) |
|
| 300 | 300 | ->disableOriginalConstructor() |
| 301 | 301 | ->getMock(); |
| 302 | 302 | |
| 303 | - $response = Response::create( 'test' ); |
|
| 304 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 303 | + $response = Response::create('test'); |
|
| 304 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 305 | 305 | |
| 306 | - $this->assertSame( $response, $mock->stageComponentAction() ); |
|
| 306 | + $this->assertSame($response, $mock->stageComponentAction()); |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | |
| 310 | 310 | public function testStockComponent() |
| 311 | 311 | { |
| 312 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' ) |
|
| 313 | - ->setMethods( array( 'getOutput' ) ) |
|
| 312 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController') |
|
| 313 | + ->setMethods(array('getOutput')) |
|
| 314 | 314 | ->disableOriginalConstructor() |
| 315 | 315 | ->getMock(); |
| 316 | 316 | |
| 317 | - $response = Response::create( 'test' ); |
|
| 318 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 317 | + $response = Response::create('test'); |
|
| 318 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 319 | 319 | |
| 320 | - $this->assertSame( $response, $mock->stockComponentAction() ); |
|
| 320 | + $this->assertSame($response, $mock->stockComponentAction()); |
|
| 321 | 321 | } |
| 322 | 322 | } |
@@ -32,13 +32,13 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | protected function configure() |
| 34 | 34 | { |
| 35 | - $this->setName( self::$defaultName ); |
|
| 36 | - $this->setDescription( 'Initialize or update the Aimeos database tables' ); |
|
| 37 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ); |
|
| 38 | - $this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' ); |
|
| 39 | - $this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ); |
|
| 40 | - $this->addOption( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ); |
|
| 41 | - $this->addOption( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ); |
|
| 35 | + $this->setName(self::$defaultName); |
|
| 36 | + $this->setDescription('Initialize or update the Aimeos database tables'); |
|
| 37 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'); |
|
| 38 | + $this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default'); |
|
| 39 | + $this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()); |
|
| 40 | + $this->addOption('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'); |
|
| 41 | + $this->addOption('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
@@ -48,41 +48,41 @@ discard block |
||
| 48 | 48 | * @param InputInterface $input Input object |
| 49 | 49 | * @param OutputInterface $output Output object |
| 50 | 50 | */ |
| 51 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 51 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 52 | 52 | { |
| 53 | - $ctx = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 54 | - $ctx->setEditor( 'aimeos:setup' ); |
|
| 53 | + $ctx = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
| 54 | + $ctx->setEditor('aimeos:setup'); |
|
| 55 | 55 | |
| 56 | 56 | $config = $ctx->getConfig(); |
| 57 | - $site = $input->getArgument( 'site' ); |
|
| 58 | - $tplsite = $input->getArgument( 'tplsite' ); |
|
| 57 | + $site = $input->getArgument('site'); |
|
| 58 | + $tplsite = $input->getArgument('tplsite'); |
|
| 59 | 59 | |
| 60 | - $config->set( 'setup/site', $site ); |
|
| 61 | - $dbconfig = $this->getDbConfig( $config ); |
|
| 62 | - $this->setOptions( $config, $input ); |
|
| 60 | + $config->set('setup/site', $site); |
|
| 61 | + $dbconfig = $this->getDbConfig($config); |
|
| 62 | + $this->setOptions($config, $input); |
|
| 63 | 63 | |
| 64 | - $taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite ); |
|
| 65 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
| 64 | + $taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite); |
|
| 65 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
| 66 | 66 | |
| 67 | - $output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) ); |
|
| 67 | + $output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site)); |
|
| 68 | 68 | |
| 69 | - if( ( $task = $input->getOption( 'task' ) ) && is_array( $task ) ) { |
|
| 70 | - $task = reset( $task ); |
|
| 69 | + if (($task = $input->getOption('task')) && is_array($task)) { |
|
| 70 | + $task = reset($task); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - switch( $input->getOption( 'action' ) ) |
|
| 73 | + switch ($input->getOption('action')) |
|
| 74 | 74 | { |
| 75 | 75 | case 'migrate': |
| 76 | - $manager->migrate( $task ); |
|
| 76 | + $manager->migrate($task); |
|
| 77 | 77 | break; |
| 78 | 78 | case 'rollback': |
| 79 | - $manager->rollback( $task ); |
|
| 79 | + $manager->rollback($task); |
|
| 80 | 80 | break; |
| 81 | 81 | case 'clean': |
| 82 | - $manager->clean( $task ); |
|
| 82 | + $manager->clean($task); |
|
| 83 | 83 | break; |
| 84 | 84 | default: |
| 85 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $input->getOption( 'action' ) ) ); |
|
| 85 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $input->getOption('action'))); |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | |
@@ -93,14 +93,14 @@ discard block |
||
| 93 | 93 | * @param \Aimeos\MW\Config\Iface $conf Config object |
| 94 | 94 | * @return array Multi-dimensional associative list of database configuration parameters |
| 95 | 95 | */ |
| 96 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
| 96 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
| 97 | 97 | { |
| 98 | - $dbconfig = $conf->get( 'resource', array() ); |
|
| 98 | + $dbconfig = $conf->get('resource', array()); |
|
| 99 | 99 | |
| 100 | - foreach( $dbconfig as $rname => $dbconf ) |
|
| 100 | + foreach ($dbconfig as $rname => $dbconf) |
|
| 101 | 101 | { |
| 102 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
| 103 | - unset( $dbconfig[$rname] ); |
|
| 102 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
| 103 | + unset($dbconfig[$rname]); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
@@ -116,12 +116,12 @@ discard block |
||
| 116 | 116 | * @param array Associative list of database configurations |
| 117 | 117 | * @throws \RuntimeException If the format of the options is invalid |
| 118 | 118 | */ |
| 119 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input ) |
|
| 119 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input) |
|
| 120 | 120 | { |
| 121 | - foreach( (array) $input->getOption( 'option' ) as $option ) |
|
| 121 | + foreach ((array) $input->getOption('option') as $option) |
|
| 122 | 122 | { |
| 123 | - list( $name, $value ) = explode( ':', $option ); |
|
| 124 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
| 123 | + list($name, $value) = explode(':', $option); |
|
| 124 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | protected function configure() |
| 33 | 33 | { |
| 34 | - $this->setName( self::$defaultName ); |
|
| 35 | - $this->setDescription( 'Clears the content cache' ); |
|
| 36 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ); |
|
| 34 | + $this->setName(self::$defaultName); |
|
| 35 | + $this->setDescription('Clears the content cache'); |
|
| 36 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
@@ -43,26 +43,26 @@ discard block |
||
| 43 | 43 | * @param InputInterface $input Input object |
| 44 | 44 | * @param OutputInterface $output Output object |
| 45 | 45 | */ |
| 46 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 46 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 47 | 47 | { |
| 48 | - $context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 49 | - $context->setEditor( 'aimeos:cache' ); |
|
| 48 | + $context = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
| 49 | + $context->setEditor('aimeos:cache'); |
|
| 50 | 50 | |
| 51 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 51 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 52 | 52 | |
| 53 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
| 53 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
| 54 | 54 | { |
| 55 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 55 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 56 | 56 | |
| 57 | 57 | $lcontext = clone $context; |
| 58 | - $lcontext->setLocale( $localeItem ); |
|
| 58 | + $lcontext->setLocale($localeItem); |
|
| 59 | 59 | |
| 60 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
| 61 | - $lcontext->setCache( $cache ); |
|
| 60 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
| 61 | + $lcontext->setCache($cache); |
|
| 62 | 62 | |
| 63 | - $output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) ); |
|
| 63 | + $output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode())); |
|
| 64 | 64 | |
| 65 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
| 65 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -32,19 +32,19 @@ discard block |
||
| 32 | 32 | protected function configure() |
| 33 | 33 | { |
| 34 | 34 | $names = ''; |
| 35 | - $aimeos = new \Aimeos\Bootstrap( array() ); |
|
| 36 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' ); |
|
| 37 | - $controllers = \Aimeos\Controller\Jobs\Factory::getControllers( $this->getBareContext(), $aimeos, $cntlPaths ); |
|
| 35 | + $aimeos = new \Aimeos\Bootstrap(array()); |
|
| 36 | + $cntlPaths = $aimeos->getCustomPaths('controller/jobs'); |
|
| 37 | + $controllers = \Aimeos\Controller\Jobs\Factory::getControllers($this->getBareContext(), $aimeos, $cntlPaths); |
|
| 38 | 38 | |
| 39 | - foreach( $controllers as $key => $controller ) { |
|
| 40 | - $names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL; |
|
| 39 | + foreach ($controllers as $key => $controller) { |
|
| 40 | + $names .= str_pad($key, 30).$controller->getName().PHP_EOL; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - $this->setName( self::$defaultName ); |
|
| 44 | - $this->setDescription( 'Executes the job controllers' ); |
|
| 45 | - $this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ); |
|
| 46 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ); |
|
| 47 | - $this->setHelp( "Available jobs are:\n" . $names ); |
|
| 43 | + $this->setName(self::$defaultName); |
|
| 44 | + $this->setDescription('Executes the job controllers'); |
|
| 45 | + $this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'); |
|
| 46 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'); |
|
| 47 | + $this->setHelp("Available jobs are:\n".$names); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | |
@@ -54,32 +54,32 @@ discard block |
||
| 54 | 54 | * @param InputInterface $input Input object |
| 55 | 55 | * @param OutputInterface $output Output object |
| 56 | 56 | */ |
| 57 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 57 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 58 | 58 | { |
| 59 | 59 | $context = $this->getContext(); |
| 60 | 60 | $process = $context->getProcess(); |
| 61 | - $aimeos = $this->getContainer()->get( 'aimeos' )->get(); |
|
| 61 | + $aimeos = $this->getContainer()->get('aimeos')->get(); |
|
| 62 | 62 | |
| 63 | - $jobs = explode( ' ', $input->getArgument( 'jobs' ) ); |
|
| 64 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 63 | + $jobs = explode(' ', $input->getArgument('jobs')); |
|
| 64 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 65 | 65 | |
| 66 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
| 66 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
| 67 | 67 | { |
| 68 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 69 | - $localeItem->setLanguageId( null ); |
|
| 70 | - $localeItem->setCurrencyId( null ); |
|
| 68 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 69 | + $localeItem->setLanguageId(null); |
|
| 70 | + $localeItem->setCurrencyId(null); |
|
| 71 | 71 | |
| 72 | - $context->setLocale( $localeItem ); |
|
| 72 | + $context->setLocale($localeItem); |
|
| 73 | 73 | |
| 74 | - $output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) ); |
|
| 74 | + $output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode())); |
|
| 75 | 75 | |
| 76 | - foreach( $jobs as $jobname ) |
|
| 76 | + foreach ($jobs as $jobname) |
|
| 77 | 77 | { |
| 78 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
| 79 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
| 78 | + $fcn = function($context, $aimeos, $jobname) { |
|
| 79 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
| 80 | 80 | }; |
| 81 | 81 | |
| 82 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
| 82 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -96,15 +96,15 @@ discard block |
||
| 96 | 96 | { |
| 97 | 97 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
| 98 | 98 | |
| 99 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), array() ); |
|
| 100 | - $ctx->setConfig( $conf ); |
|
| 99 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), array()); |
|
| 100 | + $ctx->setConfig($conf); |
|
| 101 | 101 | |
| 102 | - $locale = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' )->createItem(); |
|
| 103 | - $locale->setLanguageId( 'en' ); |
|
| 104 | - $ctx->setLocale( $locale ); |
|
| 102 | + $locale = \Aimeos\MShop\Factory::createManager($ctx, 'locale')->createItem(); |
|
| 103 | + $locale->setLanguageId('en'); |
|
| 104 | + $ctx->setLocale($locale); |
|
| 105 | 105 | |
| 106 | - $i18n = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 107 | - $ctx->setI18n( array( 'en' => $i18n ) ); |
|
| 106 | + $i18n = new \Aimeos\MW\Translation\None('en'); |
|
| 107 | + $ctx->setI18n(array('en' => $i18n)); |
|
| 108 | 108 | |
| 109 | 109 | return $ctx; |
| 110 | 110 | } |
@@ -119,19 +119,19 @@ discard block |
||
| 119 | 119 | { |
| 120 | 120 | $container = $this->getContainer(); |
| 121 | 121 | $aimeos = $container->get('aimeos')->get(); |
| 122 | - $context = $container->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 122 | + $context = $container->get('aimeos_context')->get(false, 'command'); |
|
| 123 | 123 | |
| 124 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
| 125 | - $tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) ); |
|
| 126 | - $view = $container->get('aimeos_view')->create( $context, $tmplPaths ); |
|
| 124 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
| 125 | + $tmplPaths = array_merge($tmplPaths, $aimeos->getCustomPaths('client/html/templates')); |
|
| 126 | + $view = $container->get('aimeos_view')->create($context, $tmplPaths); |
|
| 127 | 127 | |
| 128 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
| 129 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
| 130 | - $i18n = $this->getContainer()->get( 'aimeos_i18n' )->get( $langids ); |
|
| 128 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
| 129 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
| 130 | + $i18n = $this->getContainer()->get('aimeos_i18n')->get($langids); |
|
| 131 | 131 | |
| 132 | - $context->setEditor( 'aimeos:jobs' ); |
|
| 133 | - $context->setView( $view ); |
|
| 134 | - $context->setI18n( $i18n ); |
|
| 132 | + $context->setEditor('aimeos:jobs'); |
|
| 133 | + $context->setView($view); |
|
| 134 | + $context->setI18n($i18n); |
|
| 135 | 135 | |
| 136 | 136 | return $context; |
| 137 | 137 | } |
@@ -28,18 +28,18 @@ discard block |
||
| 28 | 28 | * @param Event $event Event instance |
| 29 | 29 | * @throws \RuntimeException If an error occured |
| 30 | 30 | */ |
| 31 | - public static function setupDatabase( Event $event ) |
|
| 31 | + public static function setupDatabase(Event $event) |
|
| 32 | 32 | { |
| 33 | 33 | $options = $env = array(); |
| 34 | 34 | |
| 35 | - if( $event->isDevMode() ) { |
|
| 35 | + if ($event->isDevMode()) { |
|
| 36 | 36 | $options[] = '--option=setup/default/demo:1'; |
| 37 | 37 | } else { |
| 38 | 38 | $env[] = '--env=prod'; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - self::executeCommand( $event, 'aimeos:setup', $options + $env ); |
|
| 42 | - self::executeCommand( $event, 'aimeos:cache', $env ); |
|
| 41 | + self::executeCommand($event, 'aimeos:setup', $options + $env); |
|
| 42 | + self::executeCommand($event, 'aimeos:cache', $env); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -49,16 +49,16 @@ discard block |
||
| 49 | 49 | * @param Event $event Event instance |
| 50 | 50 | * @throws \RuntimeException If an error occured |
| 51 | 51 | */ |
| 52 | - public static function updateConfig( Event $event ) |
|
| 52 | + public static function updateConfig(Event $event) |
|
| 53 | 53 | { |
| 54 | - $event->getIO()->write( 'Ensure existing config and routing for the shop bundle' ); |
|
| 54 | + $event->getIO()->write('Ensure existing config and routing for the shop bundle'); |
|
| 55 | 55 | |
| 56 | - $options = self::getOptions( $event ); |
|
| 56 | + $options = self::getOptions($event); |
|
| 57 | 57 | |
| 58 | - if( isset( $options['symfony-app-dir'] ) ) |
|
| 58 | + if (isset($options['symfony-app-dir'])) |
|
| 59 | 59 | { |
| 60 | - self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' ); |
|
| 61 | - self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' ); |
|
| 60 | + self::updateConfigFile($options['symfony-app-dir'].'/config/config.yml'); |
|
| 61 | + self::updateRoutingFile($options['symfony-app-dir'].'/config/routing.yml'); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | |
@@ -69,26 +69,26 @@ discard block |
||
| 69 | 69 | * @param Event $event Event instance |
| 70 | 70 | * @throws \RuntimeException If an error occured |
| 71 | 71 | */ |
| 72 | - public static function installBundle( Event $event ) |
|
| 72 | + public static function installBundle(Event $event) |
|
| 73 | 73 | { |
| 74 | - $event->getIO()->write( 'Installing the Aimeos shop bundle' ); |
|
| 74 | + $event->getIO()->write('Installing the Aimeos shop bundle'); |
|
| 75 | 75 | |
| 76 | - $options = self::getOptions( $event ); |
|
| 76 | + $options = self::getOptions($event); |
|
| 77 | 77 | $securedir = 'var'; |
| 78 | 78 | |
| 79 | - if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) { |
|
| 79 | + if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) { |
|
| 80 | 80 | $securedir = $options['symfony-app-dir']; |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - if( isset( $options['symfony-var-dir'] ) && is_dir( $options['symfony-var-dir'] ) ) { |
|
| 83 | + if (isset($options['symfony-var-dir']) && is_dir($options['symfony-var-dir'])) { |
|
| 84 | 84 | $securedir = $options['symfony-var-dir']; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - $webdir = ( isset( $options['symfony-web-dir'] ) ? $options['symfony-web-dir'] : 'public' ); |
|
| 87 | + $webdir = (isset($options['symfony-web-dir']) ? $options['symfony-web-dir'] : 'public'); |
|
| 88 | 88 | |
| 89 | - self::createDirectory( $securedir . '/secure' ); |
|
| 90 | - self::createDirectory( $webdir . '/preview' ); |
|
| 91 | - self::createDirectory( $webdir . '/files' ); |
|
| 89 | + self::createDirectory($securedir.'/secure'); |
|
| 90 | + self::createDirectory($webdir.'/preview'); |
|
| 91 | + self::createDirectory($webdir.'/files'); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | |
@@ -98,14 +98,14 @@ discard block |
||
| 98 | 98 | * @param string $dir Absolute path of the new directory |
| 99 | 99 | * @throws \RuntimeException If directory couldn't be created |
| 100 | 100 | */ |
| 101 | - protected static function createDirectory( $dir ) |
|
| 101 | + protected static function createDirectory($dir) |
|
| 102 | 102 | { |
| 103 | 103 | $perm = 0755; |
| 104 | 104 | |
| 105 | - if( !is_dir( $dir ) && !mkdir( $dir, $perm, true ) ) |
|
| 105 | + if (!is_dir($dir) && !mkdir($dir, $perm, true)) |
|
| 106 | 106 | { |
| 107 | 107 | $msg = 'Unable to create directory "%1$s" with permission "%2$s"'; |
| 108 | - throw new \RuntimeException( sprintf( $msg, $dir, $perm ) ); |
|
| 108 | + throw new \RuntimeException(sprintf($msg, $dir, $perm)); |
|
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | |
@@ -118,28 +118,28 @@ discard block |
||
| 118 | 118 | * @param array List of configuration options for the given command |
| 119 | 119 | * @throws \RuntimeException If the command couldn't be executed |
| 120 | 120 | */ |
| 121 | - protected static function executeCommand( Event $event, $cmd, array $options = array() ) |
|
| 121 | + protected static function executeCommand(Event $event, $cmd, array $options = array()) |
|
| 122 | 122 | { |
| 123 | - $php = escapeshellarg( self::getPhp() ); |
|
| 124 | - $console = escapeshellarg( self::getConsoleDir( $event ) . '/console' ); |
|
| 125 | - $cmd = escapeshellarg( $cmd ); |
|
| 123 | + $php = escapeshellarg(self::getPhp()); |
|
| 124 | + $console = escapeshellarg(self::getConsoleDir($event).'/console'); |
|
| 125 | + $cmd = escapeshellarg($cmd); |
|
| 126 | 126 | |
| 127 | - foreach( $options as $key => $option ) { |
|
| 128 | - $options[$key] = escapeshellarg( $option ); |
|
| 127 | + foreach ($options as $key => $option) { |
|
| 128 | + $options[$key] = escapeshellarg($option); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - if( $event->getIO()->isDecorated() ) { |
|
| 131 | + if ($event->getIO()->isDecorated()) { |
|
| 132 | 132 | $console .= ' --ansi'; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - $process = new Process( $php . ' ' . $console . ' ' . $cmd . ' ' . implode( ' ', $options ), null, null, null, 3600 ); |
|
| 135 | + $process = new Process($php.' '.$console.' '.$cmd.' '.implode(' ', $options), null, null, null, 3600); |
|
| 136 | 136 | |
| 137 | - $process->run( function( $type, $buffer ) use ( $event ) { |
|
| 138 | - $event->getIO()->write( $buffer, false ); |
|
| 137 | + $process->run(function($type, $buffer) use ($event) { |
|
| 138 | + $event->getIO()->write($buffer, false); |
|
| 139 | 139 | } ); |
| 140 | 140 | |
| 141 | - if( !$process->isSuccessful() ) { |
|
| 142 | - throw new \RuntimeException( sprintf( 'An error occurred when executing the "%s" command', escapeshellarg( $cmd ) ) ); |
|
| 141 | + if (!$process->isSuccessful()) { |
|
| 142 | + throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command', escapeshellarg($cmd))); |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | |
@@ -152,17 +152,17 @@ discard block |
||
| 152 | 152 | * @return string The path to the console directory |
| 153 | 153 | * @throws \RuntimeException If console directory couldn't be found |
| 154 | 154 | */ |
| 155 | - protected static function getConsoleDir( Event $event ) |
|
| 155 | + protected static function getConsoleDir(Event $event) |
|
| 156 | 156 | { |
| 157 | - $options = self::getOptions( $event ); |
|
| 157 | + $options = self::getOptions($event); |
|
| 158 | 158 | |
| 159 | 159 | $bindir = 'bin'; |
| 160 | 160 | |
| 161 | - if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) { |
|
| 161 | + if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) { |
|
| 162 | 162 | $bindir = $options['symfony-app-dir']; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) { |
|
| 165 | + if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) { |
|
| 166 | 166 | $bindir = $options['symfony-bin-dir']; |
| 167 | 167 | } |
| 168 | 168 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | * @param Event $event Command event object |
| 177 | 177 | * @return array Associative list of option keys and values |
| 178 | 178 | */ |
| 179 | - protected static function getOptions( Event $event ) |
|
| 179 | + protected static function getOptions(Event $event) |
|
| 180 | 180 | { |
| 181 | 181 | return $event->getComposer()->getPackage()->getExtra(); |
| 182 | 182 | } |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | { |
| 193 | 193 | $phpFinder = new PhpExecutableFinder; |
| 194 | 194 | |
| 195 | - if( !( $phpPath = $phpFinder->find() ) ) { |
|
| 196 | - throw new \RuntimeException( 'The php executable could not be found, add it to your PATH environment variable and try again' ); |
|
| 195 | + if (!($phpPath = $phpFinder->find())) { |
|
| 196 | + throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again'); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | return $phpPath; |
@@ -206,15 +206,15 @@ discard block |
||
| 206 | 206 | * @param string $filename Name of the YAML config file |
| 207 | 207 | * @throws \RuntimeException If file is not found |
| 208 | 208 | */ |
| 209 | - protected static function updateConfigFile( $filename ) |
|
| 209 | + protected static function updateConfigFile($filename) |
|
| 210 | 210 | { |
| 211 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 212 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
| 211 | + if (($content = file_get_contents($filename)) === false) { |
|
| 212 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - if( self::addAsseticBundle( $content ) === true ) { |
|
| 215 | + if (self::addAsseticBundle($content) === true) { |
|
| 216 | 216 | $fs = new Filesystem(); |
| 217 | - $fs->dumpFile( $filename, $content ); |
|
| 217 | + $fs->dumpFile($filename, $content); |
|
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | |
@@ -225,29 +225,29 @@ discard block |
||
| 225 | 225 | * @param string $filename Name of the YAML config file |
| 226 | 226 | * @throws \RuntimeException If file is not found |
| 227 | 227 | */ |
| 228 | - protected static function updateRoutingFile( $filename ) |
|
| 228 | + protected static function updateRoutingFile($filename) |
|
| 229 | 229 | { |
| 230 | 230 | $content = ''; |
| 231 | 231 | |
| 232 | - if( file_exists( $filename ) && ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 233 | - throw new \RuntimeException( sprintf( 'File "%1$s" not readable', $filename ) ); |
|
| 232 | + if (file_exists($filename) && ($content = file_get_contents($filename)) === false) { |
|
| 233 | + throw new \RuntimeException(sprintf('File "%1$s" not readable', $filename)); |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - if( strpos( $content, 'fos_user:' ) === false ) |
|
| 236 | + if (strpos($content, 'fos_user:') === false) |
|
| 237 | 237 | { |
| 238 | - $content .= "\n" . 'fos_user: |
|
| 238 | + $content .= "\n".'fos_user: |
|
| 239 | 239 | resource: "@FOSUserBundle/Resources/config/routing/all.xml"'; |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | - if( strpos( $content, 'aimeos_shop:' ) === false ) |
|
| 242 | + if (strpos($content, 'aimeos_shop:') === false) |
|
| 243 | 243 | { |
| 244 | - $content .= "\n" . 'aimeos_shop: |
|
| 244 | + $content .= "\n".'aimeos_shop: |
|
| 245 | 245 | resource: "@AimeosShopBundle/Resources/config/routing.yml" |
| 246 | 246 | prefix: /'; |
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | $fs = new Filesystem(); |
| 250 | - $fs->dumpFile( $filename, $content ); |
|
| 250 | + $fs->dumpFile($filename, $content); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | |
@@ -257,14 +257,14 @@ discard block |
||
| 257 | 257 | * @param string &$content Content of the config.yml file |
| 258 | 258 | * @return boolean True if modified, false if not |
| 259 | 259 | */ |
| 260 | - protected static function addAsseticBundle( &$content ) |
|
| 260 | + protected static function addAsseticBundle(&$content) |
|
| 261 | 261 | { |
| 262 | - if( preg_match( "/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content ) !== 1 ) |
|
| 262 | + if (preg_match("/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content) !== 1) |
|
| 263 | 263 | { |
| 264 | - $search = array( "/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/" ); |
|
| 265 | - $replace = array( " bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']" ); |
|
| 264 | + $search = array("/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/"); |
|
| 265 | + $replace = array(" bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']"); |
|
| 266 | 266 | |
| 267 | - if( ( $content = preg_replace( $search, $replace, $content ) ) !== null ) { |
|
| 267 | + if (($content = preg_replace($search, $replace, $content)) !== null) { |
|
| 268 | 268 | return true; |
| 269 | 269 | } |
| 270 | 270 | } |
@@ -10,74 +10,74 @@ discard block |
||
| 10 | 10 | public function testOptionsAction() |
| 11 | 11 | { |
| 12 | 12 | $client = static::createClient(); |
| 13 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 13 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 14 | 14 | $response = $client->getResponse(); |
| 15 | 15 | |
| 16 | - $json = json_decode( $response->getContent(), true ); |
|
| 16 | + $json = json_decode($response->getContent(), true); |
|
| 17 | 17 | |
| 18 | - $this->assertNotNull( $json ); |
|
| 19 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 20 | - $this->assertArrayHasKey( 'resources', $json['meta'] ); |
|
| 21 | - $this->assertGreaterThan( 1, count( $json['meta']['resources'] ) ); |
|
| 18 | + $this->assertNotNull($json); |
|
| 19 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 20 | + $this->assertArrayHasKey('resources', $json['meta']); |
|
| 21 | + $this->assertGreaterThan(1, count($json['meta']['resources'])); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | public function testPutAction() |
| 26 | 26 | { |
| 27 | 27 | $client = static::createClient(); |
| 28 | - $client->request( 'PUT', '/unittest/de/EUR/jsonapi/basket' ); |
|
| 28 | + $client->request('PUT', '/unittest/de/EUR/jsonapi/basket'); |
|
| 29 | 29 | $response = $client->getResponse(); |
| 30 | 30 | |
| 31 | - $json = json_decode( $response->getContent(), true ); |
|
| 31 | + $json = json_decode($response->getContent(), true); |
|
| 32 | 32 | |
| 33 | - $this->assertNotNull( $json ); |
|
| 34 | - $this->assertEquals( 403, $response->getStatusCode() ); |
|
| 35 | - $this->assertArrayHasKey( 'errors', $json ); |
|
| 33 | + $this->assertNotNull($json); |
|
| 34 | + $this->assertEquals(403, $response->getStatusCode()); |
|
| 35 | + $this->assertArrayHasKey('errors', $json); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testGetAttributeAction() |
| 40 | 40 | { |
| 41 | 41 | $client = static::createClient(); |
| 42 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/attribute', [] ); |
|
| 42 | + $client->request('GET', '/unittest/de/EUR/jsonapi/attribute', []); |
|
| 43 | 43 | $response = $client->getResponse(); |
| 44 | 44 | |
| 45 | - $json = json_decode( $response->getContent(), true ); |
|
| 45 | + $json = json_decode($response->getContent(), true); |
|
| 46 | 46 | |
| 47 | - $this->assertNotNull( $json ); |
|
| 48 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 49 | - $this->assertEquals( 26, $json['meta']['total'] ); |
|
| 50 | - $this->assertEquals( 26, count( $json['data'] ) ); |
|
| 47 | + $this->assertNotNull($json); |
|
| 48 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 49 | + $this->assertEquals(26, $json['meta']['total']); |
|
| 50 | + $this->assertEquals(26, count($json['data'])); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | public function testGetCatalogAction() |
| 55 | 55 | { |
| 56 | 56 | $client = static::createClient(); |
| 57 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/catalog', [] ); |
|
| 57 | + $client->request('GET', '/unittest/de/EUR/jsonapi/catalog', []); |
|
| 58 | 58 | $response = $client->getResponse(); |
| 59 | 59 | |
| 60 | - $json = json_decode( $response->getContent(), true ); |
|
| 60 | + $json = json_decode($response->getContent(), true); |
|
| 61 | 61 | |
| 62 | - $this->assertNotNull( $json ); |
|
| 63 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 64 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 65 | - $this->assertEquals( 4, count( $json['data'] ) ); |
|
| 62 | + $this->assertNotNull($json); |
|
| 63 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 64 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 65 | + $this->assertEquals(4, count($json['data'])); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
| 69 | 69 | public function testGetLocaleAction() |
| 70 | 70 | { |
| 71 | 71 | $client = static::createClient(); |
| 72 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/locale', [] ); |
|
| 72 | + $client->request('GET', '/unittest/de/EUR/jsonapi/locale', []); |
|
| 73 | 73 | $response = $client->getResponse(); |
| 74 | 74 | |
| 75 | - $json = json_decode( $response->getContent(), true ); |
|
| 75 | + $json = json_decode($response->getContent(), true); |
|
| 76 | 76 | |
| 77 | - $this->assertNotNull( $json ); |
|
| 78 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 79 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 80 | - $this->assertEquals( 1, count( $json['data'] ) ); |
|
| 77 | + $this->assertNotNull($json); |
|
| 78 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 79 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 80 | + $this->assertEquals(1, count($json['data'])); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | |
@@ -86,58 +86,58 @@ discard block |
||
| 86 | 86 | $client = static::createClient(); |
| 87 | 87 | |
| 88 | 88 | $params = ['filter' => ['f_search' => 'Cafe Noire Cap']]; |
| 89 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/product', $params ); |
|
| 89 | + $client->request('GET', '/unittest/de/EUR/jsonapi/product', $params); |
|
| 90 | 90 | $response = $client->getResponse(); |
| 91 | 91 | |
| 92 | - $json = json_decode( $response->getContent(), true ); |
|
| 92 | + $json = json_decode($response->getContent(), true); |
|
| 93 | 93 | |
| 94 | - $this->assertNotNull( $json ); |
|
| 95 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 96 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 97 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 98 | - $this->assertArrayHasKey( 'id', $json['data'][0] ); |
|
| 99 | - $this->assertEquals( 'CNC', $json['data'][0]['attributes']['product.code'] ); |
|
| 94 | + $this->assertNotNull($json); |
|
| 95 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 96 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 97 | + $this->assertEquals(2, count($json['data'])); |
|
| 98 | + $this->assertArrayHasKey('id', $json['data'][0]); |
|
| 99 | + $this->assertEquals('CNC', $json['data'][0]['attributes']['product.code']); |
|
| 100 | 100 | |
| 101 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/product?id=' . $json['data'][0]['id'] ); |
|
| 101 | + $client->request('GET', '/unittest/de/EUR/jsonapi/product?id='.$json['data'][0]['id']); |
|
| 102 | 102 | $response = $client->getResponse(); |
| 103 | 103 | |
| 104 | - $json = json_decode( $response->getContent(), true ); |
|
| 104 | + $json = json_decode($response->getContent(), true); |
|
| 105 | 105 | |
| 106 | - $this->assertNotNull( $json ); |
|
| 107 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 108 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 109 | - $this->assertArrayHasKey( 'id', $json['data'] ); |
|
| 110 | - $this->assertEquals( 'CNC', $json['data']['attributes']['product.code'] ); |
|
| 106 | + $this->assertNotNull($json); |
|
| 107 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 108 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 109 | + $this->assertArrayHasKey('id', $json['data']); |
|
| 110 | + $this->assertEquals('CNC', $json['data']['attributes']['product.code']); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | |
| 114 | 114 | public function testGetServiceAction() |
| 115 | 115 | { |
| 116 | 116 | $client = static::createClient(); |
| 117 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/service', [] ); |
|
| 117 | + $client->request('GET', '/unittest/de/EUR/jsonapi/service', []); |
|
| 118 | 118 | $response = $client->getResponse(); |
| 119 | 119 | |
| 120 | - $json = json_decode( $response->getContent(), true ); |
|
| 120 | + $json = json_decode($response->getContent(), true); |
|
| 121 | 121 | |
| 122 | - $this->assertNotNull( $json ); |
|
| 123 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 124 | - $this->assertEquals( 4, $json['meta']['total'] ); |
|
| 125 | - $this->assertEquals( 4, count( $json['data'] ) ); |
|
| 122 | + $this->assertNotNull($json); |
|
| 123 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 124 | + $this->assertEquals(4, $json['meta']['total']); |
|
| 125 | + $this->assertEquals(4, count($json['data'])); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
| 129 | 129 | public function testGetStockAction() |
| 130 | 130 | { |
| 131 | 131 | $client = static::createClient(); |
| 132 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/stock', ['filter' => ['s_prodcode' => ['CNC', 'CNE']]] ); |
|
| 132 | + $client->request('GET', '/unittest/de/EUR/jsonapi/stock', ['filter' => ['s_prodcode' => ['CNC', 'CNE']]]); |
|
| 133 | 133 | $response = $client->getResponse(); |
| 134 | 134 | |
| 135 | - $json = json_decode( $response->getContent(), true ); |
|
| 135 | + $json = json_decode($response->getContent(), true); |
|
| 136 | 136 | |
| 137 | - $this->assertNotNull( $json ); |
|
| 138 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 139 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 140 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 137 | + $this->assertNotNull($json); |
|
| 138 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 139 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 140 | + $this->assertEquals(2, count($json['data'])); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | |
@@ -145,24 +145,24 @@ discard block |
||
| 145 | 145 | { |
| 146 | 146 | $client = static::createClient(); |
| 147 | 147 | |
| 148 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 149 | - $optJson = json_decode( $client->getResponse()->getContent(), true ); |
|
| 150 | - $this->assertGreaterThan( 8, count( $optJson['meta']['resources'] ) ); |
|
| 148 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 149 | + $optJson = json_decode($client->getResponse()->getContent(), true); |
|
| 150 | + $this->assertGreaterThan(8, count($optJson['meta']['resources'])); |
|
| 151 | 151 | |
| 152 | 152 | // catalog root |
| 153 | - $client->request( 'GET', $optJson['meta']['resources']['catalog'], ['include' => 'catalog'] ); |
|
| 154 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 155 | - $this->assertEquals( 'categories', $json['included'][0]['attributes']['catalog.code'] ); |
|
| 153 | + $client->request('GET', $optJson['meta']['resources']['catalog'], ['include' => 'catalog']); |
|
| 154 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 155 | + $this->assertEquals('categories', $json['included'][0]['attributes']['catalog.code']); |
|
| 156 | 156 | |
| 157 | 157 | // "categories" category |
| 158 | - $client->request( 'GET', $json['included'][0]['links']['self']['href'], ['include' => 'catalog'] ); |
|
| 159 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 160 | - $this->assertEquals( 'cafe', $json['included'][0]['attributes']['catalog.code'] ); |
|
| 158 | + $client->request('GET', $json['included'][0]['links']['self']['href'], ['include' => 'catalog']); |
|
| 159 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 160 | + $this->assertEquals('cafe', $json['included'][0]['attributes']['catalog.code']); |
|
| 161 | 161 | |
| 162 | 162 | // product list for "cafe" category |
| 163 | - $client->request( 'GET', $optJson['meta']['resources']['product'], ['filter' => ['f_catid' => $json['included'][0]['id']]] ); |
|
| 164 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 165 | - $this->assertEquals( 'CNE', $json['data'][0]['attributes']['product.code'] ); |
|
| 163 | + $client->request('GET', $optJson['meta']['resources']['product'], ['filter' => ['f_catid' => $json['included'][0]['id']]]); |
|
| 164 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 165 | + $this->assertEquals('CNE', $json['data'][0]['attributes']['product.code']); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | |
@@ -170,26 +170,26 @@ discard block |
||
| 170 | 170 | { |
| 171 | 171 | $client = static::createClient(); |
| 172 | 172 | |
| 173 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 174 | - $options = json_decode( $client->getResponse()->getContent(), true ); |
|
| 175 | - $this->assertGreaterThan( 8, count( $options['meta']['resources'] ) ); |
|
| 173 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 174 | + $options = json_decode($client->getResponse()->getContent(), true); |
|
| 175 | + $this->assertGreaterThan(8, count($options['meta']['resources'])); |
|
| 176 | 176 | |
| 177 | 177 | // all available attrbutes |
| 178 | - $client->request( 'GET', $options['meta']['resources']['attribute'] ); |
|
| 179 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 178 | + $client->request('GET', $options['meta']['resources']['attribute']); |
|
| 179 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 180 | 180 | |
| 181 | - foreach( $json['data'] as $entry ) |
|
| 181 | + foreach ($json['data'] as $entry) |
|
| 182 | 182 | { |
| 183 | - if( $entry['attributes']['attribute.code'] === 'xl' ) |
|
| 183 | + if ($entry['attributes']['attribute.code'] === 'xl') |
|
| 184 | 184 | { |
| 185 | 185 | // products with attrbute "xl" |
| 186 | - $client->request( 'GET', $options['meta']['resources']['product'], ['filter' => ['f_attrid' => $entry['id']]] ); |
|
| 186 | + $client->request('GET', $options['meta']['resources']['product'], ['filter' => ['f_attrid' => $entry['id']]]); |
|
| 187 | 187 | break; |
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 192 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 191 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 192 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | |
@@ -197,14 +197,14 @@ discard block |
||
| 197 | 197 | { |
| 198 | 198 | $client = static::createClient(); |
| 199 | 199 | |
| 200 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 201 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 202 | - $this->assertGreaterThan( 8, count( $json['meta']['resources'] ) ); |
|
| 200 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 201 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 202 | + $this->assertGreaterThan(8, count($json['meta']['resources'])); |
|
| 203 | 203 | |
| 204 | 204 | // product list for full text search |
| 205 | - $client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'selection']] ); |
|
| 206 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 207 | - $this->assertEquals( 3, count( $json['data'] ) ); |
|
| 205 | + $client->request('GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'selection']]); |
|
| 206 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 207 | + $this->assertEquals(3, count($json['data'])); |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | |
@@ -212,23 +212,23 @@ discard block |
||
| 212 | 212 | { |
| 213 | 213 | $client = static::createClient(); |
| 214 | 214 | |
| 215 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 216 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 217 | - $this->assertGreaterThan( 8, count( $json['meta']['resources'] ) ); |
|
| 215 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 216 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 217 | + $this->assertGreaterThan(8, count($json['meta']['resources'])); |
|
| 218 | 218 | |
| 219 | 219 | // get empty basket |
| 220 | - $client->request( 'GET', $json['meta']['resources']['basket'] ); |
|
| 221 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 222 | - $this->assertEquals( 'basket', $json['data']['type'] ); |
|
| 220 | + $client->request('GET', $json['meta']['resources']['basket']); |
|
| 221 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 222 | + $this->assertEquals('basket', $json['data']['type']); |
|
| 223 | 223 | |
| 224 | 224 | $content = '{"data": {"id": "delivery", "attributes": {"order.base.address.firstname": "test"}}}'; |
| 225 | - $client->request( 'POST', $json['links']['basket/address']['href'], [], [], [], $content ); |
|
| 226 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 227 | - $this->assertEquals( 'basket/address', $json['included'][0]['type'] ); |
|
| 225 | + $client->request('POST', $json['links']['basket/address']['href'], [], [], [], $content); |
|
| 226 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 227 | + $this->assertEquals('basket/address', $json['included'][0]['type']); |
|
| 228 | 228 | |
| 229 | - $client->request( 'DELETE', $json['included'][0]['links']['self']['href'] ); |
|
| 230 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 231 | - $this->assertEquals( 0, count( $json['included'] ) ); |
|
| 229 | + $client->request('DELETE', $json['included'][0]['links']['self']['href']); |
|
| 230 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 231 | + $this->assertEquals(0, count($json['included'])); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | |
@@ -236,31 +236,31 @@ discard block |
||
| 236 | 236 | { |
| 237 | 237 | $client = static::createClient(); |
| 238 | 238 | |
| 239 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 240 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 241 | - $this->assertGreaterThan( 8, count( $json['meta']['resources'] ) ); |
|
| 239 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 240 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 241 | + $this->assertGreaterThan(8, count($json['meta']['resources'])); |
|
| 242 | 242 | |
| 243 | 243 | // product for code "CNC" |
| 244 | - $client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]] ); |
|
| 245 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 246 | - $this->assertEquals( 1, count( $json['data'] ) ); |
|
| 244 | + $client->request('GET', $json['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]]); |
|
| 245 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 246 | + $this->assertEquals(1, count($json['data'])); |
|
| 247 | 247 | |
| 248 | 248 | // add product "CNC" as prerequisite |
| 249 | - $content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}'; |
|
| 250 | - $client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content ); |
|
| 251 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 252 | - $this->assertEquals( 'basket/product', $json['included'][0]['type'] ); |
|
| 249 | + $content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}'; |
|
| 250 | + $client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content); |
|
| 251 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 252 | + $this->assertEquals('basket/product', $json['included'][0]['type']); |
|
| 253 | 253 | |
| 254 | 254 | // add coupon "GHIJ" |
| 255 | 255 | $content = '{"data": {"id": "GHIJ"}}'; |
| 256 | - $client->request( 'POST', $json['links']['basket/coupon']['href'], [], [], [], $content ); |
|
| 257 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 258 | - $this->assertEquals( 'basket/coupon', $json['included'][2]['type'] ); |
|
| 256 | + $client->request('POST', $json['links']['basket/coupon']['href'], [], [], [], $content); |
|
| 257 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 258 | + $this->assertEquals('basket/coupon', $json['included'][2]['type']); |
|
| 259 | 259 | |
| 260 | 260 | // remove coupon "GHIJ" again |
| 261 | - $client->request( 'DELETE', $json['included'][2]['links']['self']['href'] ); |
|
| 262 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 263 | - $this->assertEquals( 1, count( $json['included'] ) ); |
|
| 261 | + $client->request('DELETE', $json['included'][2]['links']['self']['href']); |
|
| 262 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 263 | + $this->assertEquals(1, count($json['included'])); |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | |
@@ -268,28 +268,28 @@ discard block |
||
| 268 | 268 | { |
| 269 | 269 | $client = static::createClient(); |
| 270 | 270 | |
| 271 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 272 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 273 | - $this->assertGreaterThan( 8, count( $json['meta']['resources'] ) ); |
|
| 271 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 272 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 273 | + $this->assertGreaterThan(8, count($json['meta']['resources'])); |
|
| 274 | 274 | |
| 275 | 275 | // product for code "CNC" |
| 276 | - $client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'ABCD']] ); |
|
| 277 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 278 | - $this->assertEquals( 1, count( $json['data'] ) ); |
|
| 276 | + $client->request('GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'ABCD']]); |
|
| 277 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 278 | + $this->assertEquals(1, count($json['data'])); |
|
| 279 | 279 | |
| 280 | - $content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}'; |
|
| 281 | - $client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content ); |
|
| 282 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 283 | - $this->assertEquals( 'basket/product', $json['included'][0]['type'] ); |
|
| 280 | + $content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}'; |
|
| 281 | + $client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content); |
|
| 282 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 283 | + $this->assertEquals('basket/product', $json['included'][0]['type']); |
|
| 284 | 284 | |
| 285 | 285 | $content = '{"data": {"attributes": {"quantity": 2}}}'; |
| 286 | - $client->request( 'PATCH', $json['included'][0]['links']['self']['href'], [], [], [], $content ); |
|
| 287 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 288 | - $this->assertEquals( 2, $json['included'][0]['attributes']['order.base.product.quantity'] ); |
|
| 286 | + $client->request('PATCH', $json['included'][0]['links']['self']['href'], [], [], [], $content); |
|
| 287 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 288 | + $this->assertEquals(2, $json['included'][0]['attributes']['order.base.product.quantity']); |
|
| 289 | 289 | |
| 290 | - $client->request( 'DELETE', $json['included'][0]['links']['self']['href'] ); |
|
| 291 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 292 | - $this->assertEquals( 0, count( $json['included'] ) ); |
|
| 290 | + $client->request('DELETE', $json['included'][0]['links']['self']['href']); |
|
| 291 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 292 | + $this->assertEquals(0, count($json['included'])); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | |
@@ -297,14 +297,14 @@ discard block |
||
| 297 | 297 | { |
| 298 | 298 | $client = static::createClient(); |
| 299 | 299 | |
| 300 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 301 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 302 | - $this->assertGreaterThan( 8, count( $json['meta']['resources'] ) ); |
|
| 300 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 301 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 302 | + $this->assertGreaterThan(8, count($json['meta']['resources'])); |
|
| 303 | 303 | |
| 304 | 304 | // payment services |
| 305 | - $client->request( 'GET', $json['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']] ); |
|
| 306 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 307 | - $this->assertEquals( 3, count( $json['data'] ) ); |
|
| 305 | + $client->request('GET', $json['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']]); |
|
| 306 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 307 | + $this->assertEquals(3, count($json['data'])); |
|
| 308 | 308 | |
| 309 | 309 | $content = ['data' => ['id' => 'payment', 'attributes' => [ |
| 310 | 310 | 'service.id' => $json['data'][1]['id'], |
@@ -313,15 +313,15 @@ discard block |
||
| 313 | 313 | 'directdebit.bankcode' => 'ABCDEFGH', |
| 314 | 314 | 'directdebit.bankname' => 'test bank', |
| 315 | 315 | ]]]; |
| 316 | - $client->request( 'POST', $json['data'][1]['links']['basket/service']['href'], [], [], [], json_encode( $content ) ); |
|
| 317 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 318 | - $this->assertEquals( 'basket/service', $json['included'][0]['type'] ); |
|
| 319 | - $this->assertEquals( 'directdebit-test', $json['included'][0]['attributes']['order.base.service.code'] ); |
|
| 320 | - $this->assertEquals( 5, count( $json['included'][0]['attributes']['attribute'] ) ); |
|
| 321 | - |
|
| 322 | - $client->request( 'DELETE', $json['included'][0]['links']['self']['href'] ); |
|
| 323 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 324 | - $this->assertEquals( 0, count( $json['included'] ) ); |
|
| 316 | + $client->request('POST', $json['data'][1]['links']['basket/service']['href'], [], [], [], json_encode($content)); |
|
| 317 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 318 | + $this->assertEquals('basket/service', $json['included'][0]['type']); |
|
| 319 | + $this->assertEquals('directdebit-test', $json['included'][0]['attributes']['order.base.service.code']); |
|
| 320 | + $this->assertEquals(5, count($json['included'][0]['attributes']['attribute'])); |
|
| 321 | + |
|
| 322 | + $client->request('DELETE', $json['included'][0]['links']['self']['href']); |
|
| 323 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 324 | + $this->assertEquals(0, count($json['included'])); |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | |
@@ -330,17 +330,17 @@ discard block |
||
| 330 | 330 | $client = static::createClient(array(), array( |
| 331 | 331 | 'PHP_AUTH_USER' => 'UTC001', |
| 332 | 332 | 'PHP_AUTH_PW' => 'unittest', |
| 333 | - ) ); |
|
| 333 | + )); |
|
| 334 | 334 | |
| 335 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/customer', [] ); |
|
| 335 | + $client->request('GET', '/unittest/de/EUR/jsonapi/customer', []); |
|
| 336 | 336 | $response = $client->getResponse(); |
| 337 | 337 | |
| 338 | - $json = json_decode( $response->getContent(), true ); |
|
| 338 | + $json = json_decode($response->getContent(), true); |
|
| 339 | 339 | |
| 340 | - $this->assertNotNull( $json ); |
|
| 341 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 342 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 343 | - $this->assertEquals( 4, count( $json['data'] ) ); |
|
| 340 | + $this->assertNotNull($json); |
|
| 341 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 342 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 343 | + $this->assertEquals(4, count($json['data'])); |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | |
@@ -349,22 +349,22 @@ discard block |
||
| 349 | 349 | $client = static::createClient(array(), array( |
| 350 | 350 | 'PHP_AUTH_USER' => 'UTC001', |
| 351 | 351 | 'PHP_AUTH_PW' => 'unittest', |
| 352 | - ) ); |
|
| 352 | + )); |
|
| 353 | 353 | |
| 354 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/customer', [] ); |
|
| 354 | + $client->request('GET', '/unittest/de/EUR/jsonapi/customer', []); |
|
| 355 | 355 | $response = $client->getResponse(); |
| 356 | 356 | |
| 357 | - $json = json_decode( $response->getContent(), true ); |
|
| 357 | + $json = json_decode($response->getContent(), true); |
|
| 358 | 358 | |
| 359 | - $client->request( 'GET', $json['links']['customer/address']['href'], [] ); |
|
| 359 | + $client->request('GET', $json['links']['customer/address']['href'], []); |
|
| 360 | 360 | $response = $client->getResponse(); |
| 361 | 361 | |
| 362 | - $json = json_decode( $response->getContent(), true ); |
|
| 362 | + $json = json_decode($response->getContent(), true); |
|
| 363 | 363 | |
| 364 | - $this->assertNotNull( $json ); |
|
| 365 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 366 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 367 | - $this->assertEquals( 1, count( $json['data'] ) ); |
|
| 364 | + $this->assertNotNull($json); |
|
| 365 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 366 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 367 | + $this->assertEquals(1, count($json['data'])); |
|
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | |
@@ -373,17 +373,17 @@ discard block |
||
| 373 | 373 | $client = static::createClient(array(), array( |
| 374 | 374 | 'PHP_AUTH_USER' => 'UTC001', |
| 375 | 375 | 'PHP_AUTH_PW' => 'unittest', |
| 376 | - ) ); |
|
| 376 | + )); |
|
| 377 | 377 | |
| 378 | - $client->request( 'GET', '/unittest/de/EUR/jsonapi/order', [] ); |
|
| 378 | + $client->request('GET', '/unittest/de/EUR/jsonapi/order', []); |
|
| 379 | 379 | $response = $client->getResponse(); |
| 380 | 380 | |
| 381 | - $json = json_decode( $response->getContent(), true ); |
|
| 381 | + $json = json_decode($response->getContent(), true); |
|
| 382 | 382 | |
| 383 | - $this->assertNotNull( $json ); |
|
| 384 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 385 | - $this->assertEquals( 5, $json['meta']['total'] ); |
|
| 386 | - $this->assertEquals( 5, count( $json['data'] ) ); |
|
| 383 | + $this->assertNotNull($json); |
|
| 384 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 385 | + $this->assertEquals(5, $json['meta']['total']); |
|
| 386 | + $this->assertEquals(5, count($json['data'])); |
|
| 387 | 387 | } |
| 388 | 388 | |
| 389 | 389 | |
@@ -391,63 +391,63 @@ discard block |
||
| 391 | 391 | { |
| 392 | 392 | $client = static::createClient(); |
| 393 | 393 | |
| 394 | - $client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' ); |
|
| 395 | - $optJson = json_decode( $client->getResponse()->getContent(), true ); |
|
| 396 | - $this->assertGreaterThan( 8, count( $optJson['meta']['resources'] ) ); |
|
| 394 | + $client->request('OPTIONS', '/unittest/de/EUR/jsonapi'); |
|
| 395 | + $optJson = json_decode($client->getResponse()->getContent(), true); |
|
| 396 | + $this->assertGreaterThan(8, count($optJson['meta']['resources'])); |
|
| 397 | 397 | |
| 398 | 398 | // product for code "CNC" |
| 399 | - $client->request( 'GET', $optJson['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]] ); |
|
| 400 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 401 | - $this->assertEquals( 1, count( $json['data'] ) ); |
|
| 399 | + $client->request('GET', $optJson['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]]); |
|
| 400 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 401 | + $this->assertEquals(1, count($json['data'])); |
|
| 402 | 402 | |
| 403 | 403 | // add product "CNC" |
| 404 | - $content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}'; |
|
| 405 | - $client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content ); |
|
| 406 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 407 | - $this->assertEquals( 'basket/product', $json['included'][0]['type'] ); |
|
| 404 | + $content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}'; |
|
| 405 | + $client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content); |
|
| 406 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 407 | + $this->assertEquals('basket/product', $json['included'][0]['type']); |
|
| 408 | 408 | |
| 409 | 409 | // delivery services |
| 410 | - $client->request( 'GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'delivery']] ); |
|
| 411 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 412 | - $this->assertEquals( 1, count( $json['data'] ) ); |
|
| 410 | + $client->request('GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'delivery']]); |
|
| 411 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 412 | + $this->assertEquals(1, count($json['data'])); |
|
| 413 | 413 | |
| 414 | 414 | // add delivery service |
| 415 | - $content = '{"data": {"id": "delivery", "attributes": {"service.id": ' . $json['data'][0]['id'] . '}}}'; |
|
| 416 | - $client->request( 'POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content ); |
|
| 417 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 418 | - $this->assertEquals( 'basket/service', $json['included'][1]['type'] ); |
|
| 415 | + $content = '{"data": {"id": "delivery", "attributes": {"service.id": '.$json['data'][0]['id'].'}}}'; |
|
| 416 | + $client->request('POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content); |
|
| 417 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 418 | + $this->assertEquals('basket/service', $json['included'][1]['type']); |
|
| 419 | 419 | |
| 420 | 420 | // payment services |
| 421 | - $client->request( 'GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']] ); |
|
| 422 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 423 | - $this->assertEquals( 3, count( $json['data'] ) ); |
|
| 421 | + $client->request('GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']]); |
|
| 422 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 423 | + $this->assertEquals(3, count($json['data'])); |
|
| 424 | 424 | |
| 425 | 425 | // add payment service |
| 426 | - $content = '{"data": {"id": "payment", "attributes": {"service.id": ' . $json['data'][0]['id'] . '}}}'; |
|
| 427 | - $client->request( 'POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content ); |
|
| 428 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 429 | - $this->assertEquals( 'basket/service', $json['included'][2]['type'] ); |
|
| 426 | + $content = '{"data": {"id": "payment", "attributes": {"service.id": '.$json['data'][0]['id'].'}}}'; |
|
| 427 | + $client->request('POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content); |
|
| 428 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 429 | + $this->assertEquals('basket/service', $json['included'][2]['type']); |
|
| 430 | 430 | |
| 431 | 431 | // add address |
| 432 | 432 | $content = '{"data": {"id": "payment", "attributes": {"order.base.address.firstname": "test"}}}'; |
| 433 | - $client->request( 'POST', $json['links']['basket/address']['href'], [], [], [], $content ); |
|
| 434 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 435 | - $this->assertEquals( 'basket/address', $json['included'][3]['type'] ); |
|
| 433 | + $client->request('POST', $json['links']['basket/address']['href'], [], [], [], $content); |
|
| 434 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 435 | + $this->assertEquals('basket/address', $json['included'][3]['type']); |
|
| 436 | 436 | |
| 437 | 437 | // store basket |
| 438 | - $client->request( 'POST', $json['data']['links']['self']['href'] ); |
|
| 439 | - $basketJson = json_decode( $client->getResponse()->getContent(), true ); |
|
| 440 | - $this->assertEquals( true, ctype_digit( $basketJson['data']['id'] ) ); |
|
| 438 | + $client->request('POST', $json['data']['links']['self']['href']); |
|
| 439 | + $basketJson = json_decode($client->getResponse()->getContent(), true); |
|
| 440 | + $this->assertEquals(true, ctype_digit($basketJson['data']['id'])); |
|
| 441 | 441 | |
| 442 | 442 | // add order |
| 443 | - $content = '{"data": {"attributes": {"order.baseid": ' . $basketJson['data']['id'] . '}}}'; |
|
| 444 | - $client->request( 'POST', $basketJson['links']['order']['href'], [], [], [], $content ); |
|
| 445 | - $json = json_decode( $client->getResponse()->getContent(), true ); |
|
| 446 | - $this->assertEquals( true, ctype_digit( $json['data']['id'] ) ); |
|
| 443 | + $content = '{"data": {"attributes": {"order.baseid": '.$basketJson['data']['id'].'}}}'; |
|
| 444 | + $client->request('POST', $basketJson['links']['order']['href'], [], [], [], $content); |
|
| 445 | + $json = json_decode($client->getResponse()->getContent(), true); |
|
| 446 | + $this->assertEquals(true, ctype_digit($json['data']['id'])); |
|
| 447 | 447 | |
| 448 | 448 | |
| 449 | 449 | // delete created order |
| 450 | - $context = static::$kernel->getContainer()->get( 'aimeos_context' )->get(); |
|
| 451 | - \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->deleteItem( $basketJson['data']['id'] ); |
|
| 450 | + $context = static::$kernel->getContainer()->get('aimeos_context')->get(); |
|
| 451 | + \Aimeos\MShop\Factory::createManager($context, 'order/base')->deleteItem($basketJson['data']['id']); |
|
| 452 | 452 | } |
| 453 | 453 | } |