Merge branch 'ntr/5.7/add-customer-group-key-to-session' into '5.6'

NTR - Add customer group key to session in product export

See merge request shopware/5/product/shopware!385

Author: shyim

UPGRADE-5.6.md

@@ -88,6 +88,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
 * Changed cookie consent manager to work correctly when accepting all cookies
 * Renamed duplicated smarty block `frontend_listing_box_article_badges` in the files `frontend/listing/product-box/box-basic.tpl` and `frontend/listing/product-box/box-emotion.tpl`
 * Changed tinymce to fix issues with `readOnly` is not resetting
+* Changed sExport to set correct customer group in the shop context
 
 ## 5.6.6
 

engine/Shopware/Core/sExport.php

@@ -181,7 +181,7 @@ public function sGetCurrency($currency)
     /**
      * @param int|string $customerGroup
      *
-     * @return bool
+     * @return bool|array
      */
     public function sGetCustomergroup($customerGroup)
     {
@@ -312,6 +312,11 @@ public function sInitSettings()
         $currency = $repository->find($this->sCurrency['id']);
         $shop->setCurrency($currency);
         Shopware()->Container()->get('shopware.components.shop_registration_service')->registerShop($shop);
+
+        if ($this->sCustomergroup !== false) {
+            Shopware()->Container()->get('session')->offsetSet('sUserGroup', $this->sCustomergroup['groupkey']);
+        }
+
         $this->contextService->initializeContext();
 
         $this->shop = $shop;
@@ -1291,7 +1296,7 @@ public function sGetPaymentmean($payment)
         $cache[$payment]['country_surcharge'] = [];
         if (!empty($cache[$payment]['surchargestring'])) {
             foreach (explode(';', $cache[$payment]['surchargestring']) as $countrySurcharge) {
-                list($key, $value) = explode(':', $countrySurcharge);
+                [$key, $value] = explode(':', $countrySurcharge);
                 $value = (float) str_replace(',', '.', $value);
                 if (!empty($value)) {
                     $cache[$payment]['country_surcharge'][$key] = $value;
@@ -1303,10 +1308,10 @@ public function sGetPaymentmean($payment)
     }
 
     /**
-     * @deprecated in 5.6, will be removed in 5.7 without replacement
-     *
      * @param int|string|null $dispatch
      * @param int|string|null $country
+     *
+     * @deprecated in 5.6, will be removed in 5.7 without replacement
      */
     public function sGetDispatch($dispatch = null, $country = null)
     {