Passed
Pull Request — master (#258)
by Jesse
03:46
created
src/Aimeos/Shop/ShopServiceProvider.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 		$this->loadRoutesFrom( $basedir . 'routes.php' );
43 43
 		$this->loadViewsFrom( $basedir . 'views', 'shop' );
44 44
 
45
-		$this->publishes( [ $basedir . 'config/shop.php' => config_path( 'shop.php' ) ], 'config' );
46
-		$this->publishes( [ dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' ) ], 'public' );
45
+		$this->publishes( [$basedir . 'config/shop.php' => config_path( 'shop.php' )], 'config' );
46
+		$this->publishes( [dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' )], 'public' );
47 47
 	}
48 48
 
49 49
 
@@ -54,38 +54,38 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	public function register()
56 56
 	{
57
-		$this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop');
57
+		$this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop' );
58 58
 
59
-		$this->app->singleton('aimeos', function($app) {
60
-			return new \Aimeos\Shop\Base\Aimeos($app['config']);
59
+		$this->app->singleton( 'aimeos', function( $app ) {
60
+			return new \Aimeos\Shop\Base\Aimeos( $app['config'] );
61 61
 		});
62 62
 
63
-		$this->app->singleton('aimeos.config', function($app) {
64
-			return new \Aimeos\Shop\Base\Config($app['config'], $app['aimeos']);
63
+		$this->app->singleton( 'aimeos.config', function( $app ) {
64
+			return new \Aimeos\Shop\Base\Config( $app['config'], $app['aimeos'] );
65 65
 		});
66 66
 
67
-		$this->app->singleton('aimeos.i18n', function($app) {
68
-			return new \Aimeos\Shop\Base\I18n($this->app['config'], $app['aimeos']);
67
+		$this->app->singleton( 'aimeos.i18n', function( $app ) {
68
+			return new \Aimeos\Shop\Base\I18n( $this->app['config'], $app['aimeos'] );
69 69
 		});
70 70
 
71
-		$this->app->singleton('aimeos.locale', function($app) {
72
-			return new \Aimeos\Shop\Base\Locale($app['config']);
71
+		$this->app->singleton( 'aimeos.locale', function( $app ) {
72
+			return new \Aimeos\Shop\Base\Locale( $app['config'] );
73 73
 		});
74 74
 
75
-		$this->app->singleton('aimeos.context', function($app) {
76
-			return new \Aimeos\Shop\Base\Context($app['session.store'], $app['aimeos.config'], $app['aimeos.locale'], $app['aimeos.i18n']);
75
+		$this->app->singleton( 'aimeos.context', function( $app ) {
76
+			return new \Aimeos\Shop\Base\Context( $app['session.store'], $app['aimeos.config'], $app['aimeos.locale'], $app['aimeos.i18n'] );
77 77
 		});
78 78
 
79
-		$this->app->singleton('aimeos.support', function($app) {
80
-			return new \Aimeos\Shop\Base\Support($app['aimeos.context'], $app['aimeos.locale']);
79
+		$this->app->singleton( 'aimeos.support', function( $app ) {
80
+			return new \Aimeos\Shop\Base\Support( $app['aimeos.context'], $app['aimeos.locale'] );
81 81
 		});
82 82
 
83
-		$this->app->singleton('aimeos.view', function($app) {
84
-			return new \Aimeos\Shop\Base\View($app['config'], $app['aimeos.i18n'], $app['aimeos.support']);
83
+		$this->app->singleton( 'aimeos.view', function( $app ) {
84
+			return new \Aimeos\Shop\Base\View( $app['config'], $app['aimeos.i18n'], $app['aimeos.support'] );
85 85
 		});
86 86
 
87
-		$this->app->singleton('aimeos.shop', function($app) {
88
-			return new \Aimeos\Shop\Base\Shop($app['aimeos'], $app['aimeos.context'], $app['aimeos.view']);
87
+		$this->app->singleton( 'aimeos.shop', function( $app ) {
88
+			return new \Aimeos\Shop\Base\Shop( $app['aimeos'], $app['aimeos.context'], $app['aimeos.view'] );
89 89
 		});
90 90
 
91 91
 
Please login to merge, or discard this patch.
src/default.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -4,40 +4,40 @@
 block discarded – undo
4 4
 
5 5
 	'apc_enabled' => false,
6 6
 	'apc_prefix' => 'laravel:',
7
-	'extdir' => base_path('ext'),
7
+	'extdir' => base_path( 'ext' ),
8 8
 	'pcntl_max' => 4,
9 9
 	'pcntl_priority' => 19,
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' ),
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 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' ),
16
+		'catalog-detail' => array( 'basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session' ),
17
+		'catalog-list' => array( 'basket/mini', 'catalog/filter', 'catalog/lists' ),
18 18
 		'catalog-stock' => array( 'catalog/stock' ),
19 19
 		'catalog-suggest' => array( 'catalog/suggest' ),
20
-		'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
20
+		'catalog-tree' => array( 'basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists' ),
21 21
 		'checkout-confirm' => array( 'checkout/confirm' ),
22 22
 		'checkout-index' => array( 'checkout/standard' ),
23
-		'checkout-update' => array( 'checkout/update'),
23
+		'checkout-update' => array( 'checkout/update' ),
24 24
 	),
25 25
 
26 26
 	'resource' => array(
27 27
 		'db' => array(
28
-			'adapter' => config('database.connections.mysql.driver', 'mysql'),
29
-			'host' => config('database.connections.mysql.host', '127.0.0.1'),
30
-			'port' => config('database.connections.mysql.port', '3306'),
31
-			'socket' => config('database.connections.mysql.unix_socket', ''),
32
-			'database' => config('database.connections.mysql.database', 'forge'),
33
-			'username' => config('database.connections.mysql.username', 'forge'),
34
-			'password' => config('database.connections.mysql.password', ''),
28
+			'adapter' => config( 'database.connections.mysql.driver', 'mysql' ),
29
+			'host' => config( 'database.connections.mysql.host', '127.0.0.1' ),
30
+			'port' => config( 'database.connections.mysql.port', '3306' ),
31
+			'socket' => config( 'database.connections.mysql.unix_socket', '' ),
32
+			'database' => config( 'database.connections.mysql.database', 'forge' ),
33
+			'username' => config( 'database.connections.mysql.username', 'forge' ),
34
+			'password' => config( 'database.connections.mysql.password', '' ),
35 35
 			'stmt' => ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'"],
36 36
 			'opt-persistent' => 0,
37 37
 			'limit' => 3,
38 38
 			'defaultTableOptions' => [
39
-				'charset' => config('database.connections.mysql.charset'),
40
-				'collate' => config('database.connections.mysql.collation'),
39
+				'charset' => config( 'database.connections.mysql.charset' ),
40
+				'collate' => config( 'database.connections.mysql.collation' ),
41 41
 			],
42 42
 		),
43 43
 		'fs' => array(
Please login to merge, or discard this patch.
src/views/catalog/detail.blade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 @section('aimeos_scripts')
4 4
 	@parent
5
-    <script type="text/javascript" src="<?php echo asset('packages/aimeos/shop/themes/aimeos-detail.js'); ?>"></script>
5
+    <script type="text/javascript" src="<?php echo asset( 'packages/aimeos/shop/themes/aimeos-detail.js' ); ?>"></script>
6 6
 @stop
7 7
 
8 8
 @section('aimeos_header')
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/BasketController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,6 @@
 block discarded – undo
36 36
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
37 37
 		}
38 38
 
39
-		return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store');
39
+		return Response::view( 'shop::basket.index', $params )->header( 'Cache-Control', 'no-store' );
40 40
 	}
41 41
 }
42 42
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AccountController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
37 37
 		}
38 38
 
39
-		return Response::view('shop::account.index', $params);
39
+		return Response::view( 'shop::account.index', $params );
40 40
 	}
41 41
 
42 42
 
Please login to merge, or discard this patch.
src/routes.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -1,226 +1,226 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() {
3
+Route::group( config( 'shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']] ), function() {
4 4
 
5 5
 	Route::match( array( 'GET' ), '', array(
6 6
 		'as' => 'aimeos_shop_admin',
7 7
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
8
-	));
8
+	) );
9 9
 
10 10
 });
11 11
 
12 12
 
13
-Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() {
13
+Route::group( config( 'shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']] ), function() {
14 14
 
15 15
 	Route::match( array( 'GET' ), 'file/{type}', array(
16 16
 		'as' => 'aimeos_shop_jqadm_file',
17 17
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
18
-	));
18
+	) );
19 19
 
20 20
 	Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array(
21 21
 		'as' => 'aimeos_shop_jqadm_copy',
22 22
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
23
-	))->where( array( 'resource' => '[a-z\/]+' ) );
23
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
24 24
 
25 25
 	Route::match( array( 'GET', 'POST' ), 'create/{resource}', array(
26 26
 		'as' => 'aimeos_shop_jqadm_create',
27 27
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
28
-	))->where( array( 'resource' => '[a-z\/]+' ) );
28
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
29 29
 
30 30
 	Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array(
31 31
 		'as' => 'aimeos_shop_jqadm_delete',
32 32
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
33
-	))->where( array( 'resource' => '[a-z\/]+' ) );
33
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
34 34
 
35 35
 	Route::match( array( 'GET', 'POST' ), 'export/{resource}', array(
36 36
 		'as' => 'aimeos_shop_jqadm_export',
37 37
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction'
38
-	))->where( array( 'resource' => '[a-z\/]+' ) );
38
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
39 39
 
40 40
 	Route::match( array( 'GET' ), 'get/{resource}/{id}', array(
41 41
 		'as' => 'aimeos_shop_jqadm_get',
42 42
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
43
-	))->where( array( 'resource' => '[a-z\/]+' ) );
43
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
44 44
 
45 45
 	Route::match( array( 'POST' ), 'save/{resource}', array(
46 46
 		'as' => 'aimeos_shop_jqadm_save',
47 47
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
48
-	))->where( array( 'resource' => '[a-z\/]+' ) );
48
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
49 49
 
50 50
 	Route::match( array( 'GET', 'POST' ), 'search/{resource}', array(
51 51
 		'as' => 'aimeos_shop_jqadm_search',
52 52
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
53
-	))->where( array( 'resource' => '[a-z\/]+' ) );
53
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
54 54
 
55 55
 });
56 56
 
57 57
 
58
-Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() {
58
+Route::group( config( 'shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']] ), function() {
59 59
 
60 60
 	Route::match( array( 'DELETE' ), '{resource}/{id?}', array(
61 61
 		'as' => 'aimeos_shop_jsonadm_delete',
62 62
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
63
-	))->where( array( 'resource' => '[a-z\/]+' ) );
63
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
64 64
 
65 65
 	Route::match( array( 'GET' ), '{resource}/{id?}', array(
66 66
 		'as' => 'aimeos_shop_jsonadm_get',
67 67
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
68
-	))->where( array( 'resource' => '[a-z\/]+' ) );
68
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
69 69
 
70 70
 	Route::match( array( 'PATCH' ), '{resource}/{id?}', array(
71 71
 		'as' => 'aimeos_shop_jsonadm_patch',
72 72
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
73
-	))->where( array( 'resource' => '[a-z\/]+' ) );
73
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
74 74
 
75 75
 	Route::match( array( 'POST' ), '{resource}/{id?}', array(
76 76
 		'as' => 'aimeos_shop_jsonadm_post',
77 77
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
78
-	))->where( array( 'resource' => '[a-z\/]+' ) );
78
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
79 79
 
80 80
 	Route::match( array( 'PUT' ), '{resource}/{id?}', array(
81 81
 		'as' => 'aimeos_shop_jsonadm_put',
82 82
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
83
-	))->where( array( 'resource' => '[a-z\/]+' ) );
83
+	) )->where( array( 'resource' => '[a-z\/]+' ) );
84 84
 
85 85
 	Route::match( array( 'OPTIONS' ), '{resource?}', array(
86 86
 		'as' => 'aimeos_shop_jsonadm_options',
87 87
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
88
-	))->where( array( 'resource' => '[a-z\/]*' ) );
88
+	) )->where( array( 'resource' => '[a-z\/]*' ) );
89 89
 
90 90
 });
91 91
 
92 92
 
93
-Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() {
93
+Route::group( config( 'shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']] ), function() {
94 94
 
95 95
 	Route::match( array( 'DELETE' ), '{resource}', array(
96 96
 		'as' => 'aimeos_shop_jsonapi_delete',
97 97
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
98
-	));
98
+	) );
99 99
 
100 100
 	Route::match( array( 'GET' ), '{resource}', array(
101 101
 		'as' => 'aimeos_shop_jsonapi_get',
102 102
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
103
-	));
103
+	) );
104 104
 
105 105
 	Route::match( array( 'PATCH' ), '{resource}', array(
106 106
 		'as' => 'aimeos_shop_jsonapi_patch',
107 107
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
108
-	));
108
+	) );
109 109
 
