Completed
Push — master ( 7f1d89...742ec8 )
by Aimeos
17:53
created
src/Aimeos/Shop/Command/AbstractCommand.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,19 +22,19 @@
 block discarded – undo
22 22
 	 * @param string|array $sites Unique site codes
23 23
 	 * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items
24 24
 	 */
25
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites )
25
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites)
26 26
 	{
27
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
27
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
28 28
 		$search = $manager->createSearch();
29 29
 
30
-		if( is_scalar( $sites ) && $sites != '' ) {
31
-			$sites = explode( ' ', $sites );
30
+		if (is_scalar($sites) && $sites != '') {
31
+			$sites = explode(' ', $sites);
32 32
 		}
33 33
 
34
-		if( !empty( $sites ) ) {
35
-			$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
34
+		if (!empty($sites)) {
35
+			$search->setConditions($search->compare('==', 'locale.site.code', $sites));
36 36
 		}
37 37
 
38
-		return $manager->searchItems( $search );
38
+		return $manager->searchItems($search);
39 39
 	}
40 40
 }
41 41
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/CacheCommand.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -35,24 +35,24 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function fire()
37 37
 	{
38
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false );
39
-		$context->setEditor( 'aimeos:cache' );
38
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false);
39
+		$context->setEditor('aimeos:cache');
40 40
 
41
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
41
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
42 42
 
43
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
43
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
44 44
 		{
45
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
45
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
46 46
 
47 47
 			$lcontext = clone $context;
48
-			$lcontext->setLocale( $localeItem );
48
+			$lcontext->setLocale($localeItem);
49 49
 
50
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
51
-			$lcontext->setCache( $cache );
50
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
51
+			$lcontext->setCache($cache);
52 52
 
53
-			$this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
53
+			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
54 54
 
55
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();
55
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();
56 56
 		}
57 57
 	}
58 58
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	protected function getArguments()
66 66
 	{
67 67
 		return array(
68
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ),
68
+			array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'),
69 69
 		);
70 70
 	}
71 71
 
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
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 	 */
29 29
 	public function indexAction()
30 30
 	{
31
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' );
31
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index');
32 32
 		return \View::make('shop::basket.index', $params);
33 33
 	}
34 34
 }
