Completed
Push — master ( 1a2eee...cade71 )
by Aimeos
03:04
created
src/routes.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 Route::group(config('shop.routes.login', ['middleware' => ['web']]), function() {
4 4
 
5
-	Route::match( array( 'GET' ), 'admin', array(
5
+	Route::match(array('GET'), 'admin', array(
6 6
 		'as' => 'aimeos_shop_admin',
7 7
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
8 8
 	));
@@ -12,109 +12,109 @@  discard block
 block discarded – undo
12 12
 
13 13
 Route::group(config('shop.routes.admin', ['middleware' => ['web', 'auth']]), function() {
14 14
 
15
-	Route::match( array( 'GET' ), 'extadm', array(
15
+	Route::match(array('GET'), 'extadm', array(
16 16
 		'as' => 'aimeos_shop_extadm',
17 17
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction'
18 18
 	));
19 19
 
20
-	Route::match( array( 'GET' ), 'extadm/file', array(
20
+	Route::match(array('GET'), 'extadm/file', array(
21 21
 		'as' => 'aimeos_shop_extadm_file',
22 22
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction'
23 23
 	));
24 24
 
25
-	Route::match( array( 'POST' ), 'extadm/do', array(
25
+	Route::match(array('POST'), 'extadm/do', array(
26 26
 		'as' => 'aimeos_shop_extadm_json',
27 27
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction'
28 28
 	));
29 29
 
30 30
 
31
-	Route::match( array( 'GET' ), 'jqadm/file/{type}', array(
31
+	Route::match(array('GET'), 'jqadm/file/{type}', array(
32 32
 		'as' => 'aimeos_shop_jqadm_file',
33 33
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
34 34
 	));
35 35
 
36
-	Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array(
36
+	Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array(
37 37
 		'as' => 'aimeos_shop_jqadm_copy',
38 38
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
39
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
39
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
40 40
 
41
-	Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array(
41
+	Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array(
42 42
 		'as' => 'aimeos_shop_jqadm_create',
43 43
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
44
-	))->where( array( 'resource' => '[^0-9]+' ) );
44
+	))->where(array('resource' => '[^0-9]+'));
45 45
 
46
-	Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array(
46
+	Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array(
47 47
 		'as' => 'aimeos_shop_jqadm_delete',
48 48
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
49
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
49
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
50 50
 
51
-	Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array(
51
+	Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array(
52 52
 		'as' => 'aimeos_shop_jqadm_get',
53 53
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
54
-	))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]+' ) );
54
+	))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]+'));
55 55
 
56
-	Route::match( array( 'POST' ), 'jqadm/save/{resource}/{id?}', array(
56
+	Route::match(array('POST'), 'jqadm/save/{resource}/{id?}', array(
57 57
 		'as' => 'aimeos_shop_jqadm_save',
58 58
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
59
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
59
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
60 60
 
61
-	Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array(
61
+	Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array(
62 62
 		'as' => 'aimeos_shop_jqadm_search',
63 63
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
64
-	))->where( array( 'resource' => '[^0-9]+' ) );
64
+	))->where(array('resource' => '[^0-9]+'));
65 65
 
66 66
 
67
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
67
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
68 68
 		'as' => 'aimeos_shop_jsonadm_delete',
69 69
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
70
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
70
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
71 71
 
72
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
72
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
73 73
 		'as' => 'aimeos_shop_jsonadm_get',
74 74
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
75
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
75
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
76 76
 
77
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
77
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
78 78
 		'as' => 'aimeos_shop_jsonadm_patch',
79 79
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
80
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
80
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
81 81
 
82
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
82
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
83 83
 		'as' => 'aimeos_shop_jsonadm_post',
84 84
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
85
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
85
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
86 86
 
87
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
87
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
88 88
 		'as' => 'aimeos_shop_jsonadm_put',
89 89
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
90
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
90
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
91 91
 
92
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
92
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
93 93
 		'as' => 'aimeos_shop_jsonadm_options',
94 94
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
95
-	))->where( array( 'resource' => '[^0-9]*' ) );
95
+	))->where(array('resource' => '[^0-9]*'));
96 96
 
97 97
 });
98 98
 
99 99
 
100 100
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
101 101
 
102
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
102
+	Route::match(array('GET', 'POST'), 'myaccount', array(
103 103
 		'as' => 'aimeos_shop_account',
104 104
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
105 105
 	));
106 106
 
107
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
107
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
108 108
 		'as' => 'aimeos_shop_account_favorite',
109 109
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
110 110
 	));
111 111
 
112
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
112
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
113 113
 		'as' => 'aimeos_shop_account_watch',
114 114
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
115 115
 	));
116 116
 
117
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
117
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
118 118
 		'as' => 'aimeos_shop_account_download',
119 119
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
120 120
 	));
@@ -124,42 +124,42 @@  discard block
 block discarded – undo
124 124
 
125 125
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
126 126
 
127
-	Route::match( array( 'GET', 'POST' ), 'count', array(
127
+	Route::match(array('GET', 'POST'), 'count', array(
128 128
 		'as' => 'aimeos_shop_count',
129 129
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
130 130
 	));
131 131
 
132
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
132
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
133 133
 		'as' => 'aimeos_shop_detail',
134 134
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
135 135
 	));
136 136
 
137
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
137
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
138 138
 		'as' => 'aimeos_shop_session_pinned',
139 139
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
140 140
 	));
