Completed
Push — master ( 008aa0...babc0b )
by Aimeos
02:37
created
src/Aimeos/Shop/Base/Support.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 * @param \Aimeos\Shop\Base\Context $context Context provider
40 40
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale provider
41 41
 	 */
42
-	public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale )
42
+	public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale)
43 43
 	{
44 44
 		$this->context = $context;
45 45
 		$this->locale = $locale;
@@ -53,45 +53,45 @@  discard block
 block discarded – undo
53 53
 	 * @param string|array $groupcodes Unique user/customer group codes that are allowed
54 54
 	 * @return boolean True if user is part of the group, false if not
55 55
 	 */
56
-	public function checkGroup( $userid, $groupcodes )
56
+	public function checkGroup($userid, $groupcodes)
57 57
 	{
58
-		$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
58
+		$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
59 59
 
60
-		$context = $this->context->get( false );
61
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
60
+		$context = $this->context->get(false);
61
+		$context->setLocale($this->locale->getBackend($context, $site));
62 62
 
63 63
 
64
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
64
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
65 65
 
66 66
 		$search = $manager->createSearch();
67
-		$search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );
68
-		$groupItems = $manager->searchItems( $search );
67
+		$search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes));
68
+		$groupItems = $manager->searchItems($search);
69 69
 
70 70
 
71
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
71
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
72 72
 
73 73
 		$search = $manager->createSearch();
74 74
 		$expr = array(
75
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
76
-			$search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
77
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
75
+			$search->compare('==', 'customer.lists.parentid', $userid),
76
+			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)),
77
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
78 78
 		);
79
-		$search->setConditions( $search->combine( '&&', $expr ) );
80
-		$search->setSlice( 0, 1 );
79
+		$search->setConditions($search->combine('&&', $expr));
80
+		$search->setSlice(0, 1);
81 81
 
82
-		return (bool) count( $manager->searchItems( $search ) );
82
+		return (bool) count($manager->searchItems($search));
83 83
 	}
84 84
 
85 85
 
86
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
86
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
87 87
 	{
88 88
 		$list = array();
89
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
89
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
90 90
 
91 91
 		$search = $manager->createSearch();
92
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
92
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
93 93
 
94
-		foreach( $manager->searchItems( $search ) as $item ) {
94
+		foreach ($manager->searchItems($search) as $item) {
95 95
 			$list[] = $item->getCode();
96 96
 		}
97 97
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/JobsCommand.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -43,24 +43,24 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function fire()
45 45
 	{
46
-		$aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get();
46
+		$aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get();
47 47
 		$context = $this->getContext();
48 48
 
49
-		$jobs = explode( ' ', $this->argument( 'jobs' ) );
50
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
49
+		$jobs = explode(' ', $this->argument('jobs'));
50
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
51 51
 
52
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
52
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
53 53
 		{
54
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
55
-			$localeItem->setLanguageId( null );
56
-			$localeItem->setCurrencyId( null );
54
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
55
+			$localeItem->setLanguageId(null);
56
+			$localeItem->setCurrencyId(null);
57 57
 
58
-			$context->setLocale( $localeItem );
58
+			$context->setLocale($localeItem);
59 59
 
60
-			$this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
60
+			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
61 61
 
62
-			foreach( $jobs as $jobname ) {
63
-				\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
62
+			foreach ($jobs as $jobname) {
63
+				\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
64 64
 			}
65 65
 		}
66 66
 	}
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 	protected function getArguments()
75 75
 	{
76 76
 		return array(
77
-			array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ),
78
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ),
77
+			array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'),
78
+			array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'),
79 79
 		);
80 80
 	}
81 81
 
@@ -98,19 +98,19 @@  discard block
 block discarded – undo
98 98
 	protected function getContext()
99 99
 	{
100 100
 		$lv = $this->getLaravel();
101
-		$aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
102
-		$context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
101
+		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
102
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
103 103
 
104
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
105
-		$view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
104
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
105
+		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths);
106 106
 
107
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
108
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
109
-		$i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );
107
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
108
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
109
+		$i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids);
110 110
 
111
-		$context->setEditor( 'aimeos:jobs' );
112
-		$context->setView( $view );
113
-		$context->setI18n( $i18n );
111
+		$context->setEditor('aimeos:jobs');
112
+		$context->setView($view);
113
+		$context->setI18n($i18n);
114 114
 
115 115
 		return $context;
