Completed
Push — master ( 24d3ed...6f8588 )
by Aimeos
01:47
created
src/Aimeos/Shop/Base/Page.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
54 54
 	 * @param \Aimeos\Shop\Base\View $view View object
55 55
 	 */
56
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
56
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
57 57
 		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context,
58
-		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view )
58
+		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view)
59 59
 	{
60 60
 		$this->config = $config;
61 61
 		$this->aimeos = $aimeos;
@@ -71,21 +71,21 @@  discard block
 block discarded – undo
71 71
 	 * @param string $pageName Name of the configured page
72 72
 	 * @return array Associative list with body and header output separated by client name
73 73
 	 */
74
-	public function getSections( $pageName )
74
+	public function getSections($pageName)
75 75
 	{
76 76
 		$context = $this->context->get();
77 77
 		$langid = $context->getLocale()->getLanguageId();
78
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
79
-		$view = $this->view->create( $context, $tmplPaths, $langid );
80
-		$context->setView( $view );
78
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
79
+		$view = $this->view->create($context, $tmplPaths, $langid);
80
+		$context->setView($view);
81 81
 
82
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
83
-		$page = $context->getConfig()->get( 'page/' . $pageName, array() );
82
+		$result = array('aibody' => array(), 'aiheader' => array());
83
+		$page = $context->getConfig()->get('page/'.$pageName, array());
84 84
 
85
-		foreach( (array) $page as $clientName )
85
+		foreach ((array) $page as $clientName)
86 86
 		{
87
-			$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
88
-			$client->setView( clone $view );
87
+			$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
88
+			$client->setView(clone $view);
89 89
 			$client->process();
90 90
 
91 91
 			$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Aimeos.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
36 36
 	 */
37
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
37
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
38 38
 	{
39 39
 		$this->config = $config;
40 40
 	}
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function get()
49 49
 	{
50
-		if( $this->object === null )
50
+		if ($this->object === null)
51 51
 		{
52
-			$dir = base_path( 'ext' );
52
+			$dir = base_path('ext');
53 53
 
54
-			if( !is_dir( $dir ) ) {
55
-				$dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext';
54
+			if (!is_dir($dir)) {
55
+				$dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext';
56 56
 			}
57 57
 
58
-			$extDirs = (array) $this->config->get( 'shop.extdir', $dir );
59
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
58
+			$extDirs = (array) $this->config->get('shop.extdir', $dir);
59
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
60 60
 		}
61 61
 
62 62
 		return $this->object;
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public function getVersion()
72 72
 	{
73
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
74
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
73
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
74
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
75 75
 		) {
76
-			foreach( (array) $content['packages'] as $item )
76
+			foreach ((array) $content['packages'] as $item)
77 77
 			{
78
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
78
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
79 79
 					return $item['version'];
80 80
 				}
81 81
 			}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Config.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
41 41
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
42 42
 	 */
43
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
43
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
44 44
 	{
45 45
 		$this->aimeos = $aimeos;
46 46
 		$this->config = $config;
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
53 53
 	 * @param integer $type Configuration type ("frontend" or "backend")
54 54
 	 * @return \Aimeos\MW\Config\Iface Configuration object
55 55
 	 */
56
-	public function get( $type = 'frontend' )
56
+	public function get($type = 'frontend')
57 57
 	{
58
-		if( !isset( $this->objects[$type] ) )
58
+		if (!isset($this->objects[$type]))
59 59
 		{
60 60
 			$configPaths = $this->aimeos->get()->getConfigPaths();
61
-			$cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php';
61
+			$cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php';
62 62
 
63
-			$config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths );
63
+			$config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths);
64 64
 
65
-			if( $this->config->get( 'shop.apc_enabled', false ) == true ) {
66
-				$config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
65
+			if ($this->config->get('shop.apc_enabled', false) == true) {
66
+				$config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:'));
67 67
 			}
68 68
 
69
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) );
69
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop'));
70 70
 
71
-			if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) {
72
-				$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf );
71
+			if (($conf = $this->config->get('shop.'.$type, array())) !== array()) {
72
+				$config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf);
73 73
 			}
74 74
 
75 75
 			$this->objects[$type] = $config;
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/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.