110 110
 	Route::match( array( 'POST' ), '{resource}', array(
111 111
 		'as' => 'aimeos_shop_jsonapi_post',
112 112
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
113
-	));
113
+	) );
114 114
 
115 115
 	Route::match( array( 'PUT' ), '{resource}', array(
116 116
 		'as' => 'aimeos_shop_jsonapi_put',
117 117
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
118
-	));
118
+	) );
119 119
 
120 120
 	Route::match( array( 'OPTIONS' ), '{resource?}', array(
121 121
 		'as' => 'aimeos_shop_jsonapi_options',
122 122
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
123
-	));
123
+	) );
124 124
 
125 125
 });
126 126
 
127 127
 
128
-Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
128
+Route::group( config( 'shop.routes.account', ['middleware' => ['web', 'auth']] ), function() {
129 129
 
130 130
 	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
131 131
 		'as' => 'aimeos_shop_account_favorite',
132 132
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
133
-	));
133
+	) );
134 134
 
135 135
 	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
136 136
 		'as' => 'aimeos_shop_account_watch',
137 137
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
138
-	));
138
+	) );
139 139
 
140 140
 	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
141 141
 		'as' => 'aimeos_shop_account_download',
142 142
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
143
-	));
143
+	) );
144 144
 
145 145
 	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
