Merge pull request #817 from akeneo/PIM-2163

PIM-2163: Fix issue on mass editing scopable fields

Author: fitn

src/Pim/Bundle/EnrichBundle/MassEditAction/EditCommonAttributes.php

@@ -9,7 +9,6 @@
 use Pim\Bundle\FlexibleEntityBundle\Model\AbstractAttribute;
 use Pim\Bundle\CatalogBundle\Manager\ProductManager;
 use Pim\Bundle\CatalogBundle\Manager\CurrencyManager;
-use Pim\Bundle\CatalogBundle\Entity\Channel;
 use Pim\Bundle\CatalogBundle\Entity\Family;
 use Pim\Bundle\CatalogBundle\Entity\Locale;
 use Pim\Bundle\CatalogBundle\Model\Media;
@@ -356,33 +355,33 @@ protected function addValues(AbstractAttribute $attribute)
         if ($attribute->isScopable()) {
             foreach ($locale->getChannels() as $channel) {
                 $key = $attribute->getCode().'_'.$channel->getCode();
-                $this->values[$key] = $this->createValue($attribute, $locale, $channel);
+                $this->values[$key] = $this->createValue($attribute, $locale->getCode(), $channel->getCode());
             }
         } else {
-            $this->values[$attribute->getCode()] = $this->createValue($attribute, $locale);
+            $this->values[$attribute->getCode()] = $this->createValue($attribute, $locale->getCode());
         }
     }
 
     /**
      * Create a value
      *
      * @param AbstractAttribute $attribute
-     * @param Locale            $locale
-     * @param Channel           $channel
+     * @param string            $localeCode
+     * @param string            $channelCode
      *
      * @return ProductValueInterface
      */
-    protected function createValue(AbstractAttribute $attribute, Locale $locale, Channel $channel = null)
+    protected function createValue(AbstractAttribute $attribute, $localeCode = null, $channelCode = null)
     {
         $value = $this->productManager->createProductValue();
         $value->setAttribute($attribute);
 
         if ($attribute->isLocalizable()) {
-            $value->setLocale($locale);
+            $value->setLocale($localeCode);
         }
 
-        if ($channel && $attribute->isScopable()) {
-            $value->setScope($channel->getCode());
+        if ($attribute->isScopable()) {
+            $value->setScope($channelCode);
         }
 
         if ('pim_catalog_price_collection' === $attribute->getAttributeType()) {