Completed
Push — master ( 6f8588...d5f400 )
by Aimeos
19:59
created
src/Aimeos/Shop/Base/I18n.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param \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,22 +53,22 @@  discard block
 block discarded – undo
53 53
 	 * @param array $languageIds List of two letter ISO language IDs
54 54
 	 * @return \Aimeos\MW\Translation\Iface[] List of translation objects
55 55
 	 */
56
-	public function get( array $languageIds )
56
+	public function get(array $languageIds)
57 57
 	{
58 58
 		$i18nPaths = $this->aimeos->get()->getI18nPaths();
59 59
 
60
-		foreach( $languageIds as $langid )
60
+		foreach ($languageIds as $langid)
61 61
 		{
62
-			if( !isset( $this->i18n[$langid] ) )
62
+			if (!isset($this->i18n[$langid]))
63 63
 			{
64
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
64
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
65 65
 
66
-				if( $this->config->get( 'shop.apc_enabled', false ) == true ) {
67
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
66
+				if ($this->config->get('shop.apc_enabled', false) == true) {
67
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:'));
68 68
 				}
69 69
 
70
-				if( $this->config->has( 'shop.i18n.' . $langid ) ) {
71
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) );
70
+				if ($this->config->has('shop.i18n.'.$langid)) {
71
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid));
72 72
 				}
73 73
 
74 74
 				$this->i18n[$langid] = $i18n;
Please login to merge, or discard this patch.
src/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\Shop\Base\Aimeos' )->get();
111
-		$tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
110
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
111
+		$tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
112 112
 
113
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
113
+		$context = app('\Aimeos\Shop\Base\Context')->get();
114 114
 		$langid = $context->getLocale()->getLanguageId();
115 115
 
116
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) );
116
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid));
117 117
 
118
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
118
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
119 119
 	}
120 120
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/BasketController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 */
30 30
 	public function indexAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index');
33 33
 		return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store');
34 34
 	}
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CheckoutController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -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 Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store');
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 Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store');
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 Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store');
58 58
 	}
59 59
 }
60 60
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Support.php 1 patch
Spacing   +30 added lines, -30 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,22 +53,22 @@  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 checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes )
56
+	public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes)
57 57
 	{
58
-		$context = $this->context->get( false );
58
+		$context = $this->context->get(false);
59 59
 
60 60
 		try {
61
-			$site = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' )->getItem( $user->siteid )->getCode();
62
-		} catch( \Exception $e ) {
63
-			$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
61
+			$site = \Aimeos\MShop\Factory::createManager($context, 'locale/site')->getItem($user->siteid)->getCode();
62
+		} catch (\Exception $e) {
63
+			$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
64 64
 		}
65 65
 
66
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
66
+		$context->setLocale($this->locale->getBackend($context, $site));
67 67
 
68
-		foreach( array_reverse( $context->getLocale()->getSitePath() ) as $siteid )
68
+		foreach (array_reverse($context->getLocale()->getSitePath()) as $siteid)
69 69
 		{
70
-			if( $user->siteid === $siteid ) {
71
-				return $this->checkGroups( $context, $user->id, $groupcodes );
70
+			if ($user->siteid === $siteid) {
71
+				return $this->checkGroups($context, $user->id, $groupcodes);
72 72
 			}
73 73
 		}
74 74
 
@@ -84,14 +84,14 @@  discard block
 block discarded – undo
84 84
 	 * @return boolean True if user is part of the group, false if not
85 85
 	 * @deprecated Use checkUserGroup() instead
86 86
 	 */
87
-	public function checkGroup( $userid, $groupcodes )
87
+	public function checkGroup($userid, $groupcodes)
88 88
 	{
89
-		$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
89
+		$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
90 90
 
91
-		$context = $this->context->get( false );
92
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
91
+		$context = $this->context->get(false);
92
+		$context->setLocale($this->locale->getBackend($context, $site));
93 93
 
94
-		return $this->checkGroups( $context, $userid, $groupcodes );
94
+		return $this->checkGroups($context, $userid, $groupcodes);
95 95
 	}
96 96
 
97 97
 
@@ -101,15 +101,15 @@  discard block
 block discarded – undo
101 101
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item
102 102
 	 * @return string[] List of group codes
103 103
 	 */
104
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
104
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
105 105
 	{
106 106
 		$list = array();
107
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
107
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
108 108
 
109 109
 		$search = $manager->createSearch();
110
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
110
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
111 111
 
112
-		foreach( $manager->searchItems( $search ) as $item ) {
112
+		foreach ($manager->searchItems($search) as $item) {
113 113
 			$list[] = $item->getCode();
114 114
 		}
115 115
 
@@ -125,26 +125,26 @@  discard block
 block discarded – undo
125 125
 	 * @param string[] $groupcodes List of group codes to check against
126 126
 	 * @return boolean True if the user is in one of the groups, false if not
127 127
 	 */
128
-	protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes )
128
+	protected function checkGroups(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes)
129 129
 	{
130
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
130
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
131 131
 
132 132
 		$search = $manager->createSearch();
133
-		$search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );
134
-		$groupItems = $manager->searchItems( $search );
133
+		$search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes));
134
+		$groupItems = $manager->searchItems($search);
135 135
 
136 136
 
137
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
137
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
138 138
 
139 139
 		$search = $manager->createSearch();
140 140
 		$expr = array(
141
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
142
-			$search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
143
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
141
+			$search->compare('==', 'customer.lists.parentid', $userid),
142
+			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)),
143
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
144 144
 		);