146 146
 		'as' => 'aimeos_shop_account',
147 147
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
148
-	));
148
+	) );
149 149
 
150 150
 });
151 151
 
152 152
 
153
-Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
153
+Route::group( config( 'shop.routes.default', ['middleware' => ['web']] ), function() {
154 154
 
155 155
 	Route::match( array( 'GET', 'POST' ), 'count', array(
156 156
 		'as' => 'aimeos_shop_count',
157 157
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
158
-	));
158
+	) );
159 159
 
160 160
 	Route::match( array( 'GET', 'POST' ), 'd/{d_name}/{d_prodid}/{d_pos?}', array(
161 161
 		'as' => 'aimeos_shop_detail',
162 162
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
163
-	));
163
+	) );
164 164
 
165 165
 	Route::match( array( 'GET', 'POST' ), 'd/pin/{pin_action}/{pin_id}/{d_name?}', array(
166 166
 		'as' => 'aimeos_shop_session_pinned',
167 167
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
168
-	));
168
+	) );
169 169
 
170 170
 	Route::match( array( 'GET', 'POST' ), 'list', array(
171 171
 		'as' => 'aimeos_shop_list',
172 172
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
173
-	));
173
+	) );
174 174
 
175 175
 	Route::match( array( 'GET', 'POST' ), 'c/{f_name}/{f_catid}', array(
176 176
 		'as' => 'aimeos_shop_tree',
177 177
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction'
178
-	));
178
+	) );
179 179
 
