Merge remote-tracking branch 'ogre/MAGETWO-45280-cms-block-API-does-not-work' into SWAT-BugFixes-11Oct

Author: arkadiych

app/code/Magento/Cms/Model/Block.php

@@ -214,4 +214,14 @@ public function setIsActive($isActive)
     {
         return $this->setData(self::IS_ACTIVE, $isActive);
     }
+
+    /**
+     * Receive page store ids
+     *
+     * @return int[]
+     */
+    public function getStores()
+    {
+        return $this->hasData('stores') ? $this->getData('stores') : $this->getData('store_id');
+    }
 }

app/code/Magento/Cms/Model/BlockRepository.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Cms\Model\ResourceModel\Block as ResourceBlock;
 use Magento\Cms\Model\ResourceModel\Block\CollectionFactory as BlockCollectionFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class BlockRepository
@@ -57,6 +58,11 @@ class BlockRepository implements BlockRepositoryInterface
      */
     protected $dataBlockFactory;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param ResourceBlock $resource
      * @param BlockFactory $blockFactory
@@ -65,6 +71,7 @@ class BlockRepository implements BlockRepositoryInterface
      * @param Data\BlockSearchResultsInterfaceFactory $searchResultsFactory
      * @param DataObjectHelper $dataObjectHelper
      * @param DataObjectProcessor $dataObjectProcessor
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ResourceBlock $resource,
@@ -73,7 +80,8 @@ public function __construct(
         BlockCollectionFactory $blockCollectionFactory,
         Data\BlockSearchResultsInterfaceFactory $searchResultsFactory,
         DataObjectHelper $dataObjectHelper,
-        DataObjectProcessor $dataObjectProcessor
+        DataObjectProcessor $dataObjectProcessor,
+        StoreManagerInterface $storeManager
     ) {
         $this->resource = $resource;
         $this->blockFactory = $blockFactory;
@@ -82,6 +90,7 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         $this->dataBlockFactory = $dataBlockFactory;
         $this->dataObjectProcessor = $dataObjectProcessor;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -93,6 +102,8 @@ public function __construct(
      */
     public function save(Data\BlockInterface $block)
     {
+        $storeId = $this->storeManager->getStore()->getId();
+        $block->setStoreId($storeId);
         try {
             $this->resource->save($block);
         } catch (\Exception $exception) {

app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php

@@ -53,6 +53,11 @@ class BlockRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $collection;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Initialize repository
      */
@@ -80,6 +85,14 @@ public function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $store = $this->getMockBuilder('\Magento\Store\Api\Data\StoreInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $store->expects($this->any())->method('getId')->willReturn(0);
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($store);
 
         $this->block = $this->getMockBuilder('Magento\Cms\Model\Block')->disableOriginalConstructor()->getMock();
         $this->blockData = $this->getMockBuilder('Magento\Cms\Api\Data\BlockInterface')
@@ -121,7 +134,8 @@ public function setUp()
             $collectionFactory,
             $blockSearchResultFactory,
             $this->dataHelper,
-            $this->dataObjectProcessor
+            $this->dataObjectProcessor,
+            $this->storeManager
         );
     }