Completed
Push — master ( ea64de...642649 )
by Aimeos
02:31
created
src/Aimeos/Shop/Controller/CheckoutController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function confirmAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm');
33 33
 		return View::make('shop::checkout.confirm', $params);
34 34
 	}
35 35
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function indexAction()
43 43
 	{
44
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' );
44
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index');
45 45
 		return View::make('shop::checkout.index', $params);
46 46
 	}
47 47
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function updateAction()
55 55
 	{
56
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' );
56
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update');
57 57
 		return View::make('shop::checkout.update', $params);
58 58
 	}
59 59
 }
60 60
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Page.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
54 54
 	 * @param \Aimeos\Shop\Base\View $view View object
55 55
 	 */
56
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
56
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
57 57
 		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context,
58
-		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view )
58
+		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view)
59 59
 	{
60 60
 		$this->config = $config;
61 61
 		$this->aimeos = $aimeos;
@@ -71,21 +71,21 @@  discard block
 block discarded – undo
71 71
 	 * @param string $pageName Name of the configured page
72 72
 	 * @return array Associative list with body and header output separated by client name
73 73
 	 */
74
-	public function getSections( $pageName )
74
+	public function getSections($pageName)
75 75
 	{
76 76
 		$context = $this->context->get();
77 77
 		$langid = $context->getLocale()->getLanguageId();
78
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
79
-		$view = $this->view->create( $context, $tmplPaths, $langid );
80
-		$context->setView( $view );
78
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
79
+		$view = $this->view->create($context, $tmplPaths, $langid);
80
+		$context->setView($view);
81 81
 
82
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
83
-		$page = $context->getConfig()->get( 'page/' . $pageName, array() );
82
+		$result = array('aibody' => array(), 'aiheader' => array());
83
+		$page = $context->getConfig()->get('page/'.$pageName, array());
84 84
 
85
-		foreach( (array) $page as $clientName )
85
+		foreach ((array) $page as $clientName)
86 86
 		{
87
-			$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
88
-			$client->setView( clone $view );
87
+			$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
88
+			$client->setView(clone $view);
89 89
 			$client->process();
90 90
 
91 91
 			$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Config.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
41 41
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
42 42
 	 */
43
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
43
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
44 44
 	{
45 45
 		$this->aimeos = $aimeos;
46 46
 		$this->config = $config;
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
53 53
 	 * @param integer $type Configuration type ("frontend" or "backend")
54 54
 	 * @return \Aimeos\MW\Config\Iface Configuration object
55 55
 	 */
56
-	public function get( $type = 'frontend' )
56
+	public function get($type = 'frontend')
57 57
 	{
58
-		if( !isset( $this->objects[$type] ) )
58
+		if (!isset($this->objects[$type]))
59 59
 		{
60 60
 			$configPaths = $this->aimeos->get()->getConfigPaths();
61
-			$cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php';
61
+			$cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php';
62 62
 
63
-			$config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths );
63
+			$config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths);
64 64
 
65
-			if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
66
-				$config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
65
+			if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) {
66
+				$config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:'));
67 67
 			}
68 68
 
69
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) );
69
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop'));
70 70
 
71
-			if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) {
72
-				$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf );
71
+			if (($conf = $this->config->get('shop.'.$type, array())) !== array()) {
72
+				$config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf);
73 73
 			}
74 74
 
75 75
 			$this->objects[$type] = $config;
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Aimeos.php 1 patch
Spacing   +11 added lines, -11 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,16 +47,16 @@  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
-			$dir = base_path( 'ext' );
52
+			$dir = base_path('ext');
53 53
 
54
-			if( !is_dir( $dir ) ) {
55
-				$dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext';
54
+			if (!is_dir($dir)) {
55
+				$dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext';
56 56
 			}
57 57
 
58
-			$extDirs = (array) $this->config->get( 'shop.extdir', $dir );
59
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
58
+			$extDirs = (array) $this->config->get('shop.extdir', $dir);
59
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
60 60
 		}
61 61
 