141 141
 
142
-	Route::match( array( 'GET', 'POST' ), 'list', array(
142
+	Route::match(array('GET', 'POST'), 'list', array(
143 143
 		'as' => 'aimeos_shop_list',
144 144
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
145 145
 	));
146 146
 
147
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
147
+	Route::match(array('GET', 'POST'), 'suggest', array(
148 148
 		'as' => 'aimeos_shop_suggest',
149 149
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
150 150
 	));
151 151
 
152
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
152
+	Route::match(array('GET', 'POST'), 'stock', array(
153 153
 		'as' => 'aimeos_shop_stock',
154 154
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
155 155
 	));
156 156
 
157
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
157
+	Route::match(array('GET', 'POST'), 'basket', array(
158 158
 		'as' => 'aimeos_shop_basket',
159 159
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
160 160
 	));
161 161
 
162
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
162
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
163 163
 		'as' => 'aimeos_shop_checkout',
164 164
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
165 165
 	));
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 
170 170
 Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() {
171 171
 
172
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
172
+	Route::match(array('GET', 'POST'), 'confirm', array(
173 173
 		'as' => 'aimeos_shop_confirm',
174 174
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
175 175
 	));
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 
180 180
 Route::group(config('shop.routes.update', []), function() {
181 181
 
182
-	Route::match( array( 'GET', 'POST' ), 'update', array(
182
+	Route::match(array('GET', 'POST'), 'update', array(
183 183
 		'as' => 'aimeos_shop_update',
184 184
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
185 185
 	));
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/I18n.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
41 41
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
42 42
 	 */
43
-	public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config )
43
+	public function __construct(\Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config)
44 44
 	{
45 45
 		$this->aimeos = $aimeos;
46 46
 		$this->config = $config;
@@ -53,22 +53,22 @@  discard block
 block discarded – undo
53 53
 	 * @param array $languageIds List of two letter ISO language IDs
54 54
 	 * @return \Aimeos\MW\Translation\Iface[] List of translation objects
55 55
 	 */
56
-	public function get( array $languageIds )
56
+	public function get(array $languageIds)
57 57
 	{
58 58
 		$i18nPaths = $this->aimeos->get()->getI18nPaths();
59 59
 
60
-		foreach( $languageIds as $langid )
60
+		foreach ($languageIds as $langid)
61 61
 		{
62
-			if( !isset( $this->i18n[$langid] ) )
62
+			if (!isset($this->i18n[$langid]))
63 63
 			{
64
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
64
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
65 65
 
66
-				if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
67
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
66
+				if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) {
67
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:'));
68 68
 				}
69 69
 
70
-				if( $this->config->has( 'shop.i18n.' . $langid ) ) {
71
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) );
70
+				if ($this->config->has('shop.i18n.'.$langid)) {
71
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid));
72 72
 				}
73 73
 
74 74
 				$this->i18n[$langid] = $i18n;
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Support.php 2 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
29 29
 	 *
30 30
 	 * @param \Aimeos\Shop\Base\Context $context Context provider
31 31
 	 */
32
-	public function __construct( \Aimeos\Shop\Base\Context $context, $site )
32
+	public function __construct(\Aimeos\Shop\Base\Context $context, $site)
33 33
 	{
34
-		$this->context = $context->get( false );
35
-		$this->context = $this->setLocale( $this->context, $site );
34
+		$this->context = $context->get(false);
35
+		$this->context = $this->setLocale($this->context, $site);
36 36
 	}
37 37
 
38 38
 
@@ -43,21 +43,21 @@  discard block
 block discarded – undo
43 43
 	 * @param string|array $groupcodes Unique user/customer group codes that are allowed
44 44
 	 * @return boolean True if user is part of the group, false if not
45 45
 	 */
46
-	public function checkGroup( $userid, $groupcodes )
46
+	public function checkGroup($userid, $groupcodes)
47 47
 	{
48
-		$groupItems = $this->getGroups( (array) $groupcodes );
49
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/lists' );
48
+		$groupItems = $this->getGroups((array) $groupcodes);
49
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/lists');
50 50
 
51 51
 		$search = $manager->createSearch();
52 52
 		$expr = array(
53
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
54
-			$search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
55
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
53
+			$search->compare('==', 'customer.lists.parentid', $userid),
54
+			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)),
55
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
56 56
 		);
57
-		$search->setConditions( $search->combine( '&&', $expr ) );
58
-		$search->setSlice( 0, 1 );
57
+		$search->setConditions($search->combine('&&', $expr));
58
+		$search->setSlice(0, 1);
59 59
 
60
-		return (bool) count( $manager->searchItems( $search ) );
60
+		return (bool) count($manager->searchItems($search));
61 61
 	}
62 62
 
63 63
 
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
 	 * @param array $codes List of group codes
68 68
 	 * @return array Associative list of group IDs as keys and \Aimeos\MShop\Customer\Item\Group\Iface as values
69 69
 	 */
70
-	protected function getGroups( array $codes )
70
+	protected function getGroups(array $codes)
71 71
 	{
72
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/group' );
72
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/group');
73 73
 
74 74
 		$search = $manager->createSearch();
75
-		$search->setConditions( $search->compare( '==', 'customer.group.code', $codes ) );
75
+		$search->setConditions($search->compare('==', 'customer.group.code', $codes));
76 76
 
77
-		return $manager->searchItems( $search );
77
+		return $manager->searchItems($search);
78 78
 	}
79 79
 
80 80
 
@@ -85,22 +85,22 @@  discard block
 block discarded – undo
85 85
 	 * @param string Unique site code
86 86
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
87 87
 	 */
88
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site )
88
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site)
89 89
 	{
90
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
90
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
91 91
 
92 92
 		try
93 93
 		{
94
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
95
-			$localeItem->setLanguageId( null );
96
-			$localeItem->setCurrencyId( null );
94
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
95
+			$localeItem->setLanguageId(null);
96
+			$localeItem->setCurrencyId(null);
97 97
 		}
98
-		catch( \Aimeos\MShop\Locale\Exception $e )
98
+		catch (\Aimeos\MShop\Locale\Exception $e)
99 99
 		{
100 100
 			$localeItem = $localeManager->createItem();
101 101
 		}
102 102
 
103
-		$context->setLocale( $localeItem );
103
+		$context->setLocale($localeItem);
104 104
 
105 105
 		return $context;
106 106
 	}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -207,8 +207,7 @@
 block discarded – undo
