Skip to content

Commit 4dfbf2d

Browse files
committed
minor fixes
1 parent 1c34014 commit 4dfbf2d

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

dev/tests/integration/testsuite/Magento/Cms/_files/home_with_custom_handle.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
use Magento\Cms\Api\PageRepositoryInterface;
8+
use Magento\Cms\Model\ResourceModel\Page as PageResource;
99
use Magento\Cms\Model\Page as PageModel;
1010
use Magento\Cms\Model\PageFactory as PageModelFactory;
1111
use Magento\TestFramework\Cms\Model\CustomLayoutManager;
@@ -23,14 +23,14 @@
2323

2424
/**
2525
* @var PageModel $page
26-
* @var PageRepositoryInterface $pageRepository
26+
* @var PageResource $pageResource
2727
*/
2828
$page = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
29-
$pageRepository = $objectManager->create(PageRepositoryInterface::class);
29+
$pageResource = $objectManager->create(PageResource::class);
3030

31-
$page = $pageRepository->getById('home');
31+
$pageResource->load($page, 'home');
3232
$cmsPageId = (int)$page->getId();
3333

3434
$fakeManager->fakeAvailableFiles($cmsPageId, [$customLayoutName]);
3535
$page->setData('layout_update_selected', $customLayoutName);
36-
$pageRepository->save($page);
36+
$pageResource->save($page);

dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
declare(strict_types=1);
88

9-
use Magento\Cms\Api\PageRepositoryInterface;
109
use Magento\Cms\Model\Page as PageModel;
10+
use Magento\Cms\Model\ResourceModel\Page as PageResource;
1111
use Magento\Cms\Model\PageFactory as PageModelFactory;
1212
use Magento\TestFramework\Cms\Model\CustomLayoutManager;
1313
use Magento\TestFramework\Helper\Bootstrap;
@@ -19,8 +19,8 @@
1919
$fakeManager = $objectManager->get(CustomLayoutManager::class);
2020
$layoutRepo = $objectManager->create(PageModel\CustomLayoutRepositoryInterface::class, ['manager' => $fakeManager]);
2121

22-
/** @var PageRepositoryInterface $pageRepository */
23-
$pageRepository = $objectManager->create(PageRepositoryInterface::class);
22+
/** @var PageResource $pageRepository */
23+
$pageResource = $objectManager->create(PageResource::class);
2424

2525
/** @var PageModel $page */
2626
$page = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
@@ -30,15 +30,15 @@
3030
$page->setLayoutUpdateXml('<container />');
3131
$page->setIsActive(true);
3232
$page->setStoreId(0);
33-
$pageRepository->save($page);
33+
$pageResource->save($page);
3434

3535
/** @var PageModel $page2 */
3636
$page2 = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
3737
$page2->setIdentifier('test_custom_layout_page_2');
3838
$page2->setTitle('Test Page 2');
3939
$page->setIsActive(true);
4040
$page->setStoreId(0);
41-
$pageRepository->save($page2);
41+
$pageResource->save($page2);
4242

4343
/** @var PageModel $page3 */
4444
$page3 = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
@@ -48,8 +48,7 @@
4848
$page3->setIsActive(1);
4949
$page3->setContent('<h1>Test Page</h1>');
5050
$page3->setPageLayout('1column');
51-
$pageRepository->save($page3);
52-
51+
$pageResource->save($page3);
5352
$fakeManager->fakeAvailableFiles((int)$page3->getId(), ['test_selected']);
5453
$page3->setData('layout_update_selected', 'test_selected');
55-
$pageRepository->save($page3);
54+
$pageResource->save($page3);

dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml_rollback.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,21 @@
2020
*/
2121
$page = $pageFactory->create();
2222
$pageResource = $objectManager->create(PageResource::class);
23-
24-
$page = $pageResource->load($page, 'test_custom_layout_page_1', PageModel::IDENTIFIER);
23+
$pageResource->load($page, 'test_custom_layout_page_1', PageModel::IDENTIFIER);
2524
if ($page->getId()) {
2625
$pageResource->delete($page);
2726
}
2827

2928
/** @var PageModel $page2 */
3029
$page2 = $pageFactory->create();
31-
$page2 = $pageResource->load($page2, 'test_custom_layout_page_2', PageModel::IDENTIFIER);
30+
$pageResource->load($page2, 'test_custom_layout_page_2', PageModel::IDENTIFIER);
3231
if ($page2->getId()) {
3332
$pageResource->delete($page2);
3433
}
3534

3635
/** @var PageModel $page3 */
3736
$page3 = $pageFactory->create();
38-
$page3 = $pageResource->load($page3, 'test_custom_layout_page_3', PageModel::IDENTIFIER);
37+
$pageResource->load($page3, 'test_custom_layout_page_3', PageModel::IDENTIFIER);
3938
if ($page3->getId()) {
4039
$pageResource->delete($page3);
4140
}

0 commit comments

Comments
 (0)