Completed
Push — master ( aab142...136162 )
by Aimeos
02:04
created
src/Aimeos/Shop/Controller/BasketController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@
 block discarded – undo
30 30
 	 */
31 31
 	public function indexAction()
32 32
 	{
33
-		$default = ['basket/standard','basket/related'];
33
+		$default = ['basket/standard', 'basket/related'];
34 34
 
35
-		foreach( app( 'config' )->get( 'shop.page.basket-index', $default ) as $name )
35
+		foreach (app('config')->get('shop.page.basket-index', $default) as $name)
36 36
 		{
37
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
38
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
37
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
38
+			$params['aibody'][$name] = Shop::get($name)->getBody();
39 39
 		}
40 40
 
41 41
 		return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store');
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AccountController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function indexAction()
32 32
 	{
33
-		$default = ['account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session'];
33
+		$default = ['account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'];
34 34
 
35
-		foreach( app( 'config' )->get( 'shop.page.account-index', $default ) as $name )
35
+		foreach (app('config')->get('shop.page.account-index', $default) as $name)
36 36
 		{
37
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
38
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
37
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
38
+			$params['aibody'][$name] = Shop::get($name)->getBody();
39 39
 		}
40 40
 
41 41
 		return Response::view('shop::account.index', $params);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function downloadAction()
51 51
 	{
52
-		$response = Shop::get( 'account/download' )->getView()->response();
53
-		return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
52
+		$response = Shop::get('account/download')->getView()->response();
53
+		return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
54 54
 	}
55 55
 }
56 56
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JqadmController.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -34,38 +34,38 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
 	public function fileAction()
36 36
 	{
37
-		if( config( 'shop.authorize', true ) ) {
38
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
37
+		if (config('shop.authorize', true)) {
38
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
39 39
 		}
40 40
 
41 41
 		$contents = '';
42 42
 		$files = array();
43
-		$aimeos = app( 'aimeos' )->get();
44
-		$type = Route::input( 'type', Input::get( 'type', 'js' ) );
43
+		$aimeos = app('aimeos')->get();
44
+		$type = Route::input('type', Input::get('type', 'js'));
45 45
 
46
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
46
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
47 47
 		{
48
-			foreach( $paths as $path )
48
+			foreach ($paths as $path)
49 49
 			{
50
-				$jsbAbsPath = $base . '/' . $path;
51
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
52
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
50
+				$jsbAbsPath = $base.'/'.$path;
51
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
52
+				$files = array_merge($files, $jsb2->getFiles($type));
53 53
 			}
54 54
 		}
55 55
 
56
-		foreach( $files as $file )
56
+		foreach ($files as $file)
57 57
 		{
58
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
58
+			if (($content = file_get_contents($file)) !== false) {
59 59
 				$contents .= $content;
60 60
 			}
61 61
 		}
62 62
 
63
-		$response = response( $contents );
63
+		$response = response($contents);
64 64
 
65
-		if( $type === 'js' ) {
66
-			$response->header( 'Content-Type', 'application/javascript' );
67
-		} elseif( $type === 'css' ) {
68
-			$response->header( 'Content-Type', 'text/css' );
65
+		if ($type === 'js') {
66
+			$response->header('Content-Type', 'application/javascript');
67
+		} elseif ($type === 'css') {
68
+			$response->header('Content-Type', 'text/css');
69 69
 		}
70 70
 
71 71
 		return $response;
@@ -79,17 +79,17 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function copyAction()
81 81
 	{
82
-		if( config( 'shop.authorize', true ) ) {
83
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
82
+		if (config('shop.authorize', true)) {
83
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
84 84
 		}
85 85
 
86 86
 		$cntl = $this->createAdmin();
87 87
 
88
-		if( ( $html = $cntl->copy() ) == '' ) {
88
+		if (($html = $cntl->copy()) == '') {
89 89
 			return $cntl->getView()->response();
90 90
 		}
91 91
 
92
-		return $this->getHtml( $html );
92
+		return $this->getHtml($html);
93 93
 	}
94 94
 
95 95
 
@@ -100,17 +100,17 @@  discard block
 block discarded – undo
100 100
 	 */
101 101
 	public function createAction()
102 102
 	{
103
-		if( config( 'shop.authorize', true ) ) {
104
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
103
+		if (config('shop.authorize', true)) {
104
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
105 105
 		}
106 106
 
107 107
 		$cntl = $this->createAdmin();
108 108
 
109
-		if( ( $html = $cntl->create() ) == '' ) {
109
+		if (($html = $cntl->create()) == '') {
110 110
 			return $cntl->getView()->response();
111 111
 		}
112 112
 
113
-		return $this->getHtml( $html );
113
+		return $this->getHtml($html);
114 114
 	}
115 115
 
116 116
 
@@ -121,17 +121,17 @@  discard block
 block discarded – undo
121 121
 	 */
122 122
 	public function deleteAction()
123 123
 	{
124
-		if( config( 'shop.authorize', true ) ) {
125
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
124
+		if (config('shop.authorize', true)) {
125
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
126 126
 		}
127 127
 
128 128
 		$cntl = $this->createAdmin();
129 129
 
130
-		if( ( $html = $cntl->delete() ) == '' ) {
130
+		if (($html = $cntl->delete()) == '') {
131 131
 			return $cntl->getView()->response();
132 132
 		}
133 133
 
134
-		return $this->getHtml( $html );
134
+		return $this->getHtml($html);
135 135
 	}
136 136
 
137 137
 
@@ -142,17 +142,17 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	public function exportAction()
144 144
 	{
145
-		if( config( 'shop.authorize', true ) ) {
146
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
145
+		if (config('shop.authorize', true)) {
146
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
147 147
 		}
148 148
 
149 149
 		$cntl = $this->createAdmin();
150 150
 
151
-		if( ( $html = $cntl->export() ) == '' ) {
151
+		if (($html = $cntl->export()) == '') {
152 152
 			return $cntl->getView()->response();
153 153
 		}
154 154
 
155
-		return $this->getHtml( $html );
155
+		return $this->getHtml($html);
156 156
 	}
157 157
 
158 158
 
@@ -163,17 +163,17 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public function getAction()
165 165
 	{
166
-		if( config( 'shop.authorize', true ) ) {
167
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
166
+		if (config('shop.authorize', true)) {
167
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
168 168
 		}
169 169
 
170 170
 		$cntl = $this->createAdmin();
171 171
 
172
-		if( ( $html = $cntl->get() ) == '' ) {
172
+		if (($html = $cntl->get()) == '') {
173 173
 			return $cntl->getView()->response();
174 174
 		}
175 175
 
176
-		return $this->getHtml( $html );
176
+		return $this->getHtml($html);
177 177
 	}
178 178
 
179 179
 
@@ -184,17 +184,17 @@  discard block
 block discarded – undo
184 184
 	 */
185 185
 	public function saveAction()
186 186
 	{
187
-		if( config( 'shop.authorize', true ) ) {
188
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
187
+		if (config('shop.authorize', true)) {
188
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
189 189
 		}
190 190
 
191 191
 		$cntl = $this->createAdmin();
192 192
 
193
-		if( ( $html = $cntl->save() ) == '' ) {
193
+		if (($html = $cntl->save()) == '') {
194 194
 			return $cntl->getView()->response();
195 195
 		}
196 196
 
197
-		return $this->getHtml( $html );
197
+		return $this->getHtml($html);
198 198
 	}
199 199
 
200 200
 
@@ -205,17 +205,17 @@  discard block
 block discarded – undo
205 205
 	 */
206 206
 	public function searchAction()
207 207
 	{
208
-		if( config( 'shop.authorize', true ) ) {
209
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
208
+		if (config('shop.authorize', true)) {
209
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
210 210
 		}
211 211
 
212 212
 		$cntl = $this->createAdmin();
213 213
 
214
-		if( ( $html = $cntl->search() ) == '' ) {
214
+		if (($html = $cntl->search()) == '') {
215 215
 			return $cntl->getView()->response();
216 216
 		}
217 217
 
218
-		return $this->getHtml( $html );
218
+		return $this->getHtml($html);
219 219
 	}
220 220
 
221 221
 
@@ -226,26 +226,26 @@  discard block
 block discarded – undo
226 226
 	 */
227 227
 	protected function createAdmin()
228 228
 	{
229
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
230
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
231
-		$resource = Route::input( 'resource' );
229
+		$site = Route::input('site', Input::get('site', 'default'));
230
+		$lang = Input::get('lang', config('app.locale', 'en'));
231
+		$resource = Route::input('resource');
232 232
 
233
-		$aimeos = app( 'aimeos' )->get();
234
-		$paths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
233
+		$aimeos = app('aimeos')->get();
234
+		$paths = $aimeos->getCustomPaths('admin/jqadm/templates');
235 235
 
236
-		$context = app( 'aimeos.context' )->get( false, 'backend' );
237
-		$context->setI18n( app('aimeos.i18n')->get( array( $lang, 'en' ) ) );
238
-		$context->setLocale( app('aimeos.locale')->getBackend( $context, $site ) );
236
+		$context = app('aimeos.context')->get(false, 'backend');
237
+		$context->setI18n(app('aimeos.i18n')->get(array($lang, 'en')));
238
+		$context->setLocale(app('aimeos.locale')->getBackend($context, $site));
239 239
 
240
-		$view = app( 'aimeos.view' )->create( $context, $paths, $lang );
240
+		$view = app('aimeos.view')->create($context, $paths, $lang);
241 241
 
242 242
 		$view->aimeosType = 'Laravel';
243
-		$view->aimeosVersion = app( 'aimeos' )->getVersion();
244
-		$view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
243
+		$view->aimeosVersion = app('aimeos')->getVersion();
244
+		$view->aimeosExtensions = implode(',', $aimeos->getExtensions());
245 245
 
246
-		$context->setView( $view );
246
+		$context->setView($view);
247 247
 
248
-		return \Aimeos\Admin\JQAdm::create( $context, $aimeos, $resource );
248
+		return \Aimeos\Admin\JQAdm::create($context, $aimeos, $resource);
249 249
 	}
250 250
 
251 251
 
@@ -255,9 +255,9 @@  discard block
 block discarded – undo
255 255
 	 * @param string $content Content from admin client
256 256
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
257 257
 	 */
258
-	protected function getHtml( $content )
258
+	protected function getHtml($content)
259 259
 	{
260
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
261
-		return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
260
+		$site = Route::input('site', Input::get('site', 'default'));
261
+		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
262 262
 	}
263 263
 }
Please login to merge, or discard this patch.
src/default.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
 	'uploaddir' => '/',
11 11
 
12 12
 	'page' => array(
13
-		'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
14
-		'basket-index' => array( 'basket/standard','basket/related' ),
15
-		'catalog-count' => array( 'catalog/count' ),
16
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
17
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/lists' ),
18
-		'catalog-stock' => array( 'catalog/stock' ),
19
-		'catalog-suggest' => array( 'catalog/suggest' ),
20
-		'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
21
-		'checkout-confirm' => array( 'checkout/confirm' ),
22
-		'checkout-index' => array( 'checkout/standard' ),
23
-		'checkout-update' => array( 'checkout/update'),
13
+		'account-index' => array('account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
14
+		'basket-index' => array('basket/standard', 'basket/related'),
15
+		'catalog-count' => array('catalog/count'),
16
+		'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
17
+		'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/lists'),
18
+		'catalog-stock' => array('catalog/stock'),
19
+		'catalog-suggest' => array('catalog/suggest'),
20
+		'catalog-tree' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
21
+		'checkout-confirm' => array('checkout/confirm'),
22
+		'checkout-index' => array('checkout/standard'),
23
+		'checkout-update' => array('checkout/update'),
24 24
 	),
25 25
 
26 26
 	'resource' => array(
@@ -43,23 +43,23 @@  discard block
 block discarded – undo
43 43
 		'fs' => array(
44 44
 			'adapter' => 'Standard',
45 45
 			'basedir' => public_path(),
46
-			'tempdir' => storage_path( 'tmp' ),
47
-			'baseurl' => config( 'app.url' ) . '/',
46
+			'tempdir' => storage_path('tmp'),
47
+			'baseurl' => config('app.url').'/',
48 48
 		),
49 49
 		'fs-admin' => array(
50 50
 			'adapter' => 'Standard',
51
-			'basedir' => storage_path( 'admin' ),
52
-			'tempdir' => storage_path( 'tmp' ),
51
+			'basedir' => storage_path('admin'),
52
+			'tempdir' => storage_path('tmp'),
53 53
 		),
54 54
 		'fs-import' => array(
55 55
 			'adapter' => 'Standard',
56
-			'basedir' => storage_path( 'import' ),
57
-			'tempdir' => storage_path( 'tmp' ),
56
+			'basedir' => storage_path('import'),
57
+			'tempdir' => storage_path('tmp'),
58 58
 		),
59 59
 		'fs-secure' => array(
60 60
 			'adapter' => 'Standard',
61
-			'basedir' => storage_path( 'secure' ),
62
-			'tempdir' => storage_path( 'tmp' ),
61
+			'basedir' => storage_path('secure'),
62
+			'tempdir' => storage_path('tmp'),
63 63
 		),
64 64
 		'mq' => array(
65 65
 			'adapter' => 'Standard',
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 			),
187 187
 			'common' => array(
188 188
 				'template' => array(
189
-					'baseurl' => public_path( 'packages/aimeos/shop/themes/elegance' ),
189
+					'baseurl' => public_path('packages/aimeos/shop/themes/elegance'),
190 190
 				),
191 191
 			),
192 192
 			'basket' => array(
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 				),
234 234
 			),
235 235
 			'email' => [
236
-				'from-email' => config( 'mail.from.address' ),
237
-				'from-name' => config( 'mail.from.name' ),
236
+				'from-email' => config('mail.from.address'),
237
+				'from-name' => config('mail.from.name'),
238 238
 			],
239 239
 			'locale' => array(
240 240
 				'select' => array(
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 						# in the "maxwidth" parameter
312 312
 						# 'maxheight' => 280,
313 313
 					),
314
-					'tempdir' => storage_path( 'aimeos' ),
314
+					'tempdir' => storage_path('aimeos'),
315 315
 				),
316 316
 			),
317 317
 		),
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -49,42 +49,42 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function handle()
51 51
 	{
52
-		$ctx = $this->getLaravel()->make( 'aimeos.context' )->get( false, 'command' );
53
-		$ctx->setEditor( 'aimeos:setup' );
52
+		$ctx = $this->getLaravel()->make('aimeos.context')->get(false, 'command');
53
+		$ctx->setEditor('aimeos:setup');
54 54
 
55 55
 		$config = $ctx->getConfig();
56
-		$site = $this->argument( 'site' );
57
-		$template = $this->argument( 'tplsite' );
56
+		$site = $this->argument('site');
57
+		$template = $this->argument('tplsite');
58 58
 
59
-		$config->set( 'setup/site', $site );
60
-		$dbconfig = $this->getDbConfig( $config );
61
-		$this->setOptions( $config );
59
+		$config->set('setup/site', $site);
60
+		$dbconfig = $this->getDbConfig($config);
61
+		$this->setOptions($config);
62 62
 
63
-		\Aimeos\MShop::cache( false );
64
-		\Aimeos\MAdmin::cache( false );
63
+		\Aimeos\MShop::cache(false);
64
+		\Aimeos\MAdmin::cache(false);
65 65
 
66
-		$taskPaths = $this->getLaravel()->make( 'aimeos' )->get()->getSetupPaths( $template );
67
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
66
+		$taskPaths = $this->getLaravel()->make('aimeos')->get()->getSetupPaths($template);
67
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
68 68
 
69
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
69
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
70 70
 
71
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
72
-			$task = reset( $task );
71
+		if (($task = $this->option('task')) && is_array($task)) {
72
+			$task = reset($task);
73 73
 		}
74 74
 
75
-		switch( $this->option( 'action' ) )
75
+		switch ($this->option('action'))
76 76
 		{
77 77
 			case 'migrate':
78
-				$manager->migrate( $task );
78
+				$manager->migrate($task);
79 79
 				break;
80 80
 			case 'rollback':
81
-				$manager->rollback( $task );
81
+				$manager->rollback($task);
82 82
 				break;
83 83
 			case 'clean':
84
-				$manager->clean( $task );
84
+				$manager->clean($task);
85 85
 				break;
86 86
 			default:
87
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
87
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
88 88
 		}
89 89
 	}
90 90
 
@@ -95,14 +95,14 @@  discard block
 block discarded – undo
95 95
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
96 96
 	 * @return array Multi-dimensional associative list of database configuration parameters
97 97
 	 */
98
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
98
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
99 99
 	{
100
-		$dbconfig = $conf->get( 'resource', array() );
100
+		$dbconfig = $conf->get('resource', array());
101 101
 
102
-		foreach( $dbconfig as $rname => $dbconf )
102
+		foreach ($dbconfig as $rname => $dbconf)
103 103
 		{
104
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
105
-				unset( $dbconfig[$rname] );
104
+			if (strncmp($rname, 'db', 2) !== 0) {
105
+				unset($dbconfig[$rname]);
106 106
 			}
107 107
 		}
108 108
 
@@ -117,12 +117,12 @@  discard block
 block discarded – undo
117 117
 	 * @param array Associative list of database configurations
118 118
 	 * @throws \RuntimeException If the format of the options is invalid
119 119
 	 */
120
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
120
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
121 121
 	{
122
-		foreach( (array) $this->option( 'option' ) as $option )
122
+		foreach ((array) $this->option('option') as $option)
123 123
 		{
124
-			list( $name, $value ) = explode( ':', $option );
125
-			$conf->set( str_replace( '\\', '/', $name ), $value );
124
+			list($name, $value) = explode(':', $option);
125
+			$conf->set(str_replace('\\', '/', $name), $value);
126 126
 		}
127 127
 	}
128 128
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/View.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 * @param \Aimeos\Shop\Base\I18n $i18n I18n object
48 48
 	 * @param \Aimeos\Shop\Base\Support $support Support object
49 49
 	 */
50
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
51
-		\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support )
50
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
51
+		\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support)
52 52
 	{
53 53
 		$this->i18n = $i18n;
54 54
 		$this->config = $config;
@@ -64,24 +64,24 @@  discard block
 block discarded – undo
64 64
 	 * @param string|null $locale Code of the current language or null for no translation
65 65
 	 * @return \Aimeos\MW\View\Iface View object
66 66
 	 */
67
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
67
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
68 68
 	{
69
-		$engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) );
70
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) );
69
+		$engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory'));
70
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine));
71 71
 
72 72
 		$config = $context->getConfig();
73 73
 		$session = $context->getSession();
74 74
 
75
-		$this->addCsrf( $view );
76
-		$this->addAccess( $view, $context );
77
-		$this->addConfig( $view, $config );
78
-		$this->addNumber( $view, $config );
79
-		$this->addParam( $view );
80
-		$this->addRequest( $view );
81
-		$this->addResponse( $view );
82
-		$this->addSession( $view, $session );
83
-		$this->addTranslate( $view, $locale );
84
-		$this->addUrl( $view );
75
+		$this->addCsrf($view);
76
+		$this->addAccess($view, $context);
77
+		$this->addConfig($view, $config);
78
+		$this->addNumber($view, $config);
79
+		$this->addParam($view);
80
+		$this->addRequest($view);
81
+		$this->addResponse($view);
82
+		$this->addSession($view, $session);
83
+		$this->addTranslate($view, $locale);
84
+		$this->addUrl($view);
85 85
 
86 86
 		return $view;
87 87
 	}
@@ -94,25 +94,25 @@  discard block
 block discarded – undo
94 94
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
95 95
 	 * @return \Aimeos\MW\View\Iface Modified view object
96 96
 	 */
97
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
97
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
98 98
 	{
99
-		if( $this->config->get( 'shop.accessControl', true ) === false
100
-			|| ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser )
99
+		if ($this->config->get('shop.accessControl', true) === false
100
+			|| (($user = \Illuminate\Support\Facades\Auth::user()) !== null && $user->superuser)
101 101
 		) {
102
-			$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
102
+			$helper = new \Aimeos\MW\View\Helper\Access\All($view);
103 103
 		}
104 104
 		else
105 105
 		{
106 106
 			$support = $this->support;
107 107
 
108
-			$fcn = function() use ( $support, $context ) {
109
-				return $support->getGroups( $context );
108
+			$fcn = function() use ($support, $context) {
109
+				return $support->getGroups($context);
110 110
 			};
111 111
 
112
-			$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
112
+			$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
113 113
 		}
114 114
 
115
-		$view->addHelper( 'access', $helper );
115
+		$view->addHelper('access', $helper);
116 116
 
117 117
 		return $view;
118 118
 	}
@@ -125,11 +125,11 @@  discard block
 block discarded – undo
125 125
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
126 126
 	 * @return \Aimeos\MW\View\Iface Modified view object
127 127
 	 */
128
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
128
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
129 129
 	{
130
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, ['admin', 'client', 'resource/fs/baseurl'] );
131
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
132
-		$view->addHelper( 'config', $helper );
130
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, ['admin', 'client', 'resource/fs/baseurl']);
131
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
132
+		$view->addHelper('config', $helper);
133 133
 
134 134
 		return $view;
135 135
 	}
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
141 141
 	 * @param \Aimeos\MW\View\Iface $view View object
142 142
 	 * @return \Aimeos\MW\View\Iface Modified view object
143 143
 	 */
144
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
144
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
145 145
 	{
146
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
147
-		$view->addHelper( 'csrf', $helper );
146
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
147
+		$view->addHelper('csrf', $helper);
148 148
 
149 149
 		return $view;
150 150
 	}
@@ -157,14 +157,14 @@  discard block
 block discarded – undo
157 157
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
158 158
 	 * @return \Aimeos\MW\View\Iface Modified view object
159 159
 	 */
160
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
160
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
161 161
 	{
162
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
163
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
164
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
162
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
163
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
164
+		$decimals = $config->get('client/html/common/format/decimals', 2);
165 165
 
166
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
167
-		$view->addHelper( 'number', $helper );
166
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
167
+		$view->addHelper('number', $helper);
168 168
 
169 169
 		return $view;
170 170
 	}
@@ -176,11 +176,11 @@  discard block
 block discarded – undo
176 176
 	 * @param \Aimeos\MW\View\Iface $view View object
177 177
 	 * @return \Aimeos\MW\View\Iface Modified view object
178 178
 	 */
179
-	protected function addParam( \Aimeos\MW\View\Iface $view )
179
+	protected function addParam(\Aimeos\MW\View\Iface $view)
180 180
 	{
181
-		$params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all();
182
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
183
-		$view->addHelper( 'param', $helper );
181
+		$params = (Route::current() ? Route::current()->parameters() : array()) + Input::all();
182
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
183
+		$view->addHelper('param', $helper);
184 184
 
185 185
 		return $view;
186 186
 	}
@@ -192,10 +192,10 @@  discard block
 block discarded – undo
192 192
 	 * @param \Aimeos\MW\View\Iface $view View object
193 193
 	 * @return \Aimeos\MW\View\Iface Modified view object
194 194
 	 */
195
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
195
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
196 196
 	{
197
-		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() );
198
-		$view->addHelper( 'request', $helper );
197
+		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance());
198
+		$view->addHelper('request', $helper);
199 199
 
200 200
 		return $view;
201 201
 	}
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
207 207
 	 * @param \Aimeos\MW\View\Iface $view View object
208 208
 	 * @return \Aimeos\MW\View\Iface Modified view object
209 209
 	 */
210
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
210
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
211 211
 	{
212
-		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
213
-		$view->addHelper( 'response', $helper );
212
+		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
213
+		$view->addHelper('response', $helper);
214 214
 
215 215
 		return $view;
216 216
 	}
@@ -223,10 +223,10 @@  discard block
 block discarded – undo
223 223
 	 * @param \Aimeos\MW\Session\Iface $session Session object
224 224
 	 * @return \Aimeos\MW\View\Iface Modified view object
225 225
 	 */
226
-	protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session )
226
+	protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session)
227 227
 	{
228
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session );
229
-		$view->addHelper( 'session', $helper );
228
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session);
229
+		$view->addHelper('session', $helper);
230 230
 
231 231
 		return $view;
232 232
 	}
@@ -239,20 +239,20 @@  discard block
 block discarded – undo
239 239
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
240 240
 	 * @return \Aimeos\MW\View\Iface Modified view object
241 241
 	 */
242
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
242
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
243 243
 	{
244
-		if( $locale !== null )
244
+		if ($locale !== null)
245 245
 		{
246
-			$i18n = $this->i18n->get( array( $locale ) );
246
+			$i18n = $this->i18n->get(array($locale));
247 247
 			$translation = $i18n[$locale];
248 248
 		}
249 249
 		else
250 250
 		{
251
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
251
+			$translation = new \Aimeos\MW\Translation\None('en');
252 252
 		}
253 253
 
254
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
255
-		$view->addHelper( 'translate', $helper );
254
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
255
+		$view->addHelper('translate', $helper);
256 256
 
257 257
 		return $view;
258 258
 	}
@@ -264,27 +264,27 @@  discard block
 block discarded – undo
264 264
 	 * @param \Aimeos\MW\View\Iface $view View object
265 265
 	 * @return \Aimeos\MW\View\Iface Modified view object
266 266
 	 */
267
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
267
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
268 268
 	{
269 269
 		$fixed = array();
270 270
 
271
-		if( Route::current() )
271
+		if (Route::current())
272 272
 		{
273
-			if( ( $value = Route::input( 'site' ) ) !== null ) {
273
+			if (($value = Route::input('site')) !== null) {
274 274
 				$fixed['site'] = $value;
275 275
 			}
276 276
 
277
-			if( ( $value = Route::input( 'locale' ) ) !== null ) {
277
+			if (($value = Route::input('locale')) !== null) {
278 278
 				$fixed['locale'] = $value;
279 279
 			}
280 280
 
281
-			if( ( $value = Route::input( 'currency' ) ) !== null ) {
281
+			if (($value = Route::input('currency')) !== null) {
282 282
 				$fixed['currency'] = $value;
283 283
 			}
284 284
 		}
285 285
 
286
-		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
287
-		$view->addHelper( 'url', $helper );
286
+		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
287
+		$view->addHelper('url', $helper);
288 288
 
289 289
 		return $view;
290 290
 	}
Please login to merge, or discard this patch.