145
-		$search->setConditions( $search->combine( '&&', $expr ) );
146
-		$search->setSlice( 0, 1 );
145
+		$search->setConditions($search->combine('&&', $expr));
146
+		$search->setSlice(0, 1);
147 147
 
148
-		return (bool) count( $manager->searchItems( $search ) );
148
+		return (bool) count($manager->searchItems($search));
149 149
 	}
150 150
 }
151 151
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function countAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count');
33 33
 
34 34
 		return Response::view('shop::catalog.count', $params)
35 35
 			->header('Content-Type', 'application/javascript');
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function detailAction()
45 45
 	{
46
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' );
46
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail');
47 47
 		return Response::view('shop::catalog.detail', $params);
48 48
 	}
49 49
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function listAction()
57 57
 	{
58
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' );
58
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list');
59 59
 		return Response::view('shop::catalog.list', $params);
60 60
 	}
61 61
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public function stockAction()
69 69
 	{
70
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' );
70
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock');
71 71
 
72 72
 		return Response::view('shop::catalog.stock', $params)
73 73
 			->header('Content-Type', 'application/javascript');
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function suggestAction()
83 83
 	{
84
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' );
84
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest');
85 85
 
86 86
 		return Response::view('shop::catalog.suggest', $params)
87 87
 			->header('Content-Type', 'application/json');
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AccountController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function indexAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index');
33 33
 		return Response::view('shop::account.index', $params);
34 34
 	}
35 35
 
@@ -41,17 +41,17 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function downloadAction()
43 43
 	{
44
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
44
+		$context = app('\Aimeos\Shop\Base\Context')->get();
45 45
 		$langid = $context->getLocale()->getLanguageId();
46 46
 
47
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );
48
-		$context->setView( $view );
47
+		$view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid);
48
+		$context->setView($view);
49 49
 
50
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
51
-		$client->setView( $view );
50
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
51
+		$client->setView($view);
52 52
 		$client->process();
53 53
 
54 54
 		$response = $view->response();
55
-		return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
55
+		return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
56 56
 	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Context.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
56 56
 	 * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object
57 57
 	 */
58
-	public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )
58
+	public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)
59 59
 	{
60 60
 		$this->session = $session;
61 61
 		$this->config = $config;
@@ -71,36 +71,36 @@  discard block
 block discarded – undo
71 71
 	 * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)