35 35
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function countAction()
30 30
 	{
31
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' );
31
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count');
32 32
 		$contents = \View::make('shop::catalog.count', $params);
33 33
 
34 34
 		$response = \Response::make($contents, 200);
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 */
46 46
 	public function detailAction()
47 47
 	{
48
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' );
48
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail');
49 49
 		return \View::make('shop::catalog.detail', $params);
50 50
 	}
51 51
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 	 */
58 58
 	public function listAction()
59 59
 	{
60
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' );
60
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list');
61 61
 		return \View::make('shop::catalog.list', $params);
62 62
 	}
63 63
 
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	public function stockAction()
71 71
 	{
72
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' );
72
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock');
73 73
 		$contents = \View::make('shop::catalog.stock', $params);
74 74
 
75 75
 		$response = \Response::make($contents, 200);
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 */
87 87
 	public function suggestAction()
88 88
 	{
89
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' );
89
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest');
90 90
 		$contents = \View::make('shop::catalog.suggest', $params);
91 91
 
92 92
 		$response = \Response::make($contents, 200);
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CheckoutController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function confirmAction()
30 30
 	{
31
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' );
31
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm');
32 32
 		return \View::make('shop::checkout.confirm', $params);
33 33
 	}
34 34
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	public function indexAction()
42 42
 	{
43
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' );
43
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index');
44 44
 		return \View::make('shop::checkout.index', $params);
45 45
 	}
46 46
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function updateAction()
54 54
 	{
55
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' );
55
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update');
56 56
 		return \View::make('shop::checkout.update', $params);
57 57
 	}
58 58
 }
59 59
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Aimeos.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
36 36
 	 */
37
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
37
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
38 38
 	{
39 39
 		$this->config = $config;
40 40
 	}
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function get()
49 49
 	{
50
-		if( $this->object === null )
50
+		if ($this->object === null)
51 51
 		{
52
-			$extDirs = (array) $this->config->get( 'shop.extdir', array() );
53
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
52
+			$extDirs = (array) $this->config->get('shop.extdir', array());
53
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
54 54
 		}
55 55
 
56 56
 		return $this->object;
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
 	 */
65 65
 	public function getVersion()
66 66
 	{
67
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
68
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
67
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
68
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
69 69
 		) {
70
-			foreach( (array) $content['packages'] as $item )
70
+			foreach ((array) $content['packages'] as $item)
71 71
 			{
72
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
72
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
73 73
 					return $item['version'];
74 74
 				}
75 75
 			}
Please login to merge, or discard this patch.
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/default.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -4,20 +4,20 @@  discard block
 block discarded – undo
4 4
 
5 5
 	'apc_enabled' => false,
6 6
 	'apc_prefix' => 'laravel:',
7
-	'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__) . DIRECTORY_SEPARATOR . 'ext' ),
7
+	'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__).DIRECTORY_SEPARATOR.'ext'),
8 8
 	'uploaddir' => '/',
9 9
 
10 10
 	'page' => array(
11
-		'account-index' => array( 'account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
12
-		'basket-index' => array( 'basket/standard','basket/related' ),
13
-		'catalog-count' => array( 'catalog/count' ),
14
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
15
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
16
-		'catalog-stock' => array( 'catalog/stock' ),
17
-		'catalog-suggest' => array( 'catalog/suggest' ),
18
-		'checkout-confirm' => array( 'checkout/confirm' ),
19
-		'checkout-index' => array( 'checkout/standard' ),
20
-		'checkout-update' => array( 'checkout/update'),
11
+		'account-index' => array('account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
12
+		'basket-index' => array('basket/standard', 'basket/related'),
13
+		'catalog-count' => array('catalog/count'),
14
+		'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
15
+		'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
16
+		'catalog-stock' => array('catalog/stock'),
17
+		'catalog-suggest' => array('catalog/suggest'),
18
+		'checkout-confirm' => array('checkout/confirm'),
19
+		'checkout-index' => array('checkout/standard'),
20
+		'checkout-update' => array('checkout/update'),
21 21
 	),
22 22
 
23 23
 	'resource' => array(
@@ -28,24 +28,24 @@  discard block
 block discarded – undo
28 28
 			'database' => env('DB_DATABASE', 'laravel'),
29 29
 			'username' => env('DB_USERNAME', 'root'),
30 30
 			'password' => env('DB_PASSWORD', ''),
31
-			'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ),
31
+			'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"),
32 32
 			'opt-persistent' => 0,
33 33
 			'limit' => 2,
34 34
 		),
35 35
 		'fs' => array(
36 36
 			'adapter' => 'Standard',
37 37
 			'basedir' => public_path(),
38
-			'tempdir' => storage_path( 'tmp' ),
38
+			'tempdir' => storage_path('tmp'),
39 39
 		),
40 40
 		'fs-admin' => array(
41 41
 			'adapter' => 'Standard',
42
-			'basedir' => public_path( 'uploads' ),
43
-			'tempdir' => storage_path( 'tmp' ),
42
+			'basedir' => public_path('uploads'),
43
+			'tempdir' => storage_path('tmp'),
44 44
 		),
45 45
 		'fs-secure' => array(
46 46
 			'adapter' => 'Standard',
47
-			'basedir' => storage_path( 'secure' ),
48
-			'tempdir' => storage_path( 'tmp' ),
47
+			'basedir' => storage_path('secure'),
48
+			'tempdir' => storage_path('tmp'),
49 49
 		),
50 50
 		'mq' => array(
51 51
 			'adapter' => 'Standard',
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 						# in the "maxwidth" parameter
268 268
 						# 'maxheight' => 280,
269 269
 					),
270
-					'tempdir' => storage_path( 'aimeos' ),
270
+					'tempdir' => storage_path('aimeos'),
271 271
 				),
272 272
 			),
273 273
 		),
Please login to merge, or discard this patch.