180 180
 	Route::match( array( 'GET', 'POST' ), 'suggest', array(
181 181
 		'as' => 'aimeos_shop_suggest',
182 182
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
183
-	));
183
+	) );
184 184
 
185 185
 	Route::match( array( 'GET', 'POST' ), 'stock', array(
186 186
 		'as' => 'aimeos_shop_stock',
187 187
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
188
-	));
188
+	) );
189 189
 
190 190
 	Route::match( array( 'GET', 'POST' ), 'basket', array(
191 191
 		'as' => 'aimeos_shop_basket',
192 192
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
193
-	));
193
+	) );
194 194
 
195 195
 	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
196 196
 		'as' => 'aimeos_shop_checkout',
197 197
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
198
-	));
198
+	) );
199 199
 
200 200
 	Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
201 201
 		'as' => 'aimeos_shop_confirm',
202 202
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
203
-	));
203
+	) );
204 204
 
205 205
 });
206 206
 
207 207
 
208
-Route::group(config('shop.routes.update', []), function() {
208
+Route::group( config( 'shop.routes.update', [] ), function() {
209 209
 
210 210
 	Route::match( array( 'GET', 'POST' ), 'update', array(
211 211
 		'as' => 'aimeos_shop_update',
212 212
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
213
-	));
213
+	) );
214 214
 
215 215
 });
