Completed
Push — master ( 7193bc...d7424f )
by Aimeos
19:48
created
Controller/JsonadmController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
119 119
 	 * @param string $site Unique site code
120 120
 	 * @param string Resource location, e.g. "product/property/type"
121 121
 	 * @param string $lang Language code
122
-	 * @return \Aimeos\MShop\Context\Item\Iface Context item
122
+	 * @return \Aimeos\Admin\JsonAdm\Iface Context item
123 123
 	 */
124 124
 	protected function createAdmin( $site, $resource, $lang )
125 125
 	{
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
31 31
 	 * @param string $site Unique site code
32 32
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
33 33
 	 */
34
-	public function deleteAction( ServerRequestInterface $request, $resource, $site = 'default' )
34
+	public function deleteAction(ServerRequestInterface $request, $resource, $site = 'default')
35 35
 	{
36
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
37
-		return $client->delete( $request, new Response() );
36
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
37
+		return $client->delete($request, new Response());
38 38
 	}
39 39
 
40 40
 
@@ -46,10 +46,10 @@  discard block
 block discarded – undo
46 46
 	 * @param string $site Unique site code
47 47
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
48 48
 	 */
49
-	public function getAction( ServerRequestInterface $request, $resource, $site = 'default' )
49
+	public function getAction(ServerRequestInterface $request, $resource, $site = 'default')
50 50
 	{
51
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
52
-		return $client->get( $request, new Response() );
51
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
52
+		return $client->get($request, new Response());
53 53
 	}
54 54
 
55 55
 
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
 	 * @param string $site Unique site code
62 62
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
63 63
 	 */
64
-	public function patchAction( ServerRequestInterface $request, $resource, $site = 'default' )
64
+	public function patchAction(ServerRequestInterface $request, $resource, $site = 'default')
65 65
 	{
66
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
67
-		return $client->patch( $request, new Response() );
66
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
67
+		return $client->patch($request, new Response());
68 68
 	}
69 69
 
70 70
 
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
76 76
 	 * @param string $site Unique site code
77 77
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
78 78
 	 */
79
-	public function postAction( ServerRequestInterface $request, $resource, $site = 'default' )
79
+	public function postAction(ServerRequestInterface $request, $resource, $site = 'default')
80 80
 	{
81
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
82
-		return $client->post( $request, new Response() );
81
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
82
+		return $client->post($request, new Response());
83 83
 	}
84 84
 
85 85
 
@@ -91,10 +91,10 @@  discard block
 block discarded – undo
91 91
 	 * @param string $site Unique site code
92 92
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
93 93
 	 */
94
-	public function putAction( ServerRequestInterface $request, $resource, $site = 'default' )
94
+	public function putAction(ServerRequestInterface $request, $resource, $site = 'default')
95 95
 	{
96
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
97
-		return $client->put( $request, new Response() );
96
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
97
+		return $client->put($request, new Response());
98 98
 	}
99 99
 
100 100
 
@@ -106,10 +106,10 @@  discard block
 block discarded – undo
106 106
 	 * @param string $site Unique site code
107 107
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
108 108
 	 */
109
-	public function optionsAction( ServerRequestInterface $request, $resource = '', $site = 'default' )
109
+	public function optionsAction(ServerRequestInterface $request, $resource = '', $site = 'default')
110 110
 	{
111
-		$client = $this->createAdmin( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
112
-		return $client->options( $request, new Response() );
111
+		$client = $this->createAdmin($site, $resource, $request->getAttribute('lang', 'en'));
112
+		return $client->options($request, new Response());
113 113
 	}
114 114
 
115 115
 
@@ -121,18 +121,18 @@  discard block
 block discarded – undo
121 121
 	 * @param string $lang Language code
122 122
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
123 123
 	 */
124
-	protected function createAdmin( $site, $resource, $lang )
124
+	protected function createAdmin($site, $resource, $lang)
125 125
 	{
126
-		$aimeos = $this->get( 'aimeos' )->get();
127
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
126
+		$aimeos = $this->get('aimeos')->get();
127
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
128 128
 
129
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
130
-		$context->setI18n( $this->get('aimeos_i18n')->get( array( $lang, 'en' ) ) );
131
-		$context->setLocale( $this->get('aimeos_locale')->getBackend( $context, $site ) );
129
+		$context = $this->get('aimeos_context')->get(false, 'backend');
130
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
131
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, $site));
132 132
 
133
-		$view = $this->get('aimeos_view')->create( $context, $templatePaths, $lang );
134
-		$context->setView( $view );
133
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
134
+		$context->setView($view);
135 135
 
136
-		return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource );
136
+		return \Aimeos\Admin\JsonAdm::create($context, $aimeos, $resource);
137 137
 	}
