[Forwardport] Introduce Block Config Source

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

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Config\Source;
+
+use Magento\Cms\Model\ResourceModel\Block\CollectionFactory;
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Class Block
+ */
+class Block implements OptionSourceInterface
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        if (!$this->options) {
+            $this->options = $this->collectionFactory->create()->toOptionIdArray();
+        }
+
+        return $this->options;
+    }
+}

app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php

@@ -176,4 +176,32 @@ public function getSelectCountSql()
 
         return $countSelect;
     }
+
+    /**
+     * Returns pairs identifier - title for unique identifiers
+     * and pairs identifier|entity_id - title for non-unique after first
+     *
+     * @return array
+     */
+    public function toOptionIdArray()
+    {
+        $res = [];
+        $existingIdentifiers = [];
+        foreach ($this as $item) {
+            $identifier = $item->getData('identifier');
+
+            $data['value'] = $identifier;
+            $data['label'] = $item->getData('title');
+
+            if (in_array($identifier, $existingIdentifiers)) {
+                $data['value'] .= '|' . $item->getData($this->getIdFieldName());
+            } else {
+                $existingIdentifiers[] = $identifier;
+            }
+
+            $res[] = $data;
+        }
+
+        return $res;
+    }
 }

app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php

@@ -51,34 +51,6 @@ protected function _construct()
         $this->_map['fields']['store'] = 'store_table.store_id';
     }
 
-    /**
-     * Returns pairs identifier - title for unique identifiers
-     * and pairs identifier|page_id - title for non-unique after first
-     *
-     * @return array
-     */
-    public function toOptionIdArray()
-    {
-        $res = [];
-        $existingIdentifiers = [];
-        foreach ($this as $item) {
-            $identifier = $item->getData('identifier');
-
-            $data['value'] = $identifier;
-            $data['label'] = $item->getData('title');
-
-            if (in_array($identifier, $existingIdentifiers)) {
-                $data['value'] .= '|' . $item->getData('page_id');
-            } else {
-                $existingIdentifiers[] = $identifier;
-            }
-
-            $res[] = $data;
-        }
-
-        return $res;
-    }
-
     /**
      * Set first store flag
      *

app/code/Magento/Cms/Test/Unit/Model/Config/Source/BlockTest.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\Config\Source;
+
+/**
+ * Class BlockTest
+ */
+class BlockTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactory;
+
+    /**
+     * @var \Magento\Cms\Model\Config\Source\Block
+     */
+    protected $block;
+
+    /**
+     * Set up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->collectionFactory = $this->createPartialMock(
+            \Magento\Cms\Model\ResourceModel\Block\CollectionFactory::class,
+            ['create']
+        );
+
+        $this->block = $objectManager->getObject(
+            \Magento\Cms\Model\Config\Source\Block::class,
+            [
+                'collectionFactory' => $this->collectionFactory,
+            ]
+        );
+    }
+
+    /**
+     * Run test toOptionArray method
+     *
+     * @return void
+     */
+    public function testToOptionArray()
+    {
+        $blockCollectionMock = $this->createMock(\Magento\Cms\Model\ResourceModel\Block\Collection::class);
+
+        $this->collectionFactory->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($blockCollectionMock));
+
+        $blockCollectionMock->expects($this->once())
+            ->method('toOptionIdArray')
+            ->will($this->returnValue('return-value'));
+
+        $this->assertEquals('return-value', $this->block->toOptionArray());
+    }
+}