207 207
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
208 208
 			$localeItem->setLanguageId( null );
209 209
 			$localeItem->setCurrencyId( null );
210
-		}
211
-		catch( \Aimeos\MShop\Locale\Exception $e )
210
+		} catch( \Aimeos\MShop\Locale\Exception $e )
212 211
 		{
213 212
 			$localeItem = $localeManager->createItem();
214 213
 		}
Please login to merge, or discard this patch.
src/Aimeos/Shop/ShopServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
 		});
98 98
 
99 99
 		$this->app->singleton('\Aimeos\Shop\Base\Support', function($app) {
100
-			$site = Route::input( 'site', Input::get( 'site', 'default' ) );
100
+			$site = Route::input('site', Input::get('site', 'default'));
101 101
 			return new \Aimeos\Shop\Base\Support($app['\Aimeos\Shop\Base\Context'], $site);
102 102
 		});
103 103
 
Please login to merge, or discard this patch.
src/views/jqadm/index.blade.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 		<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css">
11 11
 		<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
12 12
 		<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css">
13
-		<link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>">
13
+		<link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>">
14 14
 
15 15
     	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
16 16
     	<!--[if lt IE 9]>
@@ -29,6 +29,6 @@  discard block
 block discarded – undo
29 29
 		<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script>
30 30
 		<script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script>
