Adapt checking groups to core returning a Map object

aimeos · Feb 6, 2020 · dbba3d7 · dbba3d7
1 parent b75e645
commit dbba3d7
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/src/Aimeos/Shop/Base/Support.php b/src/Aimeos/Shop/Base/Support.php
@@ -96,17 +96,12 @@ public function checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupco
 	 */
 	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) : array
 	{
-		$list = array();
 		$manager = \Aimeos\MShop::create( $context, 'customer/group' );
 
 		$search = $manager->createSearch();
 		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
 
-		foreach( $manager->searchItems( $search ) as $item ) {
-			$list[] = $item->getCode();
-		}
-
-		return $list;
+		return $manager->searchItems( $search )->getCode()->toArray();
 	}
 
 
@@ -124,15 +119,15 @@ protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, strin
 
 		$search = $manager->createSearch();
 		$search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );
-		$groupItems = $manager->searchItems( $search );
+		$groupIds = $manager->searchItems( $search )->keys()->toArray();
 
 
 		$manager = \Aimeos\MShop::create( $context, 'customer/lists' );
 
 		$search = $manager->createSearch();
 		$expr = array(
 			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
+			$search->compare( '==', 'customer.lists.refid', $groupIds ),
 			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
 		);
 		$search->setConditions( $search->combine( '&&', $expr ) );