138 138
 }
Please login to merge, or discard this patch.
Service/Page.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 *
29 29
 	 * @param Container $container Container object to access parameters
30 30
 	 */
31
-	public function __construct( Container $container )
31
+	public function __construct(Container $container)
32 32
 	{
33 33
 		$this->container = $container;
34 34
 	}
@@ -40,23 +40,23 @@  discard block
 block discarded – undo
40 40
 	 * @param string $pageName Name of the configured page
41 41
 	 * @return array Associative list with body and header output separated by client name
42 42
 	 */
43
-	public function getSections( $pageName )
43
+	public function getSections($pageName)
44 44
 	{
45 45
 		$context = $this->container->get('aimeos_context')->get();
46
-		$pagesConfig = $this->container->getParameter( 'aimeos_shop.page' );
47
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
46
+		$pagesConfig = $this->container->getParameter('aimeos_shop.page');
47
+		$result = array('aibody' => array(), 'aiheader' => array());
48 48
 
49 49
 		$langid = $context->getLocale()->getLanguageId();
50
-		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths( 'client/html/templates' );
51
-		$view = $this->container->get('aimeos_view')->create( $context, $tmplPaths, $langid );
52
-		$context->setView( $view );
50
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/templates');
51
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
52
+		$context->setView($view);
53 53
 
54
-		if( isset( $pagesConfig[$pageName] ) )
54
+		if (isset($pagesConfig[$pageName]))
55 55
 		{
56
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
56
+			foreach ((array) $pagesConfig[$pageName] as $clientName)
57 57
 			{
58
-				$client = \Aimeos\Client\Html::create( $context, $clientName );
59
-				$client->setView( clone $view );
58
+				$client = \Aimeos\Client\Html::create($context, $clientName);
59
+				$client->setView(clone $view);
60 60
 				$client->process();
61 61
 
62 62
 				$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
Service/Support.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,15 +27,15 @@
 block discarded – undo
27 27
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
28 28
 	 * @return array List of group codes the user is in
29 29
 	 */
30
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
30
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
31 31
 	{
32 32
 		$list = array();
33
-		$manager = \Aimeos\MShop::create( $context, 'customer/group' );
33
+		$manager = \Aimeos\MShop::create($context, 'customer/group');
34 34
 
35 35
 		$search = $manager->createSearch();
36
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
36
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
37 37
 
38
-		foreach( $manager->searchItems( $search ) as $item ) {
38
+		foreach ($manager->searchItems($search) as $item) {
39 39
 			$list[] = $item->getCode();
40 40
 		}
41 41
 
Please login to merge, or discard this patch.
Service/Context.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	 *
32 32
 	 * @param Container $container Container object to access parameters
33 33
 	 */
34
-	public function __construct( Container $container )
34
+	public function __construct(Container $container)
35 35
 	{
36 36
 		$this->container = $container;
37 37
 	}
@@ -44,38 +44,38 @@  discard block
 block discarded – undo
44 44
 	 * @param string $type Configuration type ("frontend" or "backend")
45 45
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
46 46
 	 */
47
-	public function get( $locale = true, $type = 'frontend' )
47
+	public function get($locale = true, $type = 'frontend')
48 48
 	{
49
-		$config = $this->container->get( 'aimeos_config' )->get( $type );
49
+		$config = $this->container->get('aimeos_config')->get($type);
50 50
 
51
-		if( self::$context === null )
51
+		if (self::$context === null)
52 52
 		{
53 53
 			$context = new \Aimeos\MShop\Context\Item\Standard();
54
-			$context->setConfig( $config );
54
+			$context->setConfig($config);
55 55
 
56
-			$this->addDataBaseManager( $context );
57
-			$this->addFilesystemManager( $context );
58
-			$this->addMessageQueueManager( $context );
59
-			$this->addLogger( $context );
60
-			$this->addCache( $context );
61
-			$this->addMailer( $context);
62
-			$this->addProcess( $context);
56
+			$this->addDataBaseManager($context);
57
+			$this->addFilesystemManager($context);
58
+			$this->addMessageQueueManager($context);
59
+			$this->addLogger($context);
60
+			$this->addCache($context);
61
+			$this->addMailer($context);
62
+			$this->addProcess($context);
63 63
 
64 64
 			self::$context = $context;
65 65
 		}
66 66
 
67 67
 		$context = self::$context;
68
-		$context->setConfig( $config );
68
+		$context->setConfig($config);
69 69
 
70
-		if( $locale === true )
70
+		if ($locale === true)
71 71
 		{
72
-			$localeItem = $this->container->get('aimeos_locale')->get( $context );
73
-			$context->setI18n( $this->container->get('aimeos_i18n')->get( array( $localeItem->getLanguageId() ) ) );
74
-			$context->setLocale( $localeItem );
72
+			$localeItem = $this->container->get('aimeos_locale')->get($context);
73
+			$context->setI18n($this->container->get('aimeos_i18n')->get(array($localeItem->getLanguageId())));
74
+			$context->setLocale($localeItem);
75 75
 		}
76 76
 
77
-		$this->addSession( $context );
78
-		$this->addUserGroups( $context);
77
+		$this->addSession($context);
78
+		$this->addUserGroups($context);
79 79
 
80 80
 		return $context;
81 81
 	}
@@ -87,11 +87,11 @@  discard block
 block discarded – undo
87 87
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
88 88
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
89 89
 	 */
90
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
90
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
91 91
 	{
92
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
92
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
93 93
 
94
-		return $context->setCache( $cache );
94
+		return $context->setCache($cache);
95 95
 	}
96 96
 
97 97
 
@@ -101,11 +101,11 @@  discard block
 block discarded – undo
101 101
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
102 102
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
103 103
 	 */
104
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
104
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
105 105
 	{
106
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
106
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
107 107
 
108
-		return $context->setDatabaseManager( $dbm );
108
+		return $context->setDatabaseManager($dbm);
109 109
 	}
110 110
 
111 111
 
@@ -115,11 +115,11 @@  discard block
 block discarded – undo
115 115
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
116 116
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
117 117
 	 */
118
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
118
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
119 119
 	{
120
-		$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $context->getConfig() );
120
+		$fs = new \Aimeos\MW\Filesystem\Manager\Standard($context->getConfig());
121 121
 
122
-		return $context->setFilesystemManager( $fs );
122
+		return $context->setFilesystemManager($fs);
123 123
 	}
124 124
 
125 125
 
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
130 130
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
131 131
 	 */
132
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
132
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
133 133
 	{
134
-		$logger = \Aimeos\MAdmin::create( $context, 'log' );
134
+		$logger = \Aimeos\MAdmin::create($context, 'log');
135 135
 
136
-		return $context->setLogger( $logger );
136
+		return $context->setLogger($logger);
137 137
 	}
138 138
 
139 139
 
@@ -144,12 +144,12 @@  discard block
 block discarded – undo
144 144
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
145 145
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
146 146
 	 */
147
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
147
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
148 148
 	{
149 149
 		$container = $this->container;
150
-		$mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } );
150
+		$mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } );
151 151
 
152
-		return $context->setMail( $mail );
152
+		return $context->setMail($mail);
153 153
 	}