31 31
 		<script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script>
32
-		<script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script>
32
+		<script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script>
33 33
 	</body>
34 34
 </html>
Please login to merge, or discard this patch.
src/views/extadm/index.blade.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
         <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" />
10 10
         <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" />
11 11
 @foreach ($cssFiles as $cssFile)
12
-        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" />
12
+        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" />
13 13
 @endforeach
14 14
 
15 15
         <script type="text/javascript">
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script>
47 47
         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script>
48
-        <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script>
48
+        <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script>
49 49
 
50 50
     </head>
51 51
     <body>
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AccountController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function indexAction()
32 32
 	{
33
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );
33
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index');
34 34
 		return View::make('shop::account.index', $params);
35 35
 	}
36 36
 
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
42 42
 	 */
43 43
 	public function downloadAction()
44 44
 	{
45
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
45
+		$context = app('\Aimeos\Shop\Base\Context')->get();
46 46
 		$langid = $context->getLocale()->getLanguageId();
47 47
 
48
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );
49
-		$context->setView( $view );
48
+		$view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid);
49
+		$context->setView($view);
50 50
 
51
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
52
-		$client->setView( $view );
51
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
52
+		$client->setView($view);
53 53
 		$client->process();
54 54
 
55 55
 		$response = $view->response();
56
-		return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
56
+		return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
57 57
 	}
58 58
 }
59 59
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Page.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 * @param \Aimeos\Shop\Base\Context $context Context object
48 48
 	 * @param \Aimeos\Shop\Base\View $view View object
49 49
 	 */
50
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
51
-		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view )
50
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
51
+		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view)
52 52
 	{
53 53
 		$this->config = $config;
54 54
 		$this->aimeos = $aimeos;
@@ -63,23 +63,23 @@  discard block
 block discarded – undo
63 63
 	 * @param string $pageName Name of the configured page
64 64
 	 * @return array Associative list with body and header output separated by client name
65 65
 	 */
66
-	public function getSections( $pageName )
66
+	public function getSections($pageName)
67 67
 	{
68 68
 		$context = $this->context->get();
69 69
 		$langid = $context->getLocale()->getLanguageId();
70
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
71
-		$view = $this->view->create( $context, $tmplPaths, $langid );
72
-		$context->setView( $view );
70
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
71
+		$view = $this->view->create($context, $tmplPaths, $langid);
72
+		$context->setView($view);
73 73
 
74
-		$pagesConfig = $this->config->get( 'shop.page', array() );
75
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
74
+		$pagesConfig = $this->config->get('shop.page', array());
75
+		$result = array('aibody' => array(), 'aiheader' => array());
76 76
 
77
-		if( isset( $pagesConfig[$pageName] ) )
77
+		if (isset($pagesConfig[$pageName]))
78 78
 		{
79
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
79
+			foreach ((array) $pagesConfig[$pageName] as $clientName)
80 80
 			{
81
-				$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
82
-				$client->setView( clone $view );
81
+				$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
82
+				$client->setView(clone $view);
83 83
 				$client->process();
84 84
 
85 85
 				$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -36,20 +36,20 @@
 block discarded – undo
36 36
 	 * @param \Illuminate\Http\Request $request Laravel request object
37 37
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
38 38
 	 */
39
-	public function indexAction( Request $request )
39
+	public function indexAction(Request $request)
40 40
 	{
41
-		if( config( 'shop.authorize', true ) && ( Auth::check() === false
42
-			|| $request->user()->can( 'admin', ['admin', 'editor'] ) ) === false
41
+		if (config('shop.authorize', true) && (Auth::check() === false
42
+			|| $request->user()->can('admin', ['admin', 'editor'])) === false
43 43
 		) {
44
-			return View::make( 'shop::admin.index' );
44
+			return View::make('shop::admin.index');
45 45
 		}
46 46
 
47 47
 		$param = array(
48 48
 			'resource' => 'dashboard',
49
-			'site' => Route::input( 'site', Input::get( 'site', 'default' ) ),
50
-			'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) )
49
+			'site' => Route::input('site', Input::get('site', 'default')),
50
+			'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en')))
51 51
 		);
52 52
 
53
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
53
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
54 54
 	}
55 55
 }
Please login to merge, or discard this patch.