216 216
 
217 217
 
218
-Route::get('terms', array(
218
+Route::get( 'terms', array(
219 219
 	'as' => 'aimeos_shop_terms',
220 220
 	'uses' => 'Aimeos\Shop\Controller\PageController@termsAction'
221
-));
221
+) );
222 222
 
223
-Route::get('privacy', array(
223
+Route::get( 'privacy', array(
224 224
 	'as' => 'aimeos_shop_privacy',
225 225
 	'uses' => 'Aimeos\Shop\Controller\PageController@privacyAction'
226
-));
226
+) );
Please login to merge, or discard this patch.
tests/Controller/CheckoutControllerTest.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -4,33 +4,33 @@
 block discarded – undo
4 4
 {
5 5
 	public function testConfirmAction()
6 6
 	{
7
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
7
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
8 8
 
9
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CheckoutController@confirmAction', ['site' => 'unittest']);
9
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CheckoutController@confirmAction', ['site' => 'unittest'] );
10 10
 
11 11
 		$this->assertResponseOk();
12
-		$this->assertContains('<section class="aimeos checkout-confirm"', $response->getContent());
12
+		$this->assertContains( '<section class="aimeos checkout-confirm"', $response->getContent() );
13 13
 	}
14 14
 
15 15
 
16 16
 	public function testIndexAction()
17 17
 	{
18
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
18
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
19 19
 
20
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CheckoutController@indexAction', ['site' => 'unittest']);
20
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CheckoutController@indexAction', ['site' => 'unittest'] );
21 21
 
22 22
 		$this->assertResponseOk();
23
-		$this->assertContains('<section class="checkout-standard-address"', $response->getContent());
23
+		$this->assertContains( '<section class="checkout-standard-address"', $response->getContent() );
24 24
 	}
25 25
 
26 26
 
27 27
 	public function testUpdateAction()
28 28
 	{
29
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
29
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
30 30
 
31
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CheckoutController@updateAction', ['site' => 'unittest'], ['code' => 'paypalexpress']);
31
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CheckoutController@updateAction', ['site' => 'unittest'], ['code' => 'paypalexpress'] );
32 32
 
33 33
 		$this->assertResponseOk();
34
-		$this->assertEquals('', $response->getContent());
34
+		$this->assertEquals( '', $response->getContent() );
35 35
 	}
36 36
 }
37 37
\ No newline at end of file
Please login to merge, or discard this patch.
tests/Controller/JsonapiControllerTest.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@  discard block
 block discarded – undo