154 154
 
155 155
 
@@ -159,11 +159,11 @@  discard block
 block discarded – undo
159 159
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
160 160
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
161 161
 	 */
162
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
162
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
163 163
 	{
164
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
164
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
165 165
 
166
-		return $context->setMessageQueueManager( $mq );
166
+		return $context->setMessageQueueManager($mq);
167 167
 	}
168 168
 
169 169
 
@@ -173,16 +173,16 @@  discard block
 block discarded – undo
173 173
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
174 174
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
175 175
 	 */
176
-	protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context )
176
+	protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context)
177 177
 	{
178 178
 		$config = $context->getConfig();
179
-		$max = $config->get( 'pcntl_max', 4 );
180
-		$prio = $config->get( 'pcntl_priority', 19 );
179
+		$max = $config->get('pcntl_max', 4);
180
+		$prio = $config->get('pcntl_priority', 19);
181 181
 
182
-		$process = new \Aimeos\MW\Process\Pcntl( $max, $prio );
183
-		$process = new \Aimeos\MW\Process\Decorator\Check( $process );
182
+		$process = new \Aimeos\MW\Process\Pcntl($max, $prio);
183
+		$process = new \Aimeos\MW\Process\Decorator\Check($process);
184 184
 
185
-		return $context->setProcess( $process );
185
+		return $context->setProcess($process);
186 186
 	}