62 62
 		return $this->object;
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public function getVersion()
72 72
 	{
73
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
74
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
73
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
74
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
75 75
 		) {
76
-			foreach( (array) $content['packages'] as $item )
76
+			foreach ((array) $content['packages'] as $item)
77 77
 			{
78
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
78
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
79 79
 					return $item['version'];
80 80
 				}
81 81
 			}
Please login to merge, or discard this patch.
src/default.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
 	'uploaddir' => '/',
9 9
 
10 10
 	'page' => array(
11
-		'account-index' => array( 'account/profile','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/profile', '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.
src/routes.php 1 patch
Spacing   +55 added lines, -55 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,144 +12,144 @@  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.jsonapi', ['middleware' => ['web']]), function() {
101 101
 
102
-	Route::match( array( 'DELETE' ), 'jsonapi/{resource}/{id?}', array(
102
+	Route::match(array('DELETE'), 'jsonapi/{resource}/{id?}', array(
103 103
 		'as' => 'aimeos_shop_jsonapi_delete',
104 104
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
105
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
105
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
106 106
 
107
-	Route::match( array( 'GET' ), 'jsonapi/{resource}/{id?}', array(
107
+	Route::match(array('GET'), 'jsonapi/{resource}/{id?}', array(
108 108
 		'as' => 'aimeos_shop_jsonapi_get',
109 109
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
110
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
110
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
111 111
 
112
-	Route::match( array( 'PATCH' ), 'jsonapi/{resource}/{id?}', array(
112
+	Route::match(array('PATCH'), 'jsonapi/{resource}/{id?}', array(
113 113
 		'as' => 'aimeos_shop_jsonapi_patch',
114 114
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
115
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
115
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
116 116
 
117
-	Route::match( array( 'POST' ), 'jsonapi/{resource}/{id?}', array(
117
+	Route::match(array('POST'), 'jsonapi/{resource}/{id?}', array(
118 118
 		'as' => 'aimeos_shop_jsonapi_post',
119 119
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
120
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
120
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
121 121
 
122
-	Route::match( array( 'PUT' ), 'jsonapi/{resource}/{id?}', array(
122
+	Route::match(array('PUT'), 'jsonapi/{resource}/{id?}', array(
123 123
 		'as' => 'aimeos_shop_jsonapi_put',
124 124
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
125
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
125
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
126 126
 
127
-	Route::match( array( 'OPTIONS' ), 'jsonapi/{resource?}', array(
127
+	Route::match(array('OPTIONS'), 'jsonapi/{resource?}', array(
128 128
 		'as' => 'aimeos_shop_jsonapi_options',
129 129
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
130
-	))->where( array( 'resource' => '[^0-9]*' ) );
130
+	))->where(array('resource' => '[^0-9]*'));
131 131
 
132 132
 });
133 133
 
134 134
 
135 135
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
136 136
 
137
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
137
+	Route::match(array('GET', 'POST'), 'myaccount', array(
138 138
 		'as' => 'aimeos_shop_account',
139 139
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
140 140
 	));
141 141
 
142
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
142
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
143 143
 		'as' => 'aimeos_shop_account_favorite',
144 144
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
145 145
 	));
146 146
 
147
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
147
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
148 148
 		'as' => 'aimeos_shop_account_watch',
149 149
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
150 150
 	));
151 151
 
152
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
152
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
153 153
 		'as' => 'aimeos_shop_account_download',
154 154
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
155 155
 	));
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 
160 160
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
161 161
 
162
-	Route::match( array( 'GET', 'POST' ), 'count', array(
162
+	Route::match(array('GET', 'POST'), 'count', array(
163 163
 		'as' => 'aimeos_shop_count',
164 164
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
165 165
 	));
166 166
 
167
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
167
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
168 168
 		'as' => 'aimeos_shop_detail',
169 169
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
170 170
 	));
171 171
 
172
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
172
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
173 173
 		'as' => 'aimeos_shop_session_pinned',
174 174
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
175 175
 	));
176 176
 
177
-	Route::match( array( 'GET', 'POST' ), 'list', array(
177
+	Route::match(array('GET', 'POST'), 'list', array(
178 178
 		'as' => 'aimeos_shop_list',
179 179
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
180 180
 	));
181 181
 
182
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
182
+	Route::match(array('GET', 'POST'), 'suggest', array(
183 183
 		'as' => 'aimeos_shop_suggest',
184 184
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
185 185
 	));
186 186
 
187
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
187
+	Route::match(array('GET', 'POST'), 'stock', array(
188 188
 		'as' => 'aimeos_shop_stock',
189 189
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
190 190
 	));
191 191
 
192
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
192
+	Route::match(array('GET', 'POST'), 'basket', array(
193 193
 		'as' => 'aimeos_shop_basket',
194 194
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
195 195
 	));
196 196
 
197
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
197
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
198 198
 		'as' => 'aimeos_shop_checkout',
199 199
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
200 200
 	));
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 
205 205
 Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() {
206 206
 
207
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
207
+	Route::match(array('GET', 'POST'), 'confirm', array(
208 208
 		'as' => 'aimeos_shop_confirm',
209 209
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
210 210
 	));
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 
215 215
 Route::group(config('shop.routes.update', []), function() {
216 216
 
217
-	Route::match( array( 'GET', 'POST' ), 'update', array(
217
+	Route::match(array('GET', 'POST'), 'update', array(
218 218
 		'as' => 'aimeos_shop_update',
219 219
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
220 220
 	));
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JsonadmController.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
36 36
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
37 37
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
38 38
 	 */
39
-	public function deleteAction( ServerRequestInterface $request )
39
+	public function deleteAction(ServerRequestInterface $request)
40 40
 	{
41
-		if( config( 'shop.authorize', true ) ) {
42
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
41
+		if (config('shop.authorize', true)) {
42
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
43 43
 		}
44 44
 
45
-		return $this->createClient()->delete( $request, new Response() );
45
+		return $this->createClient()->delete($request, new Response());
46 46
 	}
47 47
 
48 48
 
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
53 53
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
54 54
 	 */
55
-	public function getAction( ServerRequestInterface $request )
55
+	public function getAction(ServerRequestInterface $request)
56 56
 	{
57
-		if( config( 'shop.authorize', true ) ) {
58
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
57
+		if (config('shop.authorize', true)) {
58
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
59 59
 		}
60 60
 
61
-		return $this->createClient()->get( $request, new Response() );
61
+		return $this->createClient()->get($request, new Response());
62 62
 	}
63 63
 
64 64
 
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
69 69
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
70 70
 	 */
71
-	public function patchAction( ServerRequestInterface $request )
71
+	public function patchAction(ServerRequestInterface $request)
72 72
 	{
73
-		if( config( 'shop.authorize', true ) ) {
74
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
73
+		if (config('shop.authorize', true)) {
74
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
75 75
 		}
76 76
 
77
-		return $this->createClient()->patch( $request, new Response() );
77
+		return $this->createClient()->patch($request, new Response());
78 78
 	}
79 79
 
80 80
 
@@ -84,13 +84,13 @@  discard block
 block discarded – undo
84 84
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
85 85
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
86 86
 	 */
87
-	public function postAction( ServerRequestInterface $request )
87
+	public function postAction(ServerRequestInterface $request)
88 88
 	{
89
-		if( config( 'shop.authorize', true ) ) {
90
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
89
+		if (config('shop.authorize', true)) {
90
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
91 91
 		}
92 92
 
93
-		return $this->createClient()->post( $request, new Response() );
93
+		return $this->createClient()->post($request, new Response());
94 94
 	}
95 95
 
96 96
 
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
101 101
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
102 102
 	 */
103
-	public function putAction( ServerRequestInterface $request )
103
+	public function putAction(ServerRequestInterface $request)
104 104
 	{
105
-		if( config( 'shop.authorize', true ) ) {
106
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
105
+		if (config('shop.authorize', true)) {
106
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
107 107
 		}
108 108
 
109
-		return $this->createClient()->put( $request, new Response() );
109
+		return $this->createClient()->put($request, new Response());
110 110
 	}
111 111
 
112 112
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
117 117
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
118 118
 	 */
119
-	public function optionsAction( ServerRequestInterface $request )
119
+	public function optionsAction(ServerRequestInterface $request)
120 120
 	{
121
-		if( config( 'shop.authorize', true ) ) {
122
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
121
+		if (config('shop.authorize', true)) {
122
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
123 123
 		}
124 124
 
125
-		return $this->createClient()->options( $request, new Response() );
125
+		return $this->createClient()->options($request, new Response());
126 126
 	}
127 127
 
128 128
 
@@ -133,18 +133,18 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	protected function createClient()
135 135
 	{
136
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
137
-		$lang = Input::get( 'locale', config( 'app.locale', 'en' ) );
138
-		$resource = Route::input( 'resource' );
136
+		$site = Route::input('site', Input::get('site', 'default'));
137
+		$lang = Input::get('locale', config('app.locale', 'en'));
138
+		$resource = Route::input('resource');
139 139
 
140
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
141
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
140
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
141
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
142 142
 
143
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
144
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
145
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
146
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
143
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
144
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
145
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
146
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
147 147
 
148
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
148
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
149 149
 	}
150 150
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JsonapiController.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
34 34
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
35 35
 	 */
36
-	public function deleteAction( ServerRequestInterface $request )
36
+	public function deleteAction(ServerRequestInterface $request)
37 37
 	{
38
-		return $this->createClient()->delete( $request, new Response() );
38
+		return $this->createClient()->delete($request, new Response());
39 39
 	}
40 40
 
41 41
 
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
46 46
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
47 47
 	 */
48
-	public function getAction( ServerRequestInterface $request )
48
+	public function getAction(ServerRequestInterface $request)
49 49
 	{
50
-		return $this->createClient()->get( $request, new Response() );
50
+		return $this->createClient()->get($request, new Response());
51 51
 	}
52 52
 
53 53
 
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
58 58
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
59 59
 	 */
60
-	public function patchAction( ServerRequestInterface $request )
60
+	public function patchAction(ServerRequestInterface $request)
61 61
 	{
62
-		return $this->createClient()->patch( $request, new Response() );
62
+		return $this->createClient()->patch($request, new Response());
63 63
 	}
64 64
 
65 65
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
70 70
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
71 71
 	 */
72
-	public function postAction( ServerRequestInterface $request )
72
+	public function postAction(ServerRequestInterface $request)
73 73
 	{
74
-		return $this->createClient()->post( $request, new Response() );
74
+		return $this->createClient()->post($request, new Response());
75 75
 	}
76 76
 
77 77
 
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
82 82
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
83 83
 	 */
84
-	public function putAction( ServerRequestInterface $request )
84
+	public function putAction(ServerRequestInterface $request)
85 85
 	{
86
-		return $this->createClient()->put( $request, new Response() );
86
+		return $this->createClient()->put($request, new Response());
87 87
 	}
88 88
 
89 89
 
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
94 94
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
95 95
 	 */
96
-	public function optionsAction( ServerRequestInterface $request )
96
+	public function optionsAction(ServerRequestInterface $request)
97 97
 	{
98
-		return $this->createClient()->options( $request, new Response() );
98
+		return $this->createClient()->options($request, new Response());
99 99
 	}
100 100
 
101 101
 
@@ -106,16 +106,16 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	protected function createClient()
108 108
 	{
109
-		$resource = Route::input( 'resource' );
109
+		$resource = Route::input('resource');
110 110
 
111
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
112
-		$tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
111
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
112
+		$tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
113 113
 
114
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
114
+		$context = app('\Aimeos\Shop\Base\Context')->get();
115 115
 		$langid = $context->getLocale()->getLanguageId();
116 116
 
117
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) );
117
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid));
118 118
 
119
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource );
119
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource);
120 120
 	}
121 121
 }
Please login to merge, or discard this patch.