Completed
Push — master ( 8d14cd...aab142 )
by Aimeos
01:56
created
src/Aimeos/Shop/ShopServiceProvider.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,13 +37,13 @@  discard block
 block discarded – undo
37 37
 	public function boot()
38 38
 	{
39 39
 		$ds = DIRECTORY_SEPARATOR;
40
-		$basedir = dirname( dirname( __DIR__ ) ) . $ds;
40
+		$basedir = dirname(dirname(__DIR__)).$ds;
41 41
 
42
-		$this->loadRoutesFrom( $basedir . 'routes.php' );
43
-		$this->loadViewsFrom( $basedir . 'views', 'shop' );
42
+		$this->loadRoutesFrom($basedir.'routes.php');
43
+		$this->loadViewsFrom($basedir.'views', 'shop');
44 44
 
45
-		$this->publishes( [ $basedir . 'config/shop.php' => config_path( 'shop.php' ) ], 'config' );
46
-		$this->publishes( [ dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' ) ], 'public' );
45
+		$this->publishes([$basedir.'config/shop.php' => config_path('shop.php')], 'config');
46
+		$this->publishes([dirname($basedir).$ds.'public' => public_path('packages/aimeos/shop')], 'public');
47 47
 	}
48 48
 
49 49
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	public function register()
56 56
 	{
57
-		$this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop');
57
+		$this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'default.php', 'shop');
58 58
 
59 59
 		$this->app->singleton('aimeos', function($app) {
60 60
 			return new \Aimeos\Shop\Base\Aimeos($app['config']);
@@ -89,12 +89,12 @@  discard block
 block discarded – undo
89 89
 		});
90 90
 
91 91
 
92
-		$this->commands( array(
92
+		$this->commands(array(
93 93
 			'Aimeos\Shop\Command\AccountCommand',
94 94
 			'Aimeos\Shop\Command\CacheCommand',
95 95
 			'Aimeos\Shop\Command\SetupCommand',
96 96
 			'Aimeos\Shop\Command\JobsCommand',
97
-		) );
97
+		));
98 98
 	}
99 99
 
100 100
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -49,39 +49,39 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function handle()
51 51
 	{
52
-		$ctx = $this->getLaravel()->make( 'aimeos.context' )->get( false, 'command' );
53
-		$ctx->setEditor( 'aimeos:setup' );
52
+		$ctx = $this->getLaravel()->make('aimeos.context')->get(false, 'command');
53
+		$ctx->setEditor('aimeos:setup');
54 54
 
55 55
 		$config = $ctx->getConfig();
56
-		$site = $this->argument( 'site' );
57
-		$template = $this->argument( 'tplsite' );
56
+		$site = $this->argument('site');
57
+		$template = $this->argument('tplsite');
58 58
 
59
-		$config->set( 'setup/site', $site );
60
-		$dbconfig = $this->getDbConfig( $config );
61
-		$this->setOptions( $config );
59
+		$config->set('setup/site', $site);
60
+		$dbconfig = $this->getDbConfig($config);
61
+		$this->setOptions($config);
62 62
 
63
-		$taskPaths = $this->getLaravel()->make( 'aimeos' )->get()->getSetupPaths( $template );
64
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
63
+		$taskPaths = $this->getLaravel()->make('aimeos')->get()->getSetupPaths($template);
64
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
65 65
 
66
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
66
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
67 67
 
68
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
69
-			$task = reset( $task );
68
+		if (($task = $this->option('task')) && is_array($task)) {
69
+			$task = reset($task);
70 70
 		}
71 71
 
72
-		switch( $this->option( 'action' ) )
72
+		switch ($this->option('action'))
73 73
 		{
74 74
 			case 'migrate':
75
-				$manager->migrate( $task );
75
+				$manager->migrate($task);
76 76
 				break;
77 77
 			case 'rollback':
78
-				$manager->rollback( $task );
78
+				$manager->rollback($task);
79 79
 				break;
80 80
 			case 'clean':
81
-				$manager->clean( $task );
81
+				$manager->clean($task);
82 82
 				break;
83 83
 			default:
84
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
84
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
85 85
 		}
86 86
 	}
87 87
 
@@ -92,14 +92,14 @@  discard block
 block discarded – undo
92 92
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
93 93
 	 * @return array Multi-dimensional associative list of database configuration parameters
94 94
 	 */
95
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
95
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
96 96
 	{
97
-		$dbconfig = $conf->get( 'resource', array() );
97
+		$dbconfig = $conf->get('resource', array());
98 98
 
99
-		foreach( $dbconfig as $rname => $dbconf )
99
+		foreach ($dbconfig as $rname => $dbconf)
100 100
 		{
101
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
102
-				unset( $dbconfig[$rname] );
101
+			if (strncmp($rname, 'db', 2) !== 0) {
102
+				unset($dbconfig[$rname]);
103 103
 			}
104 104
 		}
105 105
 
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
114 114
 	 * @param array Associative list of database configurations
115 115
 	 * @throws \RuntimeException If the format of the options is invalid
116 116
 	 */
117
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
117
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
118 118
 	{
119
-		foreach( (array) $this->option( 'option' ) as $option )
119
+		foreach ((array) $this->option('option') as $option)
120 120
 		{
121
-			list( $name, $value ) = explode( ':', $option );
122
-			$conf->set( str_replace( '\\', '/', $name ), $value );
121
+			list($name, $value) = explode(':', $option);
122
+			$conf->set(str_replace('\\', '/', $name), $value);
123 123
 		}
124 124
 	}
125 125
 }
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
@@ -46,30 +46,30 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function handle()
48 48
 	{
49
-		$aimeos = $this->getLaravel()->make( 'aimeos' )->get();
49
+		$aimeos = $this->getLaravel()->make('aimeos')->get();
50 50
 		$context = $this->getContext();
51 51
 
52 52
 		$process = $context->getProcess();
53
-		$jobs = explode( ' ', $this->argument( 'jobs' ) );
54
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
53
+		$jobs = explode(' ', $this->argument('jobs'));
54
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
55 55
 
56
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
56
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
57 57
 		{
58
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
59
-			$localeItem->setLanguageId( null );
60
-			$localeItem->setCurrencyId( null );
58
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
59
+			$localeItem->setLanguageId(null);
60
+			$localeItem->setCurrencyId(null);
61 61
 
62
-			$context->setLocale( $localeItem );
62
+			$context->setLocale($localeItem);
63 63
 
64
-			$this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
64
+			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
65 65
 
66
-			foreach( $jobs as $jobname )
66
+			foreach ($jobs as $jobname)
67 67
 			{
68
-				$fcn = function( $context, $aimeos, $jobname ) {
69
-					\Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run();
68
+				$fcn = function($context, $aimeos, $jobname) {
69
+					\Aimeos\Controller\Jobs::create($context, $aimeos, $jobname)->run();
70 70
 				};
71 71
 
72
-				$process->start( $fcn, [$context, $aimeos, $jobname], true );
72
+				$process->start($fcn, [$context, $aimeos, $jobname], true);
73 73
 			}
74 74
 		}
75 75
 
@@ -85,19 +85,19 @@  discard block
 block discarded – undo
85 85
 	protected function getContext()
86 86
 	{
87 87
 		$lv = $this->getLaravel();
88
-		$aimeos = $lv->make( 'aimeos' )->get();
89
-		$context = $lv->make( 'aimeos.context' )->get( false, 'command' );
88
+		$aimeos = $lv->make('aimeos')->get();
89
+		$context = $lv->make('aimeos.context')->get(false, 'command');
90 90
 
91
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
92
-		$view = $lv->make( 'aimeos.view' )->create( $context, $tmplPaths );
91
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
92
+		$view = $lv->make('aimeos.view')->create($context, $tmplPaths);
93 93
 
94
-		$langManager = \Aimeos\MShop::create( $context, 'locale/language' );
95
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
96
-		$i18n = $lv->make( 'aimeos.i18n' )->get( $langids );
94
+		$langManager = \Aimeos\MShop::create($context, 'locale/language');
95
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
96
+		$i18n = $lv->make('aimeos.i18n')->get($langids);
97 97
 
98
-		$context->setEditor( 'aimeos:jobs' );
99
-		$context->setView( $view );
100
-		$context->setI18n( $i18n );
98
+		$context->setEditor('aimeos:jobs');
99
+		$context->setView($view);
100
+		$context->setI18n($i18n);
101 101
 
102 102
 		return $context;
103 103
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Shop.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -41,16 +41,16 @@  discard block
 block discarded – undo
41 41
 	 * @param \Aimeos\Shop\Base\Context $context Context object
42 42
 	 * @param \Aimeos\Shop\Base\View $view View object
43 43
 	 */
44
-	public function __construct(  \Aimeos\Shop\Base\Aimeos $aimeos,
45
-		\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view )
44
+	public function __construct(\Aimeos\Shop\Base\Aimeos $aimeos,
45
+		\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view)
46 46
 	{
47 47
 		$this->context = $context->get();
48 48
 
49 49
 		$langid = $this->context->getLocale()->getLanguageId();
50
-		$tmplPaths = $aimeos->get()->getCustomPaths( 'client/html/templates' );
50
+		$tmplPaths = $aimeos->get()->getCustomPaths('client/html/templates');
51 51
 
52
-		$this->view = $view->create( $this->context, $tmplPaths, $langid );
53
-		$this->context->setView( $this->view );
52
+		$this->view = $view->create($this->context, $tmplPaths, $langid);
53
+		$this->context->setView($this->view);
54 54
 	}
55 55
 
56 56
 
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
 	 * @param string $name Name of the shop component
61 61
 	 * @return \Aimeos\Client\Html\Iface HTML client
62 62
 	 */
63
-	public function get( $name )
63
+	public function get($name)
64 64
 	{
65
-		if( !isset( $this->objects[$name] ) )
65
+		if (!isset($this->objects[$name]))
66 66
 		{
67
-			$client = \Aimeos\Client\Html::create( $this->context, $name );
68
-			$client->setView( clone $this->view );
67
+			$client = \Aimeos\Client\Html::create($this->context, $name);
68
+			$client->setView(clone $this->view);
69 69
 			$client->process();
70 70
 
71 71
 			$this->objects[$name] = $client;
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function countAction()
32 32
 	{
33
-		foreach( app( 'config' )->get( 'shop.page.catalog-count', ['catalog/count'] ) as $name )
33
+		foreach (app('config')->get('shop.page.catalog-count', ['catalog/count']) as $name)
34 34
 		{
35
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
36
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
35
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
36
+			$params['aibody'][$name] = Shop::get($name)->getBody();
37 37
 		}
38 38
 
39 39
 		return Response::view('shop::catalog.count', $params)
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
48 48
 	 */
49 49
 	public function detailAction()
50 50
 	{
51
-		$default = ['basket/mini','catalog/stage','catalog/detail','catalog/session'];
51
+		$default = ['basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'];
52 52
 
53
-		foreach( app( 'config' )->get( 'shop.page.catalog-detail', $default ) as $name )
53
+		foreach (app('config')->get('shop.page.catalog-detail', $default) as $name)
54 54
 		{
55
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
56
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
55
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
56
+			$params['aibody'][$name] = Shop::get($name)->getBody();
57 57
 		}
58 58
 
59 59
 		return Response::view('shop::catalog.detail', $params);
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public function listAction()
69 69
 	{
70
-		$default = ['basket/mini','catalog/filter','catalog/lists'];
70
+		$default = ['basket/mini', 'catalog/filter', 'catalog/lists'];
71 71
 
72
-		foreach( app( 'config' )->get( 'shop.page.catalog-list', $default ) as $name )
72
+		foreach (app('config')->get('shop.page.catalog-list', $default) as $name)
73 73
 		{
74
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
75
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
74
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
75
+			$params['aibody'][$name] = Shop::get($name)->getBody();
76 76
 		}
77 77
 
78 78
 		return Response::view('shop::catalog.list', $params);
@@ -86,10 +86,10 @@  discard block
 block discarded – undo
86 86
 	 */
87 87
 	public function stockAction()
88 88
 	{
89
-		foreach( app( 'config' )->get( 'shop.page.catalog-stock', ['catalog/stock'] ) as $name )
89
+		foreach (app('config')->get('shop.page.catalog-stock', ['catalog/stock']) as $name)
90 90
 		{
91
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
92
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
91
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
92
+			$params['aibody'][$name] = Shop::get($name)->getBody();
93 93
 		}
94 94
 
95 95
 		return Response::view('shop::catalog.stock', $params)
@@ -104,10 +104,10 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	public function suggestAction()
106 106
 	{
107
-		foreach( app( 'config' )->get( 'shop.page.catalog-suggest', ['catalog/suggest'] ) as $name )
107
+		foreach (app('config')->get('shop.page.catalog-suggest', ['catalog/suggest']) as $name)
108 108
 		{
109
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
110
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
109
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
110
+			$params['aibody'][$name] = Shop::get($name)->getBody();
111 111
 		}
112 112
 
113 113
 		return Response::view('shop::catalog.suggest', $params)
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
 	 */
123 123
 	public function treeAction()
124 124
 	{
125
-		$default = ['basket/mini','catalog/filter','catalog/stage','catalog/lists'];
125
+		$default = ['basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'];
126 126
 
127
-		foreach( app( 'config' )->get( 'shop.page.catalog-tree', $default ) as $name )
127
+		foreach (app('config')->get('shop.page.catalog-tree', $default) as $name)
128 128
 		{
129
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
130
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
129
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
130
+			$params['aibody'][$name] = Shop::get($name)->getBody();
131 131
 		}
132 132
 
133 133
 		return Response::view('shop::catalog.tree', $params);
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -36,26 +36,26 @@
 block discarded – undo
36 36
 	 * @param \Illuminate\Http\Request $request Laravel request object
37 37
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
38 38
 	 */
39
-	public function indexAction( Request $request )
39
+	public function indexAction(Request $request)
40 40
 	{
41
-		if( Auth::check() === false
42
-			|| $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false
41
+		if (Auth::check() === false
42
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false
43 43
 		) {
44
-			return redirect()->guest( 'login' );
44
+			return redirect()->guest('login');
45 45
 		}
46 46
 
47 47
 		$siteId = $request->user()->siteid;
48
-		$context = app( 'aimeos.context' )->get( false );
49
-		$siteManager = \Aimeos\MShop::create( $context, 'locale/site' );
50
-		$siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' );
51
-		$locale = $request->user()->langid ?: config( 'app.locale', 'en' );
48
+		$context = app('aimeos.context')->get(false);
49
+		$siteManager = \Aimeos\MShop::create($context, 'locale/site');
50
+		$siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default');
51
+		$locale = $request->user()->langid ?: config('app.locale', 'en');
52 52
 
53 53
 		$param = array(
54 54
 			'resource' => 'dashboard',
55
-			'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ),
56
-			'lang' => Route::input( 'lang', Input::get( 'lang', $locale ) )
55
+			'site' => Route::input('site', Input::get('site', $siteCode)),
56
+			'lang' => Route::input('lang', Input::get('lang', $locale))
57 57
 		);
58 58
 
59
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
59
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
60 60
 	}
61 61
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CheckoutController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function confirmAction()
32 32
 	{
33
-		foreach( app( 'config' )->get( 'shop.page.checkout-confirm', ['checkout/confirm'] ) as $name )
33
+		foreach (app('config')->get('shop.page.checkout-confirm', ['checkout/confirm']) as $name)
34 34
 		{
35
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
36
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
35
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
36
+			$params['aibody'][$name] = Shop::get($name)->getBody();
37 37
 		}
38 38
 
39 39
 		return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store');
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function indexAction()
49 49
 	{
50
-		foreach( app( 'config' )->get( 'shop.page.checkout-index', ['checkout/standard'] ) as $name )
50
+		foreach (app('config')->get('shop.page.checkout-index', ['checkout/standard']) as $name)
51 51
 		{
52
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
53
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
52
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
53
+			$params['aibody'][$name] = Shop::get($name)->getBody();
54 54
 		}
55 55
 
56 56
 		return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store');
@@ -64,10 +64,10 @@  discard block
 block discarded – undo
64 64
 	 */
65 65
 	public function updateAction()
66 66
 	{
67
-		foreach( app( 'config' )->get( 'shop.page.checkout-update', ['checkout/update'] ) as $name )
67
+		foreach (app('config')->get('shop.page.checkout-update', ['checkout/update']) as $name)
68 68
 		{
69
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
70
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
69
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
70
+			$params['aibody'][$name] = Shop::get($name)->getBody();
71 71
 		}
72 72
 
73 73
 		return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store');
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->createAdmin()->delete( $request, new Response() );
45
+		return $this->createAdmin()->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->createAdmin()->get( $request, new Response() );
61
+		return $this->createAdmin()->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->createAdmin()->patch( $request, new Response() );
77
+		return $this->createAdmin()->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->createAdmin()->post( $request, new Response() );
93
+		return $this->createAdmin()->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->createAdmin()->put( $request, new Response() );
109
+		return $this->createAdmin()->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->createAdmin()->options( $request, new Response() );
125
+		return $this->createAdmin()->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 createAdmin()
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' )->get();
141
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
140
+		$aimeos = app('aimeos')->get();
141
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
142 142
 
143
-		$context = app( 'aimeos.context' )->get( false, 'backend' );
144
-		$context->setI18n( app('aimeos.i18n')->get( array( $lang, 'en' ) ) );
145
-		$context->setLocale( app('aimeos.locale')->getBackend( $context, $site ) );
146
-		$context->setView( app( 'aimeos.view' )->create( $context, $templatePaths, $lang ) );
143
+		$context = app('aimeos.context')->get(false, 'backend');
144
+		$context->setI18n(app('aimeos.i18n')->get(array($lang, 'en')));
145
+		$context->setLocale(app('aimeos.locale')->getBackend($context, $site));
146
+		$context->setView(app('aimeos.view')->create($context, $templatePaths, $lang));
147 147
 
148
-		return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource );
148
+		return \Aimeos\Admin\JsonAdm::create($context, $aimeos, $resource);
149 149
 	}
150 150
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JsonapiController.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
32 32
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
33 33
 	 */
34
-	public function deleteAction( ServerRequestInterface $request )
34
+	public function deleteAction(ServerRequestInterface $request)
35 35
 	{
36
-		return $this->createClient()->delete( $request, new Response() );
36
+		return $this->createClient()->delete($request, new Response());
37 37
 	}
38 38
 
39 39
 
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
44 44
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
45 45
 	 */
46
-	public function getAction( ServerRequestInterface $request )
46
+	public function getAction(ServerRequestInterface $request)
47 47
 	{
48
-		return $this->createClient()->get( $request, new Response() );
48
+		return $this->createClient()->get($request, new Response());
49 49
 	}
50 50
 
51 51
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
56 56
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
57 57
 	 */
58
-	public function patchAction( ServerRequestInterface $request )
58
+	public function patchAction(ServerRequestInterface $request)
59 59
 	{
60
-		return $this->createClient()->patch( $request, new Response() );
60
+		return $this->createClient()->patch($request, new Response());
61 61
 	}
62 62
 
63 63
 
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
68 68
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
69 69
 	 */
70
-	public function postAction( ServerRequestInterface $request )
70
+	public function postAction(ServerRequestInterface $request)
71 71
 	{
72
-		return $this->createClient()->post( $request, new Response() );
72
+		return $this->createClient()->post($request, new Response());
73 73
 	}
74 74
 
75 75
 
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
80 80
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
81 81
 	 */
82
-	public function putAction( ServerRequestInterface $request )
82
+	public function putAction(ServerRequestInterface $request)
83 83
 	{
84
-		return $this->createClient()->put( $request, new Response() );
84
+		return $this->createClient()->put($request, new Response());
85 85
 	}
86 86
 
87 87
 
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
91 91
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
92 92
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
93 93
 	 */
94
-	public function optionsAction( ServerRequestInterface $request )
94
+	public function optionsAction(ServerRequestInterface $request)
95 95
 	{
96
-		return $this->createClient()->options( $request, new Response() );
96
+		return $this->createClient()->options($request, new Response());
97 97
 	}
98 98
 
99 99
 
@@ -104,17 +104,17 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	protected function createClient()
106 106
 	{
107
-		$resource = Route::input( 'resource' );
108
-		$related = Route::input( 'related', Input::get( 'related' ) );
107
+		$resource = Route::input('resource');
108
+		$related = Route::input('related', Input::get('related'));
109 109
 
110
-		$aimeos = app( 'aimeos' )->get();
111
-		$tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
110
+		$aimeos = app('aimeos')->get();
111
+		$tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
112 112
 
113
-		$context = app( 'aimeos.context' )->get();
113
+		$context = app('aimeos.context')->get();
114 114
 		$langid = $context->getLocale()->getLanguageId();
115 115
 
116
-		$context->setView( app( 'aimeos.view' )->create( $context, $tmplPaths, $langid ) );
116
+		$context->setView(app('aimeos.view')->create($context, $tmplPaths, $langid));
117 117
 
118
-		return \Aimeos\Client\JsonApi::create( $context, $resource . '/' . $related );
118
+		return \Aimeos\Client\JsonApi::create($context, $resource.'/'.$related);
119 119
 	}
120 120
 }
Please login to merge, or discard this patch.