187 187
 
188 188
 
@@ -192,11 +192,11 @@  discard block
 block discarded – undo
192 192
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
193 193
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
194 194
 	 */
195
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
195
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
196 196
 	{
197
-		$session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) );
197
+		$session = new \Aimeos\MW\Session\Symfony2($this->container->get('session'));
198 198
 
199
-		return $context->setSession( $session );
199
+		return $context->setSession($session);
200 200
 	}
201 201
 
202 202
 
@@ -206,29 +206,29 @@  discard block
 block discarded – undo
206 206
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
207 207
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
208 208
 	 */
209
-	protected function addUserGroups( \Aimeos\MShop\Context\Item\Iface $context )
209
+	protected function addUserGroups(\Aimeos\MShop\Context\Item\Iface $context)
210 210
 	{
211 211
 		$username = '';
212
-		$token = $this->container->get( 'security.token_storage' )->getToken();
212
+		$token = $this->container->get('security.token_storage')->getToken();
213 213
 
214
-		if( is_object( $token ) && is_object( $token->getUser() ) && method_exists( $token->getUser(), 'getId' ) )
214
+		if (is_object($token) && is_object($token->getUser()) && method_exists($token->getUser(), 'getId'))
215 215
 		{
216
-			$username =  $token->getUser()->getUsername();
216
+			$username = $token->getUser()->getUsername();
217 217
 			$userid = $token->getUser()->getId();
218
-			$context->setUserId( $userid );
219
-			$context->setGroupIds( function() use ( $context, $userid )
218
+			$context->setUserId($userid);
219
+			$context->setGroupIds(function() use ($context, $userid)
220 220
 			{
221
-				$manager = \Aimeos\MShop::create( $context, 'customer' );
222
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
221
+				$manager = \Aimeos\MShop::create($context, 'customer');
222
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
223 223
 			} );
224 224
 		}
225 225
 
226
-		if( $username === '' && $this->container->has( 'request_stack' )
227
-			&& ( $request = $this->container->get('request_stack')->getMasterRequest() ) !== null
226
+		if ($username === '' && $this->container->has('request_stack')
227
+			&& ($request = $this->container->get('request_stack')->getMasterRequest()) !== null
228 228
 		) {
229 229
 			$username = $request->getClientIp();
230 230
 		}
231 231
 
232
-		return $context->setEditor( $username );
232
+		return $context->setEditor($username);
233 233
 	}
234 234
 }
Please login to merge, or discard this patch.
Service/Locale.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
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;
@@ -45,19 +45,19 @@  discard block
 block discarded – undo
45 45
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
46 46
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
47 47
 	 */
48
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
48
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
49 49
 	{
50
-		if( $this->locale === null )
50
+		if ($this->locale === null)
51 51
 		{
52
-			$status = $this->container->getParameter( 'aimeos_shop.disable_sites' );
52
+			$status = $this->container->getParameter('aimeos_shop.disable_sites');
53 53
 			$request = $this->requestStack->getMasterRequest();
54 54
 
55
-			$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
56
-			$currency = $request->attributes->get( 'currency', $request->query->get( 'currency', '' ) );
57
-			$lang = $request->attributes->get( 'locale', $request->query->get( 'locale', '' ) );
55
+			$site = $request->attributes->get('site', $request->query->get('site', 'default'));
56
+			$currency = $request->attributes->get('currency', $request->query->get('currency', ''));
57
+			$lang = $request->attributes->get('locale', $request->query->get('locale', ''));
58 58
 
59
-			$localeManager = \Aimeos\MShop::create( $context, 'locale' );
60
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
59
+			$localeManager = \Aimeos\MShop::create($context, 'locale');
60
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
61 61
 		}
62 62
 
63 63
 		return $this->locale;
@@ -71,13 +71,13 @@  discard block
 block discarded – undo
71 71
 	 * @param string $site Unique site code
72 72
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
73 73
 	 */
74
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
74
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
75 75
 	{
76
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
76
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
77 77
 
78 78
 		try {
79
-			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
80
-		} catch( \Aimeos\MShop\Exception $e ) {
79
+			$localeItem = $localeManager->bootstrap($site, '', '', false, null, true);
80
+		} catch (\Aimeos\MShop\Exception $e) {
81 81
 			$localeItem = $localeManager->createItem();
82 82
 		}
83 83
 
Please login to merge, or discard this patch.
Service/View.php 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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, ['admin', 'client', 'resource/fs/baseurl'] );
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, ['admin', 'client', 'resource/fs/baseurl']);
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Controller/JqadmController.php 1 patch
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -29,35 +29,35 @@  discard block
 block discarded – undo
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,15 +72,15 @@  discard block
 block discarded – undo
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->createAdmin( $request, $site, $resource );
77
+		$cntl = $this->createAdmin($request, $site, $resource);
78 78
 
79
-		if( ( $html = $cntl->copy() ) == '' ) {
79
+		if (($html = $cntl->copy()) == '') {
80 80
 			return $cntl->getView()->response();
81 81
 		}
82 82
 
83
-		return $this->getHtml( $html );
83
+		return $this->getHtml($html);
84 84
 	}
85 85
 
86 86
 
@@ -92,15 +92,15 @@  discard block
 block discarded – undo
92 92
 	 * @param string $site Unique site code
93 93
 	 * @return Response Generated output
94 94
 	 */
95
-	public function createAction( Request $request, $resource, $site = 'default' )
95
+	public function createAction(Request $request, $resource, $site = 'default')
96 96
 	{
97
-		$cntl = $this->createAdmin( $request, $site, $resource );
97
+		$cntl = $this->createAdmin($request, $site, $resource);
98 98
 
99
-		if( ( $html = $cntl->create() ) == '' ) {
99
+		if (($html = $cntl->create()) == '') {
100 100
 			return $cntl->getView()->response();
101 101
 		}
102 102
 
103
-		return $this->getHtml( $html );
103
+		return $this->getHtml($html);
104 104
 	}
105 105
 
106 106
 
@@ -112,15 +112,15 @@  discard block
 block discarded – undo
112 112
 	 * @param string $site Unique site code
113 113
 	 * @return Response Generated output
114 114
 	 */
115
-	public function deleteAction( Request $request, $resource, $site = 'default' )
115
+	public function deleteAction(Request $request, $resource, $site = 'default')
116 116
 	{
117
-		$cntl = $this->createAdmin( $request, $site, $resource );
117
+		$cntl = $this->createAdmin($request, $site, $resource);
118 118
 
119
-		if( ( $html = $cntl->delete() ) == '' ) {
119
+		if (($html = $cntl->delete()) == '') {
120 120
 			return $cntl->getView()->response();
121 121
 		}
122 122
 
123
-		return $this->getHtml( $html );
123
+		return $this->getHtml($html);
124 124
 	}
125 125
 
126 126
 
@@ -132,15 +132,15 @@  discard block
 block discarded – undo
132 132
 	 * @param string $site Unique site code
133 133
 	 * @return Response Generated output
134 134
 	 */
135
-	public function exportAction( Request $request, $resource, $site = 'default' )
135
+	public function exportAction(Request $request, $resource, $site = 'default')
136 136
 	{
137
-		$cntl = $this->createAdmin( $request, $site, $resource );
137
+		$cntl = $this->createAdmin($request, $site, $resource);
138 138
 
139
-		if( ( $html = $cntl->export() ) == '' ) {
139
+		if (($html = $cntl->export()) == '') {
140 140
 			return $cntl->getView()->response();
141 141
 		}
142 142
 
143
-		return $this->getHtml( $html );
143
+		return $this->getHtml($html);
144 144
 	}
145 145
 
146 146
 
@@ -152,15 +152,15 @@  discard block
 block discarded – undo
152 152
 	 * @param string $site Unique site code
153 153
 	 * @return Response Generated output
154 154
 	 */
155
-	public function getAction( Request $request, $resource, $site = 'default' )
155
+	public function getAction(Request $request, $resource, $site = 'default')
156 156
 	{
157
-		$cntl = $this->createAdmin( $request, $site, $resource );
157
+		$cntl = $this->createAdmin($request, $site, $resource);
158 158
 
159
-		if( ( $html = $cntl->get() ) == '' ) {
159
+		if (($html = $cntl->get()) == '') {
160 160
 			return $cntl->getView()->response();
161 161
 		}
162 162
 
163
-		return $this->getHtml( $html );
163
+		return $this->getHtml($html);
164 164
 	}
165 165
 
166 166
 
@@ -172,15 +172,15 @@  discard block
 block discarded – undo
172 172
 	 * @param string $site Unique site code
173 173
 	 * @return Response Generated output
174 174
 	 */
175
-	public function saveAction( Request $request, $resource, $site = 'default' )
175
+	public function saveAction(Request $request, $resource, $site = 'default')
176 176
 	{
177
-		$cntl = $this->createAdmin( $request, $site, $resource );
177
+		$cntl = $this->createAdmin($request, $site, $resource);
178 178
 
179
-		if( ( $html = $cntl->save() ) == '' ) {
179
+		if (($html = $cntl->save()) == '') {
180 180
 			return $cntl->getView()->response();
181 181
 		}
182 182
 
183
-		return $this->getHtml( $html );
183
+		return $this->getHtml($html);
184 184
 	}
185 185
 
186 186
 
@@ -192,15 +192,15 @@  discard block
 block discarded – undo
192 192
 	 * @param string $site Unique site code
193 193
 	 * @return Response Generated output
194 194
 	 */
195
-	public function searchAction( Request $request, $resource, $site = 'default' )
195
+	public function searchAction(Request $request, $resource, $site = 'default')
196 196
 	{
197
-		$cntl = $this->createAdmin( $request, $site, $resource );
197
+		$cntl = $this->createAdmin($request, $site, $resource);
198 198
 
199
-		if( ( $html = $cntl->search() ) == '' ) {
199
+		if (($html = $cntl->search()) == '') {
200 200
 			return $cntl->getView()->response();
201 201
 		}
202 202
 
203
-		return $this->getHtml( $html );
203
+		return $this->getHtml($html);
204 204
 	}
205 205
 
206 206
 
@@ -212,26 +212,26 @@  discard block
 block discarded – undo
212 212
 	 * @param string $resource Resource location, e.g. "product"
213 213
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
214 214
 	 */
215
-	protected function createAdmin( Request $request, $site, $resource )
215
+	protected function createAdmin(Request $request, $site, $resource)
216 216
 	{
217
-		$lang = $request->get( 'lang', 'en' );
217
+		$lang = $request->get('lang', 'en');
218 218
 
219
-		$aimeos = $this->get( 'aimeos' )->get();
220
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
219
+		$aimeos = $this->get('aimeos')->get();
220
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
221 221
 
222
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
223
-		$context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
224
-		$context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) );
222
+		$context = $this->get('aimeos_context')->get(false, 'backend');
223
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
224
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, $site));
225 225
 
226
-		$view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang );
226
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
227 227
 
228 228
 		$view->aimeosType = 'Symfony';
229
-		$view->aimeosVersion = $this->get( 'aimeos' )->getVersion();
230
-		$view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
229
+		$view->aimeosVersion = $this->get('aimeos')->getVersion();
230
+		$view->aimeosExtensions = implode(',', $aimeos->getExtensions());
231 231
 
232
-		$context->setView( $view );
232
+		$context->setView($view);
233 233
 
234
-		return \Aimeos\Admin\JQAdm::create( $context, $aimeos, $resource );
234
+		return \Aimeos\Admin\JQAdm::create($context, $aimeos, $resource);
235 235
 	}
236 236
 
237 237
 
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
241 241
 	 * @param string $content Content from admin client
242 242
 	 * @return Response View for rendering the output
243 243
 	 */
244
-	protected function getHtml( $content )
244
+	protected function getHtml($content)
245 245
 	{
246
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
246
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
247 247
 	}
248 248
 }
Please login to merge, or discard this patch.
Controller/AbstractController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,29 +28,29 @@
 block discarded – undo
28 28
 	 * @param string $clientName Html client name
29 29
 	 * @return Response Response object containing the generated output
30 30
 	 */
31
-	protected function getOutput( $clientName )
31
+	protected function getOutput($clientName)
32 32
 	{
33
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/html/templates' );
34
-		$context = $this->container->get( 'aimeos_context' )->get();
33
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/templates');
34
+		$context = $this->container->get('aimeos_context')->get();
35 35
 		$langid = $context->getLocale()->getLanguageId();
36 36
 
37
-		$view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid );
38
-		$context->setView( $view );
37
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
38
+		$context->setView($view);
39 39
 
40
-		$client = \Aimeos\Client\Html::create( $context, $clientName );
41
-		$client->setView( $view );
40
+		$client = \Aimeos\Client\Html::create($context, $clientName);
41
+		$client->setView($view);
42 42
 		$client->process();
43 43
 
44
-		$twig = $this->container->get( 'twig' );
44
+		$twig = $this->container->get('twig');
45 45
 		$vars = $twig->getGlobals();
46 46
 
47
-		if( !isset( $vars['aiheader'] ) ) {
47
+		if (!isset($vars['aiheader'])) {
48 48
 			$vars['aiheader'] = array();
49 49
 		}
50 50
 
51 51
 		$vars['aiheader'][$clientName] = (string) $client->getHeader();
52
-		$twig->addGlobal( 'aiheader', $vars['aiheader'] );
52
+		$twig->addGlobal('aiheader', $vars['aiheader']);
53 53
 
54
-		return new Response( (string) $client->getBody() );
54
+		return new Response((string) $client->getBody());
55 55
 	}
56 56
 }
