@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function indexAction() |
31 | 31 | { |
32 | - $params = $this->get( 'aimeos_page' )->getSections( 'account-index' ); |
|
33 | - return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params ); |
|
32 | + $params = $this->get('aimeos_page')->getSections('account-index'); |
|
33 | + return $this->render('AimeosShopBundle:Account:index.html.twig', $params); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | $context = $this->container->get('aimeos_context')->get(); |
45 | 45 | $langid = $context->getLocale()->getLanguageId(); |
46 | 46 | |
47 | - $view = $this->container->get('aimeos_view')->create( $context->getConfig(), array(), $langid ); |
|
48 | - $context->setView( $view ); |
|
47 | + $view = $this->container->get('aimeos_view')->create($context->getConfig(), array(), $langid); |
|
48 | + $context->setView($view); |
|
49 | 49 | |
50 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' ); |
|
51 | - $client->setView( $view ); |
|
50 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download'); |
|
51 | + $client->setView($view); |
|
52 | 52 | $client->process(); |
53 | 53 | |
54 | 54 | $response = $view->response(); |
55 | - return new Response( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
55 | + return new Response((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
56 | 56 | } |
57 | 57 | } |
@@ -10,17 +10,17 @@ |
||
10 | 10 | public function testAccount() |
11 | 11 | { |
12 | 12 | $client = static::createClient(); |
13 | - $client->request( 'GET', '/unittest/de/EUR/myaccount' ); |
|
13 | + $client->request('GET', '/unittest/de/EUR/myaccount'); |
|
14 | 14 | |
15 | - $this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() ); |
|
15 | + $this->assertContains('aimeos account-history', $client->getResponse()->getContent()); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | |
19 | 19 | public function testDownload() |
20 | 20 | { |
21 | 21 | $client = static::createClient(); |
22 | - $client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' ); |
|
22 | + $client->request('GET', '/unittest/de/EUR/myaccount/download/0'); |
|
23 | 23 | |
24 | - $this->assertEquals( 401, $client->getResponse()->getStatusCode() ); |
|
24 | + $this->assertEquals(401, $client->getResponse()->getStatusCode()); |
|
25 | 25 | } |
26 | 26 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param Container $container Container object to access parameters |
31 | 31 | */ |
32 | - public function __construct( Container $container ) |
|
32 | + public function __construct(Container $container) |
|
33 | 33 | { |
34 | 34 | $this->container = $container; |
35 | 35 | } |
@@ -41,27 +41,27 @@ discard block |
||
41 | 41 | * @param array $languageIds List of two letter ISO language IDs |
42 | 42 | * @return \Aimeos\MW\Translation\Interface[] List of translation objects |
43 | 43 | */ |
44 | - public function get( array $languageIds ) |
|
44 | + public function get(array $languageIds) |
|
45 | 45 | { |
46 | - $i18nPaths = $this->container->get( 'aimeos' )->get()->getI18nPaths(); |
|
46 | + $i18nPaths = $this->container->get('aimeos')->get()->getI18nPaths(); |
|
47 | 47 | |
48 | - foreach( $languageIds as $langid ) |
|
48 | + foreach ($languageIds as $langid) |
|
49 | 49 | { |
50 | - if( !isset( $this->i18n[$langid] ) ) |
|
50 | + if (!isset($this->i18n[$langid])) |
|
51 | 51 | { |
52 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid ); |
|
52 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); |
|
53 | 53 | |
54 | - $apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' ); |
|
55 | - $prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' ); |
|
54 | + $apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable'); |
|
55 | + $prefix = $this->container->getParameter('aimeos_shop.apc_prefix'); |
|
56 | 56 | |
57 | - if( function_exists( 'apc_store' ) === true && $apc === true ) { |
|
58 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix ); |
|
57 | + if (function_exists('apc_store') === true && $apc === true) { |
|
58 | + $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $prefix); |
|
59 | 59 | } |
60 | 60 | |
61 | - $translations = $this->container->getParameter( 'aimeos_shop.i18n' ); |
|
61 | + $translations = $this->container->getParameter('aimeos_shop.i18n'); |
|
62 | 62 | |
63 | - if( isset( $translations[$langid] ) ) { |
|
64 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $translations[$langid] ); |
|
63 | + if (isset($translations[$langid])) { |
|
64 | + $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $translations[$langid]); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $this->i18n[$langid] = $i18n; |
@@ -31,15 +31,15 @@ discard block |
||
31 | 31 | * @param string $site Unique site code |
32 | 32 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
33 | 33 | */ |
34 | - public function deleteAction( Request $request, $resource, $site = 'default' ) |
|
34 | + public function deleteAction(Request $request, $resource, $site = 'default') |
|
35 | 35 | { |
36 | 36 | $status = 500; |
37 | 37 | $header = $request->headers->all(); |
38 | 38 | |
39 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
40 | - $result = $client->delete( $request->getContent(), $header, $status ); |
|
39 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
40 | + $result = $client->delete($request->getContent(), $header, $status); |
|
41 | 41 | |
42 | - return $this->createResponse( $result, $status, $header ); |
|
42 | + return $this->createResponse($result, $status, $header); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -51,15 +51,15 @@ discard block |
||
51 | 51 | * @param string $site Unique site code |
52 | 52 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
53 | 53 | */ |
54 | - public function getAction( Request $request, $resource, $site = 'default' ) |
|
54 | + public function getAction(Request $request, $resource, $site = 'default') |
|
55 | 55 | { |
56 | 56 | $status = 500; |
57 | 57 | $header = $request->headers->all(); |
58 | 58 | |
59 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
60 | - $result = $client->get( $request->getContent(), $header, $status ); |
|
59 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
60 | + $result = $client->get($request->getContent(), $header, $status); |
|
61 | 61 | |
62 | - return $this->createResponse( $result, $status, $header ); |
|
62 | + return $this->createResponse($result, $status, $header); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | |
@@ -71,15 +71,15 @@ discard block |
||
71 | 71 | * @param string $site Unique site code |
72 | 72 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
73 | 73 | */ |
74 | - public function patchAction( Request $request, $resource, $site = 'default' ) |
|
74 | + public function patchAction(Request $request, $resource, $site = 'default') |
|
75 | 75 | { |
76 | 76 | $status = 500; |
77 | 77 | $header = $request->headers->all(); |
78 | 78 | |
79 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
80 | - $result = $client->patch( $request->getContent(), $header, $status ); |
|
79 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
80 | + $result = $client->patch($request->getContent(), $header, $status); |
|
81 | 81 | |
82 | - return $this->createResponse( $result, $status, $header ); |
|
82 | + return $this->createResponse($result, $status, $header); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | |
@@ -91,15 +91,15 @@ discard block |
||
91 | 91 | * @param string $site Unique site code |
92 | 92 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
93 | 93 | */ |
94 | - public function postAction( Request $request, $resource, $site = 'default' ) |
|
94 | + public function postAction(Request $request, $resource, $site = 'default') |
|
95 | 95 | { |
96 | 96 | $status = 500; |
97 | 97 | $header = $request->headers->all(); |
98 | 98 | |
99 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
100 | - $result = $client->post( $request->getContent(), $header, $status ); |
|
99 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
100 | + $result = $client->post($request->getContent(), $header, $status); |
|
101 | 101 | |
102 | - return $this->createResponse( $result, $status, $header ); |
|
102 | + return $this->createResponse($result, $status, $header); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | |
@@ -111,15 +111,15 @@ discard block |
||
111 | 111 | * @param string $site Unique site code |
112 | 112 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
113 | 113 | */ |
114 | - public function putAction( Request $request, $resource, $site = 'default' ) |
|
114 | + public function putAction(Request $request, $resource, $site = 'default') |
|
115 | 115 | { |
116 | 116 | $status = 500; |
117 | 117 | $header = $request->headers->all(); |
118 | 118 | |
119 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
120 | - $result = $client->put( $request->getContent(), $header, $status ); |
|
119 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
120 | + $result = $client->put($request->getContent(), $header, $status); |
|
121 | 121 | |
122 | - return $this->createResponse( $result, $status, $header ); |
|
122 | + return $this->createResponse($result, $status, $header); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | |
@@ -131,15 +131,15 @@ discard block |
||
131 | 131 | * @param string $site Unique site code |
132 | 132 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
133 | 133 | */ |
134 | - public function optionsAction( Request $request, $resource = '', $site = 'default' ) |
|
134 | + public function optionsAction(Request $request, $resource = '', $site = 'default') |
|
135 | 135 | { |
136 | 136 | $status = 500; |
137 | 137 | $header = $request->headers->all(); |
138 | 138 | |
139 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
140 | - $result = $client->options( $request->getContent(), $header, $status ); |
|
139 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
140 | + $result = $client->options($request->getContent(), $header, $status); |
|
141 | 141 | |
142 | - return $this->createResponse( $result, $status, $header ); |
|
142 | + return $this->createResponse($result, $status, $header); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | |
@@ -151,18 +151,18 @@ discard block |
||
151 | 151 | * @param string $lang Language code |
152 | 152 | * @return \Aimeos\MShop\Context\Item\Iface Context item |
153 | 153 | */ |
154 | - protected function createClient( $site, $resource, $lang ) |
|
154 | + protected function createClient($site, $resource, $lang) |
|
155 | 155 | { |
156 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
157 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
156 | + $aimeos = $this->get('aimeos')->get(); |
|
157 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
158 | 158 | |
159 | - $context = $this->get( 'aimeos_context' )->get( false ); |
|
160 | - $context = $this->setLocale( $context, $site, $lang ); |
|
159 | + $context = $this->get('aimeos_context')->get(false); |
|
160 | + $context = $this->setLocale($context, $site, $lang); |
|
161 | 161 | |
162 | - $view = $this->get('aimeos_view')->create( $context->getConfig(), $templatePaths, $lang ); |
|
163 | - $context->setView( $view ); |
|
162 | + $view = $this->get('aimeos_view')->create($context->getConfig(), $templatePaths, $lang); |
|
163 | + $context->setView($view); |
|
164 | 164 | |
165 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
165 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | |
@@ -174,14 +174,14 @@ discard block |
||
174 | 174 | * @param array $header List of HTTP headers |
175 | 175 | * @return Response HTTP response object |
176 | 176 | */ |
177 | - protected function createResponse( $content, $status, array $header ) |
|
177 | + protected function createResponse($content, $status, array $header) |
|
178 | 178 | { |
179 | 179 | $response = new Response(); |
180 | - $response->setContent( $content ); |
|
181 | - $response->setStatusCode( $status ); |
|
180 | + $response->setContent($content); |
|
181 | + $response->setStatusCode($status); |
|
182 | 182 | |
183 | - foreach( $header as $key => $value ) { |
|
184 | - $response->headers->set( $key, $value ); |
|
183 | + foreach ($header as $key => $value) { |
|
184 | + $response->headers->set($key, $value); |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | return $response; |
@@ -196,23 +196,23 @@ discard block |
||
196 | 196 | * @param string $lang ISO language code, e.g. "en" or "en_GB" |
197 | 197 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
198 | 198 | */ |
199 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site, $lang ) |
|
199 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang) |
|
200 | 200 | { |
201 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
201 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
202 | 202 | |
203 | 203 | try |
204 | 204 | { |
205 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
206 | - $localeItem->setLanguageId( null ); |
|
207 | - $localeItem->setCurrencyId( null ); |
|
205 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
206 | + $localeItem->setLanguageId(null); |
|
207 | + $localeItem->setCurrencyId(null); |
|
208 | 208 | } |
209 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
209 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
210 | 210 | { |
211 | 211 | $localeItem = $localeManager->createItem(); |
212 | 212 | } |
213 | 213 | |
214 | - $context->setLocale( $localeItem ); |
|
215 | - $context->setI18n( $this->get('aimeos_i18n')->get( array( $lang ) ) ); |
|
214 | + $context->setLocale($localeItem); |
|
215 | + $context->setI18n($this->get('aimeos_i18n')->get(array($lang))); |
|
216 | 216 | |
217 | 217 | return $context; |
218 | 218 | } |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | $client = static::createClient(array(), array( |
13 | 13 | 'PHP_AUTH_USER' => 'admin', |
14 | 14 | 'PHP_AUTH_PW' => 'adminpass', |
15 | - ) ); |
|
15 | + )); |
|
16 | 16 | |
17 | - $client->request( 'GET', '/jqadm/file/css' ); |
|
17 | + $client->request('GET', '/jqadm/file/css'); |
|
18 | 18 | |
19 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
20 | - $this->assertContains( '.aimeos', $client->getResponse()->getContent() ); |
|
19 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
20 | + $this->assertContains('.aimeos', $client->getResponse()->getContent()); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -26,12 +26,12 @@ discard block |
||
26 | 26 | $client = static::createClient(array(), array( |
27 | 27 | 'PHP_AUTH_USER' => 'admin', |
28 | 28 | 'PHP_AUTH_PW' => 'adminpass', |
29 | - ) ); |
|
29 | + )); |
|
30 | 30 | |
31 | - $client->request( 'GET', '/jqadm/file/js' ); |
|
31 | + $client->request('GET', '/jqadm/file/js'); |
|
32 | 32 | |
33 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
34 | - $this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() ); |
|
33 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
34 | + $this->assertContains('Aimeos = {', $client->getResponse()->getContent()); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | $client = static::createClient(array(), array( |
41 | 41 | 'PHP_AUTH_USER' => 'admin', |
42 | 42 | 'PHP_AUTH_PW' => 'adminpass', |
43 | - ) ); |
|
43 | + )); |
|
44 | 44 | |
45 | - $client->request( 'GET', '/unittest/jqadm/copy/product/0' ); |
|
45 | + $client->request('GET', '/unittest/jqadm/copy/product/0'); |
|
46 | 46 | $response = $client->getResponse(); |
47 | 47 | |
48 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
49 | - $this->assertContains( '<div class="product-item', $response->getContent() ); |
|
48 | + $this->assertEquals(200, $response->getStatusCode()); |
|
49 | + $this->assertContains('<div class="product-item', $response->getContent()); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -55,13 +55,13 @@ discard block |
||
55 | 55 | $client = static::createClient(array(), array( |
56 | 56 | 'PHP_AUTH_USER' => 'admin', |
57 | 57 | 'PHP_AUTH_PW' => 'adminpass', |
58 | - ) ); |
|
58 | + )); |
|
59 | 59 | |
60 | - $client->request( 'GET', '/unittest/jqadm/create/product' ); |
|
60 | + $client->request('GET', '/unittest/jqadm/create/product'); |
|
61 | 61 | $response = $client->getResponse(); |
62 | 62 | |
63 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
64 | - $this->assertContains( '<div class="product-item', $response->getContent() ); |
|
63 | + $this->assertEquals(200, $response->getStatusCode()); |
|
64 | + $this->assertContains('<div class="product-item', $response->getContent()); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | $client = static::createClient(array(), array( |
71 | 71 | 'PHP_AUTH_USER' => 'admin', |
72 | 72 | 'PHP_AUTH_PW' => 'adminpass', |
73 | - ) ); |
|
73 | + )); |
|
74 | 74 | |
75 | - $client->request( 'GET', '/unittest/jqadm/delete/product/0' ); |
|
75 | + $client->request('GET', '/unittest/jqadm/delete/product/0'); |
|
76 | 76 | $response = $client->getResponse(); |
77 | 77 | |
78 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
79 | - $this->assertContains( '<table class="list-items', $response->getContent() ); |
|
78 | + $this->assertEquals(200, $response->getStatusCode()); |
|
79 | + $this->assertContains('<table class="list-items', $response->getContent()); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | $client = static::createClient(array(), array( |
86 | 86 | 'PHP_AUTH_USER' => 'admin', |
87 | 87 | 'PHP_AUTH_PW' => 'adminpass', |
88 | - ) ); |
|
88 | + )); |
|
89 | 89 | |
90 | - $client->request( 'GET', '/unittest/jqadm/get/product/0' ); |
|
90 | + $client->request('GET', '/unittest/jqadm/get/product/0'); |
|
91 | 91 | $response = $client->getResponse(); |
92 | 92 | |
93 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
94 | - $this->assertContains( '<div class="product-item', $response->getContent() ); |
|
93 | + $this->assertEquals(200, $response->getStatusCode()); |
|
94 | + $this->assertContains('<div class="product-item', $response->getContent()); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | $client = static::createClient(array(), array( |
101 | 101 | 'PHP_AUTH_USER' => 'admin', |
102 | 102 | 'PHP_AUTH_PW' => 'adminpass', |
103 | - ) ); |
|
103 | + )); |
|
104 | 104 | |
105 | - $client->request( 'POST', '/unittest/jqadm/save/product/0' ); |
|
105 | + $client->request('POST', '/unittest/jqadm/save/product/0'); |
|
106 | 106 | $response = $client->getResponse(); |
107 | 107 | |
108 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
109 | - $this->assertContains( '<div class="product-item', $response->getContent() ); |
|
108 | + $this->assertEquals(200, $response->getStatusCode()); |
|
109 | + $this->assertContains('<div class="product-item', $response->getContent()); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | |
@@ -115,13 +115,13 @@ discard block |
||
115 | 115 | $client = static::createClient(array(), array( |
116 | 116 | 'PHP_AUTH_USER' => 'admin', |
117 | 117 | 'PHP_AUTH_PW' => 'adminpass', |
118 | - ) ); |
|
118 | + )); |
|
119 | 119 | |
120 | - $client->request( 'GET', '/unittest/jqadm/search/product' ); |
|
120 | + $client->request('GET', '/unittest/jqadm/search/product'); |
|
121 | 121 | $response = $client->getResponse(); |
122 | 122 | |
123 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
124 | - $this->assertContains( '<table class="list-items', $response->getContent() ); |
|
123 | + $this->assertEquals(200, $response->getStatusCode()); |
|
124 | + $this->assertContains('<table class="list-items', $response->getContent()); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | |
@@ -130,12 +130,12 @@ discard block |
||
130 | 130 | $client = static::createClient(array(), array( |
131 | 131 | 'PHP_AUTH_USER' => 'admin', |
132 | 132 | 'PHP_AUTH_PW' => 'adminpass', |
133 | - ) ); |
|
133 | + )); |
|
134 | 134 | |
135 | - $client->request( 'GET', '/invalid/jqadm/search/product' ); |
|
135 | + $client->request('GET', '/invalid/jqadm/search/product'); |
|
136 | 136 | $response = $client->getResponse(); |
137 | 137 | |
138 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
139 | - $this->assertContains( '<table class="list-items', $response->getContent() ); |
|
138 | + $this->assertEquals(200, $response->getStatusCode()); |
|
139 | + $this->assertContains('<table class="list-items', $response->getContent()); |
|
140 | 140 | } |
141 | 141 | } |
@@ -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,57 +47,57 @@ 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\MW\Config\Iface $config, array $templatePaths, $locale = null ) |
|
50 | + public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null) |
|
51 | 51 | { |
52 | 52 | $params = $fixed = array(); |
53 | 53 | $request = $this->requestStack->getMasterRequest(); |
54 | 54 | |
55 | - if( $locale !== null ) |
|
55 | + if ($locale !== null) |
|
56 | 56 | { |
57 | - $params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' ); |
|
57 | + $params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params'); |
|
58 | 58 | $fixed = $this->getFixedParams(); |
59 | 59 | |
60 | - $i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) ); |
|
60 | + $i18n = $this->container->get('aimeos_i18n')->get(array($locale)); |
|
61 | 61 | $translation = $i18n[$locale]; |
62 | 62 | } |
63 | 63 | else |
64 | 64 | { |
65 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
65 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
69 | - $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
|
69 | + $view = new \Aimeos\MW\View\Standard($templatePaths); |
|
70 | 70 | |
71 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
72 | - $view->addHelper( 'translate', $helper ); |
|
71 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
72 | + $view->addHelper('translate', $helper); |
|
73 | 73 | |
74 | - $helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed ); |
|
75 | - $view->addHelper( 'url', $helper ); |
|
74 | + $helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed); |
|
75 | + $view->addHelper('url', $helper); |
|
76 | 76 | |
77 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
78 | - $view->addHelper( 'param', $helper ); |
|
77 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
78 | + $view->addHelper('param', $helper); |
|
79 | 79 | |
80 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
81 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
82 | - $view->addHelper( 'config', $helper ); |
|
80 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
81 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
82 | + $view->addHelper('config', $helper); |
|
83 | 83 | |
84 | - $sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' ); |
|
85 | - $sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' ); |
|
86 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 ); |
|
87 | - $view->addHelper( 'number', $helper ); |
|
84 | + $sepDec = $config->get('client/html/common/format/seperatorDecimal', '.'); |
|
85 | + $sep1000 = $config->get('client/html/common/format/seperator1000', ' '); |
|
86 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000); |
|
87 | + $view->addHelper('number', $helper); |
|
88 | 88 | |
89 | - if( $request !== null ) |
|
89 | + if ($request !== null) |
|
90 | 90 | { |
91 | - $helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request ); |
|
92 | - $view->addHelper( 'request', $helper ); |
|
91 | + $helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request); |
|
92 | + $view->addHelper('request', $helper); |
|
93 | 93 | } |
94 | 94 | |
95 | - $helper = new \Aimeos\MW\View\Helper\Response\Symfony2( $view ); |
|
96 | - $view->addHelper( 'response', $helper ); |
|
95 | + $helper = new \Aimeos\MW\View\Helper\Response\Symfony2($view); |
|
96 | + $view->addHelper('response', $helper); |
|
97 | 97 | |
98 | - $token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' ); |
|
99 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() ); |
|
100 | - $view->addHelper( 'csrf', $helper ); |
|
98 | + $token = $this->container->get('security.csrf.token_manager')->getToken('_token'); |
|
99 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue()); |
|
100 | + $view->addHelper('csrf', $helper); |
|
101 | 101 | |
102 | 102 | return $view; |
103 | 103 | } |
@@ -113,15 +113,15 @@ discard block |
||
113 | 113 | $urlparams = array(); |
114 | 114 | $attr = $this->requestStack->getMasterRequest()->attributes; |
115 | 115 | |
116 | - if( ( $site = $attr->get( 'site' ) ) !== null ) { |
|
116 | + if (($site = $attr->get('site')) !== null) { |
|
117 | 117 | $urlparams['site'] = $site; |
118 | 118 | } |
119 | 119 | |
120 | - if( ( $lang = $attr->get( 'locale' ) ) !== null ) { |
|
120 | + if (($lang = $attr->get('locale')) !== null) { |
|
121 | 121 | $urlparams['locale'] = $lang; |
122 | 122 | } |
123 | 123 | |
124 | - if( ( $currency = $attr->get( 'currency' ) ) !== null ) { |
|
124 | + if (($currency = $attr->get('currency')) !== null) { |
|
125 | 125 | $urlparams['currency'] = $currency; |
126 | 126 | } |
127 | 127 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * @param RequestStack $requestStack Current request stack |
35 | 35 | * @param Container $container Container object to access parameters |
36 | 36 | */ |
37 | - public function __construct( RequestStack $requestStack, Container $container ) |
|
37 | + public function __construct(RequestStack $requestStack, Container $container) |
|
38 | 38 | { |
39 | 39 | $this->requestStack = $requestStack; |
40 | 40 | $this->container = $container; |
@@ -47,52 +47,52 @@ discard block |
||
47 | 47 | * @param boolean $locale True to add locale object to context, false if not |
48 | 48 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
49 | 49 | */ |
50 | - public function get( $locale = true ) |
|
50 | + public function get($locale = true) |
|
51 | 51 | { |
52 | - if( self::$context === null ) |
|
52 | + if (self::$context === null) |
|
53 | 53 | { |
54 | 54 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
55 | 55 | |
56 | 56 | $config = $this->getConfig(); |
57 | - $context->setConfig( $config ); |
|
57 | + $context->setConfig($config); |
|
58 | 58 | |
59 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $config ); |
|
60 | - $context->setDatabaseManager( $dbm ); |
|
59 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($config); |
|
60 | + $context->setDatabaseManager($dbm); |
|
61 | 61 | |
62 | - $fs = new \Aimeos\MW\Filesystem\Manager\Standard( $config ); |
|
63 | - $context->setFilesystemManager( $fs ); |
|
62 | + $fs = new \Aimeos\MW\Filesystem\Manager\Standard($config); |
|
63 | + $context->setFilesystemManager($fs); |
|
64 | 64 | |
65 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $config ); |
|
66 | - $context->setMessageQueueManager( $mq ); |
|
65 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($config); |
|
66 | + $context->setMessageQueueManager($mq); |
|
67 | 67 | |
68 | 68 | $container = $this->container; |
69 | - $mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } ); |
|
70 | - $context->setMail( $mail ); |
|
69 | + $mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } ); |
|
70 | + $context->setMail($mail); |
|
71 | 71 | |
72 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
73 | - $context->setLogger( $logger ); |
|
72 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
73 | + $context->setLogger($logger); |
|
74 | 74 | |
75 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
76 | - $context->setCache( $cache ); |
|
75 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
76 | + $context->setCache($cache); |
|
77 | 77 | |
78 | 78 | self::$context = $context; |
79 | 79 | } |
80 | 80 | |
81 | 81 | $context = self::$context; |
82 | 82 | |
83 | - if( $locale === true ) |
|
83 | + if ($locale === true) |
|
84 | 84 | { |
85 | - $localeItem = $this->getLocale( $context ); |
|
85 | + $localeItem = $this->getLocale($context); |
|
86 | 86 | $langid = $localeItem->getLanguageId(); |
87 | 87 | |
88 | - $context->setLocale( $localeItem ); |
|
89 | - $context->setI18n( $this->container->get('aimeos_i18n')->get( array( $langid ) ) ); |
|
88 | + $context->setLocale($localeItem); |
|
89 | + $context->setI18n($this->container->get('aimeos_i18n')->get(array($langid))); |
|
90 | 90 | } |
91 | 91 | |
92 | - $session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) ); |
|
93 | - $context->setSession( $session ); |
|
92 | + $session = new \Aimeos\MW\Session\Symfony2($this->container->get('session')); |
|
93 | + $context->setSession($session); |
|
94 | 94 | |
95 | - $this->addUser( $context ); |
|
95 | + $this->addUser($context); |
|
96 | 96 | |
97 | 97 | return $context; |
98 | 98 | } |
@@ -103,39 +103,39 @@ discard block |
||
103 | 103 | * |
104 | 104 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
105 | 105 | */ |
106 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
106 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
107 | 107 | { |
108 | 108 | $token = null; |
109 | 109 | $username = ''; |
110 | 110 | |
111 | - if( $this->container->has( 'security.token_storage' ) ) { |
|
112 | - $token = $this->container->get( 'security.token_storage' )->getToken(); |
|
111 | + if ($this->container->has('security.token_storage')) { |
|
112 | + $token = $this->container->get('security.token_storage')->getToken(); |
|
113 | 113 | } |
114 | - else if( $this->container->has( 'security.context' ) ) { |
|
115 | - $token = $this->container->get( 'security.context' )->getToken(); |
|
114 | + else if ($this->container->has('security.context')) { |
|
115 | + $token = $this->container->get('security.context')->getToken(); |
|
116 | 116 | } |
117 | 117 | |
118 | - if( is_object( $token ) ) |
|
118 | + if (is_object($token)) |
|
119 | 119 | { |
120 | - if( method_exists( $token->getUser(), 'getId' ) ) |
|
120 | + if (method_exists($token->getUser(), 'getId')) |
|
121 | 121 | { |
122 | 122 | $userid = $token->getUser()->getId(); |
123 | - $context->setUserId( $userid ); |
|
124 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
123 | + $context->setUserId($userid); |
|
124 | + $context->setGroupIds(function() use ($context, $userid) |
|
125 | 125 | { |
126 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
127 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
126 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
127 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
128 | 128 | } ); |
129 | 129 | } |
130 | 130 | |
131 | - if( is_object( $token->getUser() ) ) { |
|
132 | - $username = $token->getUser()->getUsername(); |
|
131 | + if (is_object($token->getUser())) { |
|
132 | + $username = $token->getUser()->getUsername(); |
|
133 | 133 | } else { |
134 | 134 | $username = $token->getUser(); |
135 | 135 | } |
136 | 136 | } |
137 | 137 | |
138 | - $context->setEditor( $username ); |
|
138 | + $context->setEditor($username); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | |
@@ -146,27 +146,27 @@ discard block |
||
146 | 146 | */ |
147 | 147 | protected function getConfig() |
148 | 148 | { |
149 | - $configPaths = $this->container->get('aimeos')->get()->getConfigPaths( 'mysql' ); |
|
149 | + $configPaths = $this->container->get('aimeos')->get()->getConfigPaths('mysql'); |
|
150 | 150 | |
151 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $configPaths ); |
|
151 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $configPaths); |
|
152 | 152 | |
153 | - $apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' ); |
|
154 | - $prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' ); |
|
153 | + $apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable'); |
|
154 | + $prefix = $this->container->getParameter('aimeos_shop.apc_prefix'); |
|
155 | 155 | |
156 | - if( function_exists( 'apc_store' ) === true && $apc === true ) { |
|
157 | - $conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix ); |
|
156 | + if (function_exists('apc_store') === true && $apc === true) { |
|
157 | + $conf = new \Aimeos\MW\Config\Decorator\APC($conf, $prefix); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | $local = array( |
161 | - 'admin' => $this->container->getParameter( 'aimeos_shop.admin' ), |
|
162 | - 'client' => $this->container->getParameter( 'aimeos_shop.client' ), |
|
163 | - 'controller' => $this->container->getParameter( 'aimeos_shop.controller' ), |
|
164 | - 'madmin' => $this->container->getParameter( 'aimeos_shop.madmin' ), |
|
165 | - 'mshop' => $this->container->getParameter( 'aimeos_shop.mshop' ), |
|
166 | - 'resource' => $this->container->getParameter( 'aimeos_shop.resource' ), |
|
161 | + 'admin' => $this->container->getParameter('aimeos_shop.admin'), |
|
162 | + 'client' => $this->container->getParameter('aimeos_shop.client'), |
|
163 | + 'controller' => $this->container->getParameter('aimeos_shop.controller'), |
|
164 | + 'madmin' => $this->container->getParameter('aimeos_shop.madmin'), |
|
165 | + 'mshop' => $this->container->getParameter('aimeos_shop.mshop'), |
|
166 | + 'resource' => $this->container->getParameter('aimeos_shop.resource'), |
|
167 | 167 | ); |
168 | 168 | |
169 | - return new \Aimeos\MW\Config\Decorator\Memory( $conf, $local ); |
|
169 | + return new \Aimeos\MW\Config\Decorator\Memory($conf, $local); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | |
@@ -176,19 +176,19 @@ discard block |
||
176 | 176 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
177 | 177 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
178 | 178 | */ |
179 | - protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context ) |
|
179 | + protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context) |
|
180 | 180 | { |
181 | - if( $this->locale === null ) |
|
181 | + if ($this->locale === null) |
|
182 | 182 | { |
183 | - $status = $this->container->getParameter( 'aimeos_shop.disable_sites' ); |
|
183 | + $status = $this->container->getParameter('aimeos_shop.disable_sites'); |
|
184 | 184 | $attr = $this->requestStack->getMasterRequest()->attributes; |
185 | 185 | |
186 | - $site = $attr->get( 'site', 'default' ); |
|
187 | - $lang = $attr->get( 'locale', '' ); |
|
188 | - $currency = $attr->get( 'currency', '' ); |
|
186 | + $site = $attr->get('site', 'default'); |
|
187 | + $lang = $attr->get('locale', ''); |
|
188 | + $currency = $attr->get('currency', ''); |
|
189 | 189 | |
190 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
191 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status ); |
|
190 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
191 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $status); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | return $this->locale; |
@@ -29,35 +29,35 @@ discard block |
||
29 | 29 | * @param $type File type, i.e. "css" or "js" |
30 | 30 | * @return Response Response object |
31 | 31 | */ |
32 | - public function fileAction( $type ) |
|
32 | + public function fileAction($type) |
|
33 | 33 | { |
34 | 34 | $contents = ''; |
35 | 35 | $files = array(); |
36 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
36 | + $aimeos = $this->get('aimeos')->get(); |
|
37 | 37 | |
38 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) |
|
38 | + foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) |
|
39 | 39 | { |
40 | - foreach( $paths as $path ) |
|
40 | + foreach ($paths as $path) |
|
41 | 41 | { |
42 | - $jsbAbsPath = $base . '/' . $path; |
|
43 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
44 | - $files = array_merge( $files, $jsb2->getFiles( $type ) ); |
|
42 | + $jsbAbsPath = $base.'/'.$path; |
|
43 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
44 | + $files = array_merge($files, $jsb2->getFiles($type)); |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
48 | - foreach( $files as $file ) |
|
48 | + foreach ($files as $file) |
|
49 | 49 | { |
50 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
50 | + if (($content = file_get_contents($file)) !== false) { |
|
51 | 51 | $contents .= $content; |
52 | 52 | } |
53 | 53 | } |
54 | 54 | |
55 | - $response = new Response( $contents ); |
|
55 | + $response = new Response($contents); |
|
56 | 56 | |
57 | - if( $type === 'js' ) { |
|
58 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
59 | - } elseif( $type === 'css' ) { |
|
60 | - $response->headers->set( 'Content-Type', 'text/css' ); |
|
57 | + if ($type === 'js') { |
|
58 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
59 | + } elseif ($type === 'css') { |
|
60 | + $response->headers->set('Content-Type', 'text/css'); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | return $response; |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | * @param string $site Unique site code |
73 | 73 | * @return Response Generated output |
74 | 74 | */ |
75 | - public function copyAction( Request $request, $resource, $site = 'default' ) |
|
75 | + public function copyAction(Request $request, $resource, $site = 'default') |
|
76 | 76 | { |
77 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
78 | - return $this->getHtml( $cntl->copy() ); |
|
77 | + $cntl = $this->createClient($request, $site, $resource); |
|
78 | + return $this->getHtml($cntl->copy()); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | |
@@ -87,10 +87,10 @@ discard block |
||
87 | 87 | * @param string $site Unique site code |
88 | 88 | * @return Response Generated output |
89 | 89 | */ |
90 | - public function createAction( Request $request, $resource, $site = 'default' ) |
|
90 | + public function createAction(Request $request, $resource, $site = 'default') |
|
91 | 91 | { |
92 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
93 | - return $this->getHtml( $cntl->create() ); |
|
92 | + $cntl = $this->createClient($request, $site, $resource); |
|
93 | + return $this->getHtml($cntl->create()); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | |
@@ -102,10 +102,10 @@ discard block |
||
102 | 102 | * @param string $site Unique site code |
103 | 103 | * @return Response Generated output |
104 | 104 | */ |
105 | - public function deleteAction( Request $request, $resource, $site = 'default' ) |
|
105 | + public function deleteAction(Request $request, $resource, $site = 'default') |
|
106 | 106 | { |
107 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
108 | - return $this->getHtml( $cntl->delete() . $cntl->search() ); |
|
107 | + $cntl = $this->createClient($request, $site, $resource); |
|
108 | + return $this->getHtml($cntl->delete().$cntl->search()); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | * @param string $site Unique site code |
118 | 118 | * @return Response Generated output |
119 | 119 | */ |
120 | - public function getAction( Request $request, $resource, $site = 'default' ) |
|
120 | + public function getAction(Request $request, $resource, $site = 'default') |
|
121 | 121 | { |
122 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
123 | - return $this->getHtml( $cntl->get() ); |
|
122 | + $cntl = $this->createClient($request, $site, $resource); |
|
123 | + return $this->getHtml($cntl->get()); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | |
@@ -132,10 +132,10 @@ discard block |
||
132 | 132 | * @param string $site Unique site code |
133 | 133 | * @return Response Generated output |
134 | 134 | */ |
135 | - public function saveAction( Request $request, $resource, $site = 'default' ) |
|
135 | + public function saveAction(Request $request, $resource, $site = 'default') |
|
136 | 136 | { |
137 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
138 | - return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) ); |
|
137 | + $cntl = $this->createClient($request, $site, $resource); |
|
138 | + return $this->getHtml(($cntl->save() ?: $cntl->search())); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | |
@@ -147,10 +147,10 @@ discard block |
||
147 | 147 | * @param string $site Unique site code |
148 | 148 | * @return Response Generated output |
149 | 149 | */ |
150 | - public function searchAction( Request $request, $resource, $site = 'default' ) |
|
150 | + public function searchAction(Request $request, $resource, $site = 'default') |
|
151 | 151 | { |
152 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
153 | - return $this->getHtml( $cntl->search() ); |
|
152 | + $cntl = $this->createClient($request, $site, $resource); |
|
153 | + return $this->getHtml($cntl->search()); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | |
@@ -162,20 +162,20 @@ discard block |
||
162 | 162 | * @param string $resource Resource location, e.g. "product" |
163 | 163 | * @return \Aimeos\Admin\JQAdm\Iface Context item |
164 | 164 | */ |
165 | - protected function createClient( Request $request, $site, $resource ) |
|
165 | + protected function createClient(Request $request, $site, $resource) |
|
166 | 166 | { |
167 | - $lang = $request->get( 'lang', 'en' ); |
|
167 | + $lang = $request->get('lang', 'en'); |
|
168 | 168 | |
169 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
170 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
169 | + $aimeos = $this->get('aimeos')->get(); |
|
170 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
171 | 171 | |
172 | - $context = $this->get( 'aimeos_context' )->get( false ); |
|
173 | - $context = $this->setLocale( $context, $site, $lang ); |
|
172 | + $context = $this->get('aimeos_context')->get(false); |
|
173 | + $context = $this->setLocale($context, $site, $lang); |
|
174 | 174 | |
175 | - $view = $this->get( 'aimeos_view' )->create( $context->getConfig(), $templatePaths, $lang ); |
|
176 | - $context->setView( $view ); |
|
175 | + $view = $this->get('aimeos_view')->create($context->getConfig(), $templatePaths, $lang); |
|
176 | + $context->setView($view); |
|
177 | 177 | |
178 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
178 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | |
@@ -185,12 +185,12 @@ discard block |
||
185 | 185 | * @param string $content Content from admin client |
186 | 186 | * @return Response View for rendering the output |
187 | 187 | */ |
188 | - protected function getHtml( $content ) |
|
188 | + protected function getHtml($content) |
|
189 | 189 | { |
190 | - $version = $this->get( 'aimeos' )->getVersion(); |
|
191 | - $content = str_replace( array( '{type}', '{version}' ), array( 'Symfony', $version ), $content ); |
|
190 | + $version = $this->get('aimeos')->getVersion(); |
|
191 | + $content = str_replace(array('{type}', '{version}'), array('Symfony', $version), $content); |
|
192 | 192 | |
193 | - return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) ); |
|
193 | + return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content)); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | |
@@ -202,23 +202,23 @@ discard block |
||
202 | 202 | * @param string $lang ISO language code, e.g. "en" or "en_GB" |
203 | 203 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
204 | 204 | */ |
205 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site, $lang ) |
|
205 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang) |
|
206 | 206 | { |
207 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
207 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
208 | 208 | |
209 | 209 | try |
210 | 210 | { |
211 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
212 | - $localeItem->setLanguageId( null ); |
|
213 | - $localeItem->setCurrencyId( null ); |
|
211 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
212 | + $localeItem->setLanguageId(null); |
|
213 | + $localeItem->setCurrencyId(null); |
|
214 | 214 | } |
215 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
215 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
216 | 216 | { |
217 | 217 | $localeItem = $localeManager->createItem(); |
218 | 218 | } |
219 | 219 | |
220 | - $context->setLocale( $localeItem ); |
|
221 | - $context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) ); |
|
220 | + $context->setLocale($localeItem); |
|
221 | + $context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en'))); |
|
222 | 222 | |
223 | 223 | return $context; |
224 | 224 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param Container $container Container object to access parameters |
31 | 31 | */ |
32 | - public function __construct( Container $container ) |
|
32 | + public function __construct(Container $container) |
|
33 | 33 | { |
34 | 34 | $this->container = $container; |
35 | 35 | } |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function get() |
44 | 44 | { |
45 | - if( $this->object === null ) |
|
45 | + if ($this->object === null) |
|
46 | 46 | { |
47 | - $extDirs = (array) $this->container->getParameter( 'aimeos_shop.extdir' ); |
|
48 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
47 | + $extDirs = (array) $this->container->getParameter('aimeos_shop.extdir'); |
|
48 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | return $this->object; |
@@ -59,14 +59,14 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public function getVersion() |
61 | 61 | { |
62 | - $filename = dirname( $this->container->get( 'kernel' )->getRootDir() ) . DIRECTORY_SEPARATOR . 'composer.lock'; |
|
62 | + $filename = dirname($this->container->get('kernel')->getRootDir()).DIRECTORY_SEPARATOR.'composer.lock'; |
|
63 | 63 | |
64 | - if( file_exists( $filename ) === true && ( $content = file_get_contents( $filename ) ) !== false |
|
65 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
64 | + if (file_exists($filename) === true && ($content = file_get_contents($filename)) !== false |
|
65 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
66 | 66 | ) { |
67 | - foreach( (array) $content['packages'] as $item ) |
|
67 | + foreach ((array) $content['packages'] as $item) |
|
68 | 68 | { |
69 | - if( $item['name'] === 'aimeos/aimeos-symfony' ) { |
|
69 | + if ($item['name'] === 'aimeos/aimeos-symfony') { |
|
70 | 70 | return $item['version']; |
71 | 71 | } |
72 | 72 | } |