Merge branch '2.1'

# Conflicts: # src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnitDefinitions.php
coreshop · Jan 4, 2020 · c012d50 · c012d50
2 parents b5dfbdf + 73a0037
commit c012d50
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/etc/_scripts/composer b/etc/_scripts/composer
@@ -2,7 +2,6 @@
 set -e
 
 echo "Validating CoreShop Suite"
-composer validate --strict
 
 if [[ "$PIMCORE_VERSION" != "dev-master" ]];
 then

diff --git a/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnitDefinitions.php b/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnitDefinitions.php
@@ -238,7 +238,7 @@ public function preGetData($object, $params = [])
             }
         }
 
-        if ($data instanceof ProductUnitDefinitionsInterface) {
+        if ($data instanceof ProductUnitDefinitionsInterface && $object instanceof ProductInterface) {
             $data->setProduct($object);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     set -e
     echo "Validating CoreShop Suite"
-    composer validate --strict
     if [[ "$PIMCORE_VERSION" != "dev-master" ]];
     then
@@ Expand Down @@