Please login to merge, or discard this patch.
Controller/JsonapiController.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 	 * @param string Resource location, e.g. "customer"
31 31
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
32 32
 	 */
33
-	public function deleteAction( ServerRequestInterface $request, $resource )
33
+	public function deleteAction(ServerRequestInterface $request, $resource)
34 34
 	{
35
-		return $this->createClient( $request, $resource )->delete( $request, new Response() );
35
+		return $this->createClient($request, $resource)->delete($request, new Response());
36 36
 	}
37 37
 
38 38
 
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 	 * @param string Resource location, e.g. "customer"
44 44
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
45 45
 	 */
46
-	public function getAction( ServerRequestInterface $request, $resource )
46
+	public function getAction(ServerRequestInterface $request, $resource)
47 47
 	{
48
-		return $this->createClient( $request, $resource )->get( $request, new Response() );
48
+		return $this->createClient($request, $resource)->get($request, new Response());
49 49
 	}
50 50
 
51 51
 
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 	 * @param string Resource location, e.g. "customer"
57 57
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
58 58
 	 */
59
-	public function patchAction( ServerRequestInterface $request, $resource )
59
+	public function patchAction(ServerRequestInterface $request, $resource)
60 60
 	{
61
-		return $this->createClient( $request, $resource )->patch( $request, new Response() );
61
+		return $this->createClient($request, $resource)->patch($request, new Response());
62 62
 	}
