Merge branch 'sw-27055/fix-attribute-saving' into '5.7'

SW-27055 - Fix attribute saving

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

Author: mitelg

.env.dist

@@ -5,4 +5,5 @@ DB_NAME=shopware
 DB_PORT=3306
 SW_HOST=localhost
 SW_BASE_PATH=
+SELENIUM_HOST=selenium
 ELASTICSEARCH_HOST=elasticsearch

.gitlab-ci.yml

@@ -16,6 +16,7 @@ variables:
     DB_NAME: shopware
     SW_HOST: "localhost"
     SW_BASE_PATH: ""
+    SELENIUM_HOST: selenium
     ELASTICSEARCH_HOST: elasticsearch
 
 # Include the default gitlab rules template for "MergeRequest-Pipelines".
@@ -238,7 +239,7 @@ Elasticsearch 7:
         - chown -R www-data:www-data .
         - sudo -E -u www-data vendor/bin/behat -vv --config=tests/Mink/behat.yml --format=pretty --out=std --format=junit --out=${ARTIFACTS_ROOT}/mink --tags ${MINK_TAG}
     services:
-        -   name: selenium/standalone-chrome:84.0
+        -   name: selenium/standalone-chrome:94.0
             alias: selenium
         -   name: mailhog/mailhog
             alias: smtp

.phpstan-baseline.neon

@@ -126,7 +126,7 @@ debug-config-test: .make.config.build.debug
 	touch $@
 
 .make.config.behat:
-	@sed -e 's/%sw\.host%/$(SW_HOST)/g' -e 's|%sw\.path%|$(SW_BASE_PATH)|g' < ./build/behat.yml.dist > ./tests/Mink/behat.yml
+	@sed -e 's/%sw\.host%/$(SW_HOST)/g' -e 's|%sw\.path%|$(SW_BASE_PATH)|g' -e 's|%selenium\.host%|$(SELENIUM_HOST)|g' < ./tests/Mink/behat.yml.dist > ./tests/Mink/behat.yml
 	touch $@
 
 .make.install.composer-dependencies:

Makefile

@@ -262,6 +262,8 @@ public function forward($action, $controller = null, $module = null, array $para
      * @param string|array $url
      *
      * @throws Exception
+     *
+     * @return void
      */
     public function redirect($url, array $options = [])
     {

build/behat.yml.dist

@@ -74,6 +74,9 @@ class Shopware_Controllers_Frontend_Blog extends Enlight_Controller_Action
      */
     protected $blogBaseUrl;
 
+    /**
+     * @return void
+     */
     public function init()
     {
         $this->blogBaseUrl = Shopware()->Config()->get('baseFile');
@@ -142,6 +145,8 @@ public function getCommentConfirmRepository()
 
     /**
      * Index action method
+     *
+     * @return void
      */
     public function indexAction()
     {
@@ -240,7 +245,9 @@ public function indexAction()
         }
 
         if (!empty($categoryContent['external'])) {
-            return $this->redirect($categoryContent['external'], ['code' => 301]);
+            $this->redirect($categoryContent['external'], ['code' => 301]);
+
+            return;
         }
 
         $assigningData = [
@@ -273,6 +280,8 @@ public function indexAction()
      * Contains the logic for the detail page of a blog article
      *
      * @throws Enlight_Controller_Exception
+     *
+     * @return void
      */
     public function detailAction()
     {
@@ -309,7 +318,9 @@ public function detailAction()
         }
 
         if (isset($location)) {
-            return $this->redirect($location, ['code' => 301]);
+            $this->redirect($location, ['code' => 301]);
+
+            return;
         }
 
         // Load the right template
@@ -320,11 +331,13 @@ public function detailAction()
         $this->View()->assign('userLoggedIn', !empty(Shopware()->Session()->get('sUserId')));
         if (!empty(Shopware()->Session()->get('sUserId')) && empty($this->Request()->get('name'))
             && $this->Request()->getParam('__cache') === null) {
-            $userData = Shopware()->Modules()->Admin()->sGetUserData();
-            $this->View()->assign('sFormData', [
-                'eMail' => $userData['additional']['user']['email'],
-                'name' => $userData['billingaddress']['firstname'] . ' ' . $userData['billingaddress']['lastname'],
-            ]);
+            $customerData = Shopware()->Modules()->Admin()->sGetUserData();
+            if (\is_array($customerData)) {
+                $this->View()->assign('sFormData', [
+                    'eMail' => $customerData['additional']['user']['email'],
+                    'name' => $customerData['billingaddress']['firstname'] . ' ' . $customerData['billingaddress']['lastname'],
+                ]);
+            }
         }
 
         $mediaIds = array_column($blogArticleData['media'], 'mediaId');
@@ -374,6 +387,8 @@ public function detailAction()
      * Rating action method
      *
      * Save and review the blog comment and rating
+     *
+     * @return void
      */
     public function ratingAction()
     {
@@ -400,7 +415,9 @@ public function ratingAction()
 
                     $this->sSaveComment($commentData, $blogArticleId);
 
-                    return $this->forward('detail');
+                    $this->forward('detail');
+
+                    return;
                 }
                 $sErrorFlag['invalidHash'] = true;
             }
@@ -561,6 +578,8 @@ public function getCategoryBreadcrumb($categoryId)
      * @param int   $blogArticleId
      *
      * @throws Enlight_Exception
+     *
+     * @return void
      */
     protected function sSaveComment($commentData, $blogArticleId)
     {
@@ -650,9 +669,12 @@ protected function getPagerData($totalResult, $limitEnd, $page, $categoryId, arr
     /**
      * Helper method to fill the data set with the right category link
      *
-     * @param string $requestParameterName
-     * @param string $requestParameterValue
-     * @param bool   $addRemoveProperty     | true to add a remove property to remove the selected filters
+     * @param array<array<string, mixed>> $filterData
+     * @param string                      $requestParameterName
+     * @param string                      $requestParameterValue
+     * @param bool                        $addRemoveProperty     | true to add a remove property to remove the selected filters
+     *
+     * @return array<array<string, mixed>>
      */
     protected function addLinksToFilter(array $filterData, $requestParameterName, $requestParameterValue, $addRemoveProperty = true)
     {