4 4
 {
5 5
 	public function testOptionsAction()
6 6
 	{
7
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
7
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
8 8
 
9 9
 		$params = ['site' => 'unittest'];
10
-		$response = $this->action('OPTIONS', '\Aimeos\Shop\Controller\JsonapiController@optionsAction', $params);
10
+		$response = $this->action( 'OPTIONS', '\Aimeos\Shop\Controller\JsonapiController@optionsAction', $params );
11 11
 
12 12
 		$json = json_decode( $response->getContent(), true );
13 13
 
@@ -20,11 +20,11 @@  discard block
 block discarded – undo
20 20
 
21 21
 	public function testGetAction()
22 22
 	{
23
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
23
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
24 24
 
25 25
 		$params = ['site' => 'unittest', 'resource' => 'product'];
26 26
 		$getParams = ['filter' => ['f_search' => 'Cafe Noire Cap']];
27
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JsonapiController@getAction', $params, $getParams);
27
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JsonapiController@getAction', $params, $getParams );
28 28
 
29 29
 		$json = json_decode( $response->getContent(), true );
30 30
 
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
 		$id = $json['data'][0]['id'];
39 39
 
40 40
 
41
-		$params = ['site' => 'unittest', 'resource' => 'product', 'id' => $id ];
42
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JsonapiController@getAction', $params);
41
+		$params = ['site' => 'unittest', 'resource' => 'product', 'id' => $id];
42
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JsonapiController@getAction', $params );
43 43
 
44 44
 		$json = json_decode( $response->getContent(), true );
45 45
 
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 
54 54
 	public function testPostPatchDeleteAction()
55 55
 	{
56
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
56
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
57 57
 
58 58
 		// get CNC product
59 59
 		$params = ['site' => 'unittest', 'resource' => 'product'];
60 60
 		$getParams = ['filter' => ['f_search' => 'Cafe Noire Cap', 'f_listtype' => 'unittype19']];
61
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JsonapiController@getAction', $params, $getParams);
61
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JsonapiController@getAction', $params, $getParams );
62 62
 
63 63
 		$json = json_decode( $response->getContent(), true );
64 64
 		$this->assertEquals( 'CNC', $json['data'][0]['attributes']['product.code'] );
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		// add CNC product to basket
67 67
 		$params = ['site' => 'unittest', 'resource' => 'basket', 'id' => 'default', 'related' => 'product'];
68 68
 		$content = json_encode( ['data' => ['attributes' => ['product.id' => $json['data'][0]['id']]]] );
69
-		$response = $this->action('POST', '\Aimeos\Shop\Controller\JsonapiController@postAction', $params, [], [], [], [], $content);
69
+		$response = $this->action( 'POST', '\Aimeos\Shop\Controller\JsonapiController@postAction', $params, [], [], [], [], $content );
70 70
 
71 71
 		$json = json_decode( $response->getContent(), true );
72 72
 		$this->assertEquals( 'CNC', $json['included'][0]['attributes']['order.base.product.prodcode'] );
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
 		// change product quantity in basket
75 75
 		$params = ['site' => 'unittest', 'resource' => 'basket', 'id' => 'default', 'related' => 'product', 'relatedid' => 0];
76 76
 		$content = json_encode( ['data' => ['attributes' => ['quantity' => 2]]] );
77
-		$response = $this->action('PATCH', '\Aimeos\Shop\Controller\JsonapiController@patchAction', $params, [], [], [], [], $content);
77
+		$response = $this->action( 'PATCH', '\Aimeos\Shop\Controller\JsonapiController@patchAction', $params, [], [], [], [], $content );
78 78
 
79 79
 		$json = json_decode( $response->getContent(), true );
80 80
 		$this->assertEquals( 2, $json['included'][0]['attributes']['order.base.product.quantity'] );
81 81
 
82 82
 		// delete product from basket
83 83
 		$params = ['site' => 'unittest', 'resource' => 'basket', 'id' => 'default', 'related' => 'product', 'relatedid' => 0];
84
-		$response = $this->action('DELETE', '\Aimeos\Shop\Controller\JsonapiController@deleteAction', $params);
84
+		$response = $this->action( 'DELETE', '\Aimeos\Shop\Controller\JsonapiController@deleteAction', $params );
85 85
 
86 86
 		$json = json_decode( $response->getContent(), true );
87 87
 		$this->assertEquals( 0, count( $json['included'] ) );
@@ -90,10 +90,10 @@  discard block
 block discarded – undo
90 90
 
91 91
 	public function testPutAction()
92 92
 	{
93
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
93
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
94 94
 
95 95
 		$params = ['site' => 'unittest', 'resource' => 'basket'];
96
-		$response = $this->action('PUT', '\Aimeos\Shop\Controller\JsonapiController@putAction', $params);
96
+		$response = $this->action( 'PUT', '\Aimeos\Shop\Controller\JsonapiController@putAction', $params );
97 97
 
98 98
 		$json = json_decode( $response->getContent(), true );
99 99
 		$this->assertArrayHasKey( 'errors', $json );
Please login to merge, or discard this patch.
tests/Controller/PageControllerTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -4,18 +4,18 @@
 block discarded – undo
4 4
 {
5 5
 	public function testPrivacyAction()
6 6
 	{
7
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
7
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
8 8
 
9
-		$this->action('GET', '\Aimeos\Shop\Controller\PageController@privacyAction', ['site' => 'unittest']);
9
+		$this->action( 'GET', '\Aimeos\Shop\Controller\PageController@privacyAction', ['site' => 'unittest'] );
10 10
 		$this->assertResponseOk();
11 11
 	}
12 12
 
13 13
 
14 14
 	public function testTermsAction()
15 15
 	{
16
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
16
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
17 17
 
18
-		$this->action('GET', '\Aimeos\Shop\Controller\PageController@termsAction', ['site' => 'unittest']);
18
+		$this->action( 'GET', '\Aimeos\Shop\Controller\PageController@termsAction', ['site' => 'unittest'] );
19 19
 		$this->assertResponseOk();
20 20
 	}
21 21
 }
22 22
\ No newline at end of file
Please login to merge, or discard this patch.