116 116
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -43,39 +43,39 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function fire()
45 45
 	{
46
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
47
-		$ctx->setEditor( 'aimeos:setup' );
46
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
47
+		$ctx->setEditor('aimeos:setup');
48 48
 
49 49
 		$config = $ctx->getConfig();
50
-		$site = $this->argument( 'site' );
51
-		$template = $this->argument( 'tplsite' );
50
+		$site = $this->argument('site');
51
+		$template = $this->argument('tplsite');
52 52
 
53
-		$config->set( 'setup/site', $site );
54
-		$dbconfig = $this->getDbConfig( $config );
55
-		$this->setOptions( $config );
53
+		$config->set('setup/site', $site);
54
+		$dbconfig = $this->getDbConfig($config);
55
+		$this->setOptions($config);
56 56
 
57
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
58
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
57
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
58
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
59 59
 
60
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
60
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
61 61
 
62
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
63
-			$task = reset( $task );
62
+		if (($task = $this->option('task')) && is_array($task)) {
63
+			$task = reset($task);
64 64
 		}
65 65
 
66
-		switch( $this->option( 'action' ) )
66
+		switch ($this->option('action'))
67 67
 		{
68 68
 			case 'migrate':
69
-				$manager->migrate( $task );
69
+				$manager->migrate($task);
70 70
 				break;
71 71
 			case 'rollback':
72
-				$manager->rollback( $task );
72
+				$manager->rollback($task);
73 73
 				break;
74 74
 			case 'clean':
75
-				$manager->clean( $task );
75
+				$manager->clean($task);
76 76
 				break;
77 77
 			default:
78
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
78
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
79 79
 		}
80 80
 	}
81 81
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 	protected function getArguments()
89 89
 	{
90 90
 		return array(
91
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
92
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
91
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
92
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
93 93
 		);
94 94
 	}
95 95
 
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 	protected function getOptions()
103 103
 	{
104 104
 		return array(
105
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
106
-			array( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ),
107
-			array( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ),
105
+			array('option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
106
+			array('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'),
107
+			array('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null),
108 108
 		);
109 109
 	}
110 110
 
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
116 116
 	 * @return array Multi-dimensional associative list of database configuration parameters
117 117
 	 */
118
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
118
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
119 119
 	{
120
-		$dbconfig = $conf->get( 'resource', array() );
120
+		$dbconfig = $conf->get('resource', array());
121 121
 
122
-		foreach( $dbconfig as $rname => $dbconf )
122
+		foreach ($dbconfig as $rname => $dbconf)
123 123
 		{
124
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
125
-				unset( $dbconfig[$rname] );
124
+			if (strncmp($rname, 'db', 2) !== 0) {
125
+				unset($dbconfig[$rname]);
126 126
 			}
127 127
 		}
128 128
 
@@ -137,12 +137,12 @@  discard block
 block discarded – undo
137 137
 	 * @param array Associative list of database configurations
138 138
 	 * @throws \RuntimeException If the format of the options is invalid
139 139
 	 */
140
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
140
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
141 141
 	{
142
-		foreach( (array) $this->option( 'option' ) as $option )
142
+		foreach ((array) $this->option('option') as $option)
143 143
 		{
144
-			list( $name, $value ) = explode( ':', $option );
145
-			$conf->set( str_replace( '\\', '/', $name ), $value );
144
+			list($name, $value) = explode(':', $option);
145
+			$conf->set(str_replace('\\', '/', $name), $value);
146 146
 		}
147 147
 	}
148 148
 }
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?}/{d_pos?}', array(
107
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_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?}/{d_pos?}', array(
112
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_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?}/{d_pos?}', array(
132
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_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?}/{d_pos?}', array(
137
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_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/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', [['admin', 'api']] );
41
+		if (config('shop.authorize', true)) {
42
+			$this->authorize('admin', [['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', [['admin', 'api', 'editor']] );
57
+		if (config('shop.authorize', true)) {
58
+			$this->authorize('admin', [['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', [['admin', 'api']] );
73
+		if (config('shop.authorize', true)) {
74
+			$this->authorize('admin', [['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', [['admin', 'api']] );
89
+		if (config('shop.authorize', true)) {
90
+			$this->authorize('admin', [['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', [['admin', 'api']] );
105
+		if (config('shop.authorize', true)) {
106
+			$this->authorize('admin', [['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', [['admin', 'api', 'editor']] );
121
+		if (config('shop.authorize', true)) {
122
+			$this->authorize('admin', [['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( 'lang', config( 'app.locale', 'en' ) );
138
-		$resource = Route::input( 'resource' );
136
+		$site = Route::input('site', Input::get('site', 'default'));
137
+		$lang = Input::get('lang', 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/Command/CacheCommand.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -42,24 +42,24 @@  discard block
 block discarded – undo
42 42
 	 */
43 43
 	public function fire()
44 44
 	{
45
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
46
-		$context->setEditor( 'aimeos:cache' );
45
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
46
+		$context->setEditor('aimeos:cache');
47 47
 
48
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
48
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
49 49
 
50
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
50
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
51 51
 		{
52
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
52
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
53 53
 
54 54
 			$lcontext = clone $context;
55
-			$lcontext->setLocale( $localeItem );
55
+			$lcontext->setLocale($localeItem);
56 56
 
57
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
58
-			$lcontext->setCache( $cache );
57
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
58
+			$lcontext->setCache($cache);
59 59
 
60
-			$this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
60
+			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
61 61
 
62
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear();
62
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear();
63 63
 		}
64 64
 	}
65 65
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	protected function getArguments()
73 73
 	{
74 74
 		return array(
75
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ),
75
+			array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'),
76 76
 		);
77 77
 	}
78 78
 
Please login to merge, or discard this patch.