63 63
 
64 64
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 	 * @param string Resource location, e.g. "customer"
70 70
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
71 71
 	 */
72
-	public function postAction( ServerRequestInterface $request, $resource )
72
+	public function postAction(ServerRequestInterface $request, $resource)
73 73
 	{
74
-		return $this->createClient( $request, $resource )->post( $request, new Response() );
74
+		return $this->createClient($request, $resource)->post($request, new Response());
75 75
 	}
76 76
 
77 77
 
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 	 * @param string Resource location, e.g. "customer"
83 83
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
84 84
 	 */
85
-	public function putAction( ServerRequestInterface $request, $resource )
85
+	public function putAction(ServerRequestInterface $request, $resource)
86 86
 	{
87
-		return $this->createClient( $request, $resource )->put( $request, new Response() );
87
+		return $this->createClient($request, $resource)->put($request, new Response());
88 88
 	}
89 89
 
90 90
 
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 	 * @param string Resource location, e.g. "customer"
96 96
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
97 97
 	 */
98
-	public function optionsAction( ServerRequestInterface $request, $resource = '' )
98
+	public function optionsAction(ServerRequestInterface $request, $resource = '')
99 99
 	{
100
-		return $this->createClient( $request, $resource )->options( $request, new Response() );
100
+		return $this->createClient($request, $resource)->options($request, new Response());
101 101
 	}
