creating new page via factory

Author: engcom-Charlie

app/code/Magento/Cms/Model/Page/DataProvider.php

@@ -7,7 +7,7 @@
 
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
-use Magento\Cms\Model\Page;
+use Magento\Cms\Model\PageFactory;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\DataPersistorInterface;
@@ -53,6 +53,11 @@ class DataProvider extends ModifierPoolDataProvider
      */
     private $customLayoutManager;
 
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
     /**
      * @var LoggerInterface
      */
@@ -71,6 +76,7 @@ class DataProvider extends ModifierPoolDataProvider
      * @param RequestInterface|null $request
      * @param CustomLayoutManagerInterface|null $customLayoutManager
      * @param PageRepositoryInterface|null $pageRepository
+     * @param PageFactory|null $pageFactory
      * @param LoggerInterface|null $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -87,6 +93,7 @@ public function __construct(
         ?RequestInterface $request = null,
         ?CustomLayoutManagerInterface $customLayoutManager = null,
         ?PageRepositoryInterface $pageRepository = null,
+        ?PageFactory $pageFactory = null,
         ?LoggerInterface $logger = null
     ) {
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool);
@@ -98,6 +105,7 @@ public function __construct(
         $this->customLayoutManager = $customLayoutManager
             ?? ObjectManager::getInstance()->get(CustomLayoutManagerInterface::class);
         $this->pageRepository = $pageRepository ?? ObjectManager::getInstance()->get(PageRepositoryInterface::class);
+        $this->pageFactory = $pageFactory ?: ObjectManager::getInstance()->get(PageFactory::class);
         $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
@@ -140,24 +148,24 @@ public function getData()
      */
     private function getCurrentPage(): PageInterface
     {
-        $newPage = $this->collection->getNewEmptyItem();
         $pageId = $this->getPageId();
         if ($pageId) {
             try {
                 $page = $this->pageRepository->getById($pageId);
             } catch (LocalizedException $exception) {
-                $page = $newPage;
+                $page = $this->pageFactory->create();
             }
 
             return $page;
         }
 
         $data = $this->dataPersistor->get('cms_page');
         if (empty($data)) {
-            return $newPage;
+            return $this->pageFactory->create();
         }
         $this->dataPersistor->clear('cms_page');
-        $page = $newPage->setData($data);
+        $page = $this->pageFactory->create()
+            ->setData($data);
 
         return $page;
     }