72 72
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
73 73
 	 */
74
-	public function get( $locale = true, $type = 'frontend' )
74
+	public function get($locale = true, $type = 'frontend')
75 75
 	{
76
-		$config = $this->config->get( $type );
76
+		$config = $this->config->get($type);
77 77
 
78
-		if( $this->context === null )
78
+		if ($this->context === null)
79 79
 		{
80 80
 			$context = new \Aimeos\MShop\Context\Item\Standard();
81
-			$context->setConfig( $config );
82
-
83
-			$this->addDataBaseManager( $context );
84
-			$this->addFilesystemManager( $context );
85
-			$this->addMessageQueueManager( $context );
86
-			$this->addLogger( $context );
87
-			$this->addCache( $context );
88
-			$this->addMailer( $context);
89
-			$this->addProcess( $context );
90
-			$this->addSession( $context );
91
-			$this->addUser( $context);
92
-			$this->addGroups( $context);
81
+			$context->setConfig($config);
82
+
83
+			$this->addDataBaseManager($context);
84
+			$this->addFilesystemManager($context);
85
+			$this->addMessageQueueManager($context);
86
+			$this->addLogger($context);
87
+			$this->addCache($context);
88
+			$this->addMailer($context);
89
+			$this->addProcess($context);
90
+			$this->addSession($context);
91
+			$this->addUser($context);
92
+			$this->addGroups($context);
93 93
 
94 94
 			$this->context = $context;
95 95
 		}
96 96
 
97
-		$this->context->setConfig( $config );
97
+		$this->context->setConfig($config);
98 98
 
99
-		if( $locale === true )
99
+		if ($locale === true)
100 100
 		{
101
-			$localeItem = $this->locale->get( $this->context );
102
-			$this->context->setLocale( $localeItem );
103
-			$this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );
101
+			$localeItem = $this->locale->get($this->context);
102
+			$this->context->setLocale($localeItem);
103
+			$this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));
104 104
 		}
105 105
 
106 106
 		return $this->context;
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
113 113
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
114 114
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
115 115
 	 */
116
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
116
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
117 117
 	{
118
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
118
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
119 119
 
120
-		return $context->setCache( $cache );
120
+		return $context->setCache($cache);
121 121
 	}
122 122
 
123 123
 
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
128 128
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
129 129
 	 */
130
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
130
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
131 131
 	{
132
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
132
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
133 133
 
134
-		return $context->setDatabaseManager( $dbm );
134
+		return $context->setDatabaseManager($dbm);
135 135
 	}
136 136
 
137 137
 
@@ -141,14 +141,14 @@  discard block
 block discarded – undo
141 141
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
142 142
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
143 143
 	 */
144
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
144
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
145 145
 	{
146 146
 		$config = $context->getConfig();
147
-		$path = storage_path( 'aimeos' );
147
+		$path = storage_path('aimeos');
148 148
 
149
-		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );
149
+		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
150 150
 
151
-		return $context->setFilesystemManager( $fs );
151
+		return $context->setFilesystemManager($fs);
152 152
 	}
153 153
 
154 154
 
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
158 158
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
159 159
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
160 160
 	 */
161
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
161
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
162 162
 	{
163
-		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
163
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
164 164
 
165
-		return $context->setLogger( $logger );
165
+		return $context->setLogger($logger);
166 166
 	}
167 167
 
168 168
 
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
173 173
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
174 174
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
175 175
 	 */
176
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
176
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
177 177
 	{
178
-		$mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } );
178
+		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
179 179
 
180
-		return $context->setMail( $mail );
180
+		return $context->setMail($mail);
181 181
 	}
182 182
 
183 183
 
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
187 187
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
188 188
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
189 189
 	 */
190
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
190
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
191 191
 	{
192
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
192
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
193 193
 
194
-		return $context->setMessageQueueManager( $mq );
194
+		return $context->setMessageQueueManager($mq);
195 195
 	}
196 196
 
197 197
 