102 102
 
103 103
 
@@ -108,19 +108,19 @@  discard block
 block discarded – undo
108 108
 	 * @param string Resource location, e.g. "customer"
109 109
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
110 110
 	 */
111
-	protected function createClient( ServerRequestInterface $request, $resource )
111
+	protected function createClient(ServerRequestInterface $request, $resource)
112 112
 	{
113 113
 		$args = $request->getAttributes();
114 114
 		$params = $request->getQueryParams();
115
-		$related = ( isset( $args['related'] ) ? $args['related'] : ( isset( $params['related'] ) ? $params['related'] : null ) );
115
+		$related = (isset($args['related']) ? $args['related'] : (isset($params['related']) ? $params['related'] : null));
116 116
 
117
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' );
118
-		$context = $this->container->get( 'aimeos_context' )->get();
117
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/jsonapi/templates');
118
+		$context = $this->container->get('aimeos_context')->get();
119 119
 		$langid = $context->getLocale()->getLanguageId();
120 120
 
121
-		$view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid );
122
-		$context->setView( $view );
121
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
122
+		$context->setView($view);
123 123
 
124
-		return \Aimeos\Client\JsonApi::create( $context, $resource . '/' . $related );
124
+		return \Aimeos\Client\JsonApi::create($context, $resource.'/'.$related);
125 125
 	}
126 126
 }
Please login to merge, or discard this patch.