Completed
Push — master ( 1b70d1...74cd60 )
by Aimeos
08:04
created
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -36,31 +36,31 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	public function fire()
38 38
 	{
39
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false );
40
-		$ctx->setEditor( 'aimeos:setup' );
39
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false);
40
+		$ctx->setEditor('aimeos:setup');
41 41
 
42 42
 		$config = $ctx->getConfig();
43
-		$site = $this->argument( 'site' );
44
-		$template = $this->argument( 'tplsite' );
43
+		$site = $this->argument('site');
44
+		$template = $this->argument('tplsite');
45 45
 
46
-		$config->set( 'setup/site', $site );
47
-		$dbconfig = $this->getDbConfig( $config );
48
-		$this->setOptions( $config );
46
+		$config->set('setup/site', $site);
47
+		$dbconfig = $this->getDbConfig($config);
48
+		$this->setOptions($config);
49 49
 
50
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
50
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
51 51
 
52 52
 		$includePaths = $taskPaths;
53 53
 		$includePaths[] = get_include_path();
54 54
 
55
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
56
-			throw new Exception( 'Unable to extend include path' );
55
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
56
+			throw new Exception('Unable to extend include path');
57 57
 		}
58 58
 
59
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
59
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
60 60
 
61
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
61
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
62 62
 
63
-		$manager->run( 'mysql' );
63
+		$manager->run('mysql');
64 64
 	}
65 65
 
66 66
 
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 	protected function getArguments()
73 73
 	{
74 74
 		return array(
75
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
76
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
75
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
76
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
77 77
 		);
78 78
 	}