@@ -201,16 +201,16 @@  discard block
 block discarded – undo
201 201
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
202 202
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
203 203
 	 */
204
-	protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context )
204
+	protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context)
205 205
 	{
206 206
 		$config = $context->getConfig();
207
-		$max = $config->get( 'pcntl_max', 4 );
208
-		$prio = $config->get( 'pcntl_priority', 19 );
207
+		$max = $config->get('pcntl_max', 4);
208
+		$prio = $config->get('pcntl_priority', 19);
209 209
 
210
-		$process = new \Aimeos\MW\Process\Pcntl( $max, $prio );
211
-		$process = new \Aimeos\MW\Process\Decorator\Check( $process );
210
+		$process = new \Aimeos\MW\Process\Pcntl($max, $prio);
211
+		$process = new \Aimeos\MW\Process\Decorator\Check($process);
212 212
 
213
-		return $context->setProcess( $process );
213
+		return $context->setProcess($process);
214 214
 	}
215 215
 
216 216
 
@@ -220,11 +220,11 @@  discard block
 block discarded – undo
220 220
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
221 221
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
222 222
 	 */
223
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
223
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
224 224
 	{
225
-		$session = new \Aimeos\MW\Session\Laravel5( $this->session );
225
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
226 226
 
227
-		return $context->setSession( $session );
227
+		return $context->setSession($session);
228 228
 	}
229 229
 
230 230
 
@@ -234,16 +234,16 @@  discard block
 block discarded – undo
234 234
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
235 235
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
236 236
 	 */
237
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
237
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
238 238
 	{
239
-		if( ( $userid = Auth::id() ) !== null ) {
240
-			$context->setUserId( $userid );
239
+		if (($userid = Auth::id()) !== null) {
240
+			$context->setUserId($userid);
241 241
 		}
242 242
 
243
-		if( ( $user = Auth::user() ) !== null ) {
244
-			$context->setEditor( $user->name );
243
+		if (($user = Auth::user()) !== null) {
244
+			$context->setEditor($user->name);
245 245
 		} else {
246
-			$context->setEditor( \Request::ip() );
246
+			$context->setEditor(\Request::ip());
247 247
 		}
248 248
 
249 249
 		return $context;
@@ -256,14 +256,14 @@  discard block
 block discarded – undo
256 256
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
257 257
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
258 258
 	 */
259
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )
259
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)
260 260
 	{
261
-		if( ( $userid = Auth::id() ) !== null )
261
+		if (($userid = Auth::id()) !== null)
262 262
 		{
263
-			$context->setGroupIds( function() use ( $context, $userid )
263
+			$context->setGroupIds(function() use ($context, $userid)
264 264
 			{
265
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
266
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
265
+				$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
266
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
267 267
 			} );
268 268
 		}
269 269
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -36,24 +36,24 @@
 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', 'viewer']] ) === false
41
+		if (Auth::check() === false
42
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor', 'viewer']]) === false
43 43
 		) {
44
-			return redirect()->guest( 'login' );
44
+			return redirect()->guest('login');
45 45
 		}
46 46
 
47
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
48
-		$siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
49
-		$siteItem = $siteManager->getItem( $request->user()->siteid );
47
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
48
+		$siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
49
+		$siteItem = $siteManager->getItem($request->user()->siteid);
50 50
 
51 51
 		$param = array(
52 52
 			'resource' => 'dashboard',
53
-			'site' => Route::input( 'site', Input::get( 'site', $siteItem->getCode() ) ),
54
-			'lang' => Route::input( 'lang', Input::get( 'lang', $request->user()->langid ?: config( 'app.locale', 'en' ) ) )
53
+			'site' => Route::input('site', Input::get('site', $siteItem->getCode())),
54
+			'lang' => Route::input('lang', Input::get('lang', $request->user()->langid ?: config('app.locale', 'en')))
55 55
 		);
56 56
 
57
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
57
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
58 58
 	}
59 59
 }
Please login to merge, or discard this patch.