79 79
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	protected function getOptions()
87 87
 	{
88 88
 		return array(
89
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
89
+			array('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
90 90
 		);
91 91
 	}
92 92
 
@@ -97,14 +97,14 @@  discard block
 block discarded – undo
97 97
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
98 98
 	 * @return array Multi-dimensional associative list of database configuration parameters
99 99
 	 */
100
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
100
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
101 101
 	{
102
-		$dbconfig = $conf->get( 'resource', array() );
102
+		$dbconfig = $conf->get('resource', array());
103 103
 
104
-		foreach( $dbconfig as $rname => $dbconf )
104
+		foreach ($dbconfig as $rname => $dbconf)
105 105
 		{
106
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
107
-				unset( $dbconfig[$rname] );
106
+			if (strncmp($rname, 'db', 2) !== 0) {
107
+				unset($dbconfig[$rname]);
108 108
 			}
109 109
 		}
110 110
 
@@ -119,12 +119,12 @@  discard block
 block discarded – undo
119 119
 	 * @param array Associative list of database configurations
120 120
 	 * @throws \RuntimeException If the format of the options is invalid
121 121
 	 */
122
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
122
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
123 123
 	{
124
-		foreach( (array) $this->option( 'option' ) as $option )
124
+		foreach ((array) $this->option('option') as $option)
125 125
 		{
126
-			list( $name, $value ) = explode( ':', $option );
127
-			$conf->set( $name, $value );
126
+			list($name, $value) = explode(':', $option);
127
+			$conf->set($name, $value);
128 128
 		}
129 129
 	}
130 130
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JqadmController.php 2 patches
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
 	 * @param integer $id Unique resource ID
35 35
 	 * @return string Generated output
36 36
 	 */
37
-	public function copyAction( $site = 'default', $resource, $id )
37
+	public function copyAction($site = 'default', $resource, $id)
38 38
 	{
39
-		if( config( 'shop.authorize', true ) ) {
40
-			$this->authorize( 'admin' );
39
+		if (config('shop.authorize', true)) {
40
+			$this->authorize('admin');
41 41
 		}
42 42
 
43
-		$cntl = $this->createClient( $site, $resource );
44
-		return $this->getHtml( $site, $cntl->copy( $id ) );
43
+		$cntl = $this->createClient($site, $resource);
44
+		return $this->getHtml($site, $cntl->copy($id));
45 45
 	}
46 46
 
47 47
 
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
 	 * @param string $sitecode Unique site code
53 53
 	 * @return string Generated output
54 54
 	 */
55
-	public function createAction( $site = 'default', $resource )
55
+	public function createAction($site = 'default', $resource)
56 56
 	{
57
-		if( config( 'shop.authorize', true ) ) {
58
-			$this->authorize( 'admin' );
57
+		if (config('shop.authorize', true)) {
58
+			$this->authorize('admin');
59 59
 		}
60 60
 
61
-		$cntl = $this->createClient( $site, $resource );
62
-		return $this->getHtml( $site, $cntl->create() );
61
+		$cntl = $this->createClient($site, $resource);
62
+		return $this->getHtml($site, $cntl->create());
63 63
 	}
64 64
 
65 65
 
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
 	 * @param integer $id Unique resource ID
72 72
 	 * @return string Generated output
73 73
 	 */
74
-	public function deleteAction( $site = 'default', $resource, $id )
74
+	public function deleteAction($site = 'default', $resource, $id)
75 75
 	{
76
-		if( config( 'shop.authorize', true ) ) {
77
-			$this->authorize( 'admin' );
76
+		if (config('shop.authorize', true)) {
77
+			$this->authorize('admin');
78 78
 		}
79 79
 
80
-		$cntl = $this->createClient( $site, $resource );
81
-		return $this->getHtml( $site, $cntl->delete( $id ) . $cntl->search() );
80
+		$cntl = $this->createClient($site, $resource);
81
+		return $this->getHtml($site, $cntl->delete($id) . $cntl->search());
82 82
 	}
83 83
 
84 84
 
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
 	 * @param integer $id Unique resource ID
91 91
 	 * @return string Generated output
92 92
 	 */
93
-	public function getAction( $site = 'default', $resource, $id )
93
+	public function getAction($site = 'default', $resource, $id)
94 94
 	{
95
-		if( config( 'shop.authorize', true ) ) {
96
-			$this->authorize( 'admin' );
95
+		if (config('shop.authorize', true)) {
96
+			$this->authorize('admin');
97 97
 		}
98 98
 
99
-		$cntl = $this->createClient( $site, $resource );
100
-		return $this->getHtml( $site, $cntl->get( $id ) );
99
+		$cntl = $this->createClient($site, $resource);
100
+		return $this->getHtml($site, $cntl->get($id));
101 101
 	}
102 102
 
103 103
 
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 	 * @param string $sitecode Unique site code
109 109
 	 * @return string Generated output
110 110
 	 */
111
-	public function saveAction( $site = 'default', $resource )
111
+	public function saveAction($site = 'default', $resource)
112 112
 	{
113
-		if( config( 'shop.authorize', true ) ) {
114
-			$this->authorize( 'admin' );
113
+		if (config('shop.authorize', true)) {
114
+			$this->authorize('admin');
115 115
 		}
116 116
 
117
-		$cntl = $this->createClient( $site, $resource );
118
-		return $this->getHtml( $site, ( $cntl->save() ? : $cntl->search() ) );
117
+		$cntl = $this->createClient($site, $resource);
118
+		return $this->getHtml($site, ($cntl->save() ?: $cntl->search()));
119 119
 	}
120 120
 
121 121
 
@@ -126,14 +126,14 @@  discard block
 block discarded – undo
126 126
 	 * @param string $sitecode Unique site code
127 127
 	 * @return string Generated output
128 128
 	 */
129
-	public function searchAction( $site = 'default', $resource )
129
+	public function searchAction($site = 'default', $resource)
130 130
 	{
131
-		if( config( 'shop.authorize', true ) ) {
132
-			$this->authorize( 'admin' );
131
+		if (config('shop.authorize', true)) {
132
+			$this->authorize('admin');
133 133
 		}
134 134
 
135
-		$cntl = $this->createClient( $site, $resource );
136
-		return $this->getHtml( $site, $cntl->search() );
135
+		$cntl = $this->createClient($site, $resource);
136
+		return $this->getHtml($site, $cntl->search());
137 137
 	}
138 138
 
139 139
 
@@ -143,20 +143,20 @@  discard block
 block discarded – undo
143 143
 	 * @param string $sitecode Unique site code
144 144
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
145 145
 	 */
146
-	protected function createClient( $sitecode, $resource )
146
+	protected function createClient($sitecode, $resource)
147 147
 	{
148
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
148
+		$lang = Input::get('lang', config('app.locale', 'en'));
149 149
 
150
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
151
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
150
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
151
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
152 152
 
153
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
154
-		$context = $this->setLocale( $context, $sitecode, $lang );
153
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
154
+		$context = $this->setLocale($context, $sitecode, $lang);
155 155
 
156
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang );
157
-		$context->setView( $view );
156
+		$view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang);
157
+		$context->setView($view);
158 158
 
159
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
159
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
160 160
 	}
161 161
 
162 162
 
@@ -166,11 +166,11 @@  discard block
 block discarded – undo
166 166
 	 * @param string $site
167 167
 	 * @param string $content
168 168
 	 */
169
-	protected function getHtml( $site, $content )
169
+	protected function getHtml($site, $content)
170 170
 	{
171
-		$content = str_replace( ['{type}', '{version}'], ['Laravel', $this->getVersion()], $content );
172
-		$params = array( 'site' => $site, 'content' => $content );
171
+		$content = str_replace(['{type}', '{version}'], ['Laravel', $this->getVersion()], $content);
172
+		$params = array('site' => $site, 'content' => $content);
173 173
 
174
-		return View::make('shop::admin.jqadm', $params );
174
+		return View::make('shop::admin.jqadm', $params);
175 175
 	}
176 176
 }
Please login to merge, or discard this patch.
Doc Comments   +7 added lines, -13 removed lines patch added patch discarded remove patch
@@ -30,9 +30,8 @@  discard block
 block discarded – undo
30 30
 	 * Returns the HTML code for a copy of a resource object
31 31
 	 *
32 32
 	 * @param string Resource location, e.g. "product"
33
-	 * @param string $sitecode Unique site code
34 33
 	 * @param integer $id Unique resource ID
35
-	 * @return string Generated output
34
+	 * @return \Illuminate\Contracts\View\View Generated output
36 35
 	 */
37 36
 	public function copyAction( $site = 'default', $resource, $id )
38 37
 	{
@@ -49,8 +48,7 @@  discard block
 block discarded – undo
49 48
 	 * Returns the HTML code for a new resource object
50 49
 	 *
51 50
 	 * @param string Resource location, e.g. "product"
52
-	 * @param string $sitecode Unique site code
53
-	 * @return string Generated output
51
+	 * @return \Illuminate\Contracts\View\View Generated output
54 52
 	 */
55 53
 	public function createAction( $site = 'default', $resource )
56 54
 	{
@@ -67,9 +65,8 @@  discard block
 block discarded – undo
67 65
 	 * Deletes the resource object or a list of resource objects
68 66
 	 *
69 67
 	 * @param string Resource location, e.g. "product"
70
-	 * @param string $sitecode Unique site code
71 68
 	 * @param integer $id Unique resource ID
72
-	 * @return string Generated output
69
+	 * @return \Illuminate\Contracts\View\View Generated output
73 70
 	 */
74 71
 	public function deleteAction( $site = 'default', $resource, $id )
75 72
 	{
@@ -86,9 +83,8 @@  discard block
 block discarded – undo
86 83
 	 * Returns the HTML code for the requested resource object
87 84
 	 *
88 85
 	 * @param string Resource location, e.g. "product"
89
-	 * @param string $sitecode Unique site code
90 86
 	 * @param integer $id Unique resource ID
91
-	 * @return string Generated output
87
+	 * @return \Illuminate\Contracts\View\View Generated output
92 88
 	 */
93 89
 	public function getAction( $site = 'default', $resource, $id )
94 90
 	{
@@ -105,8 +101,7 @@  discard block
 block discarded – undo
105 101
 	 * Saves a new resource object
106 102
 	 *
107 103
 	 * @param string Resource location, e.g. "product"
108
-	 * @param string $sitecode Unique site code
109
-	 * @return string Generated output
104
+	 * @return \Illuminate\Contracts\View\View Generated output
110 105
 	 */
111 106
 	public function saveAction( $site = 'default', $resource )
112 107
 	{
@@ -123,8 +118,7 @@  discard block
 block discarded – undo
123 118
 	 * Returns the HTML code for a list of resource objects
124 119
 	 *
125 120
 	 * @param string Resource location, e.g. "product"
126
-	 * @param string $sitecode Unique site code
127
-	 * @return string Generated output
121
+	 * @return \Illuminate\Contracts\View\View Generated output
128 122
 	 */
129 123
 	public function searchAction( $site = 'default', $resource )
130 124
 	{
@@ -141,7 +135,7 @@  discard block
 block discarded – undo
141 135
 	 * Returns the resource controller
142 136
 	 *
143 137
 	 * @param string $sitecode Unique site code
144
-	 * @return \Aimeos\MShop\Context\Item\Iface Context item
138
+	 * @return \Aimeos\Admin\JQAdm\Iface Context item
145 139
 	 */
146 140
 	protected function createClient( $sitecode, $resource )
147 141
 	{
Please login to merge, or discard this patch.
src/routes.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-Route::match( array( 'GET' ), 'admin', array(
3
+Route::match(array('GET'), 'admin', array(
4 4
 	'as' => 'aimeos_shop_admin',
5 5
 	'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
6 6
 ));
@@ -8,97 +8,97 @@  discard block
 block discarded – undo
8 8
 
9 9
 Route::group(config('shop.routes.admin', ['middleware' => 'auth', 'prefix' => '{site}']), function() {
10 10
 
11
-	Route::match( array( 'GET' ), 'extadm', array(
11
+	Route::match(array('GET'), 'extadm', array(
12 12
 		'as' => 'aimeos_shop_extadm',
13 13
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction'
14 14
 	));
15 15
 
16
-	Route::match( array( 'GET' ), 'extadm/file', array(
16
+	Route::match(array('GET'), 'extadm/file', array(
17 17
 		'as' => 'aimeos_shop_extadm_file',
18 18
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction'
19 19
 	));
20 20
 
21
-	Route::match( array( 'POST' ), 'extadm/do', array(
21
+	Route::match(array('POST'), 'extadm/do', array(
22 22
 		'as' => 'aimeos_shop_extadm_json',
23 23
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction'
24 24
 	));
25 25
 
26 26
 
27
-	Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array(
27
+	Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array(
28 28
 		'as' => 'aimeos_shop_jqadm_copy',
29 29
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
30
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
30
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
31 31
 
32
-	Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array(
32
+	Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array(
33 33
 		'as' => 'aimeos_shop_jqadm_create',
34 34
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
35
-	))->where( array( 'resource' => '[^0-9]+' ) );
35
+	))->where(array('resource' => '[^0-9]+'));
36 36
 
37
-	Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array(
37
+	Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array(
38 38
 		'as' => 'aimeos_shop_jqadm_delete',
39 39
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
40
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
40
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
41 41
 
42
-	Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array(
42
+	Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array(
43 43
 		'as' => 'aimeos_shop_jqadm_get',
44 44
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
45
-	))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]*' ) );
45
+	))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]*'));
46 46
 
47
-	Route::match( array( 'POST' ), 'jqadm/save/{resource}/{id?}', array(
47
+	Route::match(array('POST'), 'jqadm/save/{resource}/{id?}', array(
48 48
 		'as' => 'aimeos_shop_jqadm_save',
49 49
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
50
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
50
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
51 51
 
52
-	Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array(
52
+	Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array(
53 53
 		'as' => 'aimeos_shop_jqadm_search',
54 54
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
55
-	))->where( array( 'resource' => '[^0-9]+' ) );
55
+	))->where(array('resource' => '[^0-9]+'));
56 56
 
57 57
 
58
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
58
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
59 59
 		'as' => 'aimeos_shop_jsonadm_delete',
60 60
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
61
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
61
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
62 62
 
63
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
63
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
64 64
 		'as' => 'aimeos_shop_jsonadm_get',
65 65
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
66
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
66
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
67 67
 
68
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
68
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
69 69
 		'as' => 'aimeos_shop_jsonadm_patch',
70 70
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
71
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
71
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
72 72
 
73
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
73
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
74 74
 		'as' => 'aimeos_shop_jsonadm_post',
75 75
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
76
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
76
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
77 77
 
78
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
78
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
79 79
 		'as' => 'aimeos_shop_jsonadm_put',
80 80
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
81
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
81
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
82 82
 
83
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
83
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
84 84
 		'as' => 'aimeos_shop_jsonadm_options',
85 85
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
86
-	))->where( array( 'resource' => '[^0-9]*' ) );
86
+	))->where(array('resource' => '[^0-9]*'));
87 87
 
88 88
 });
89 89
 
90 90
 
91 91
 Route::group(config('shop.routes.account', ['middleware' => 'auth']), function() {
92 92
 
93
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
93
+	Route::match(array('GET', 'POST'), 'myaccount', array(
94 94
 		'as' => 'aimeos_shop_account',
95 95
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
96 96
 	));
97
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
97
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
98 98
 		'as' => 'aimeos_shop_account_favorite',
99 99
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
100 100
 	));
101
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
101
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
102 102
 		'as' => 'aimeos_shop_account_watch',
103 103
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
104 104
 	));
@@ -108,45 +108,45 @@  discard block
 block discarded – undo
108 108
 
109 109
 Route::group(config('shop.routes.default', []), function() {
110 110
 
111
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
111
+	Route::match(array('GET', 'POST'), 'basket', array(
112 112
 		'as' => 'aimeos_shop_basket',
113 113
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
114 114
 	));
115 115
 
116
-	Route::match( array( 'GET', 'POST' ), 'count', array(
116
+	Route::match(array('GET', 'POST'), 'count', array(
117 117
 		'as' => 'aimeos_shop_count',
118 118
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
119 119
 	));
120
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
120
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
121 121
 		'as' => 'aimeos_shop_detail',
122 122
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
123 123
 	));
124
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
124
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
125 125
 		'as' => 'aimeos_shop_session_pinned',
126 126
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
127 127
 	));
128
-	Route::match( array( 'GET', 'POST' ), 'list', array(
128
+	Route::match(array('GET', 'POST'), 'list', array(
129 129
 		'as' => 'aimeos_shop_list',
130 130
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
131 131
 	));
132
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
132
+	Route::match(array('GET', 'POST'), 'suggest', array(
133 133
 		'as' => 'aimeos_shop_suggest',
134 134
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
135 135
 	));
136
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
136
+	Route::match(array('GET', 'POST'), 'stock', array(
137 137
 		'as' => 'aimeos_shop_stock',
138 138
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
139 139
 	));
140 140
 
141
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
141
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
142 142
 		'as' => 'aimeos_shop_checkout',
143 143
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
144 144
 	));
145
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
145
+	Route::match(array('GET', 'POST'), 'confirm', array(
146 146
 		'as' => 'aimeos_shop_confirm',
147 147
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
148 148
 	));
149
-	Route::match( array( 'GET', 'POST' ), 'update', array(
149
+	Route::match(array('GET', 'POST'), 'update', array(
150 150
 		'as' => 'aimeos_shop_update',
151 151
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
152 152
 	));
Please login to merge, or discard this patch.