Skip to content

Fixed use inconsistently viewModels in codebase #31503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixed use inconsistently viewModels in codebase #31503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@
</arguments>
</referenceBlock>

<!-- Argument viewModel was discouraged use view_model argument instead, viewModel will be remove in next release -->
<referenceBlock name="breadcrumbs" template="Magento_Catalog::product/breadcrumbs.phtml">
<arguments>
<argument name="viewModel" xsi:type="object">Magento\Catalog\ViewModel\Product\Breadcrumbs</argument>
<argument name="view_model" xsi:type="object">Magento\Catalog\ViewModel\Product\Breadcrumbs</argument>
</arguments>
</referenceBlock>

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
/** @var \Magento\Theme\Block\Html\Breadcrumbs $block */
/** @var \Magento\Catalog\ViewModel\Product\Breadcrumbs $viewModel */
$viewModel = $block->getData('viewModel');
$viewModel = $block->getViewModel();
?>
<div class="breadcrumbs"></div>
<?php
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
<container name="extra_customer_info"/>
</block>
<block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
<!-- Argument viewModel was discouraged use view_model argument instead, viewModel will be remove in next release -->
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="Magento_Sales::order/creditmemo/create/items.phtml">
<arguments>
<argument name="viewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
<argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
<argument name="itemsToRenderViewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\ItemsToRender</argument>
</arguments>
<block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="order_items.default" as="default" template="Magento_Sales::order/creditmemo/create/items/renderer/default.phtml"/>
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<update handle="sales_order_item_price"/>
<body>
<!-- Argument viewModel was discouraged use view_model argument instead, viewModel will be remove in next release -->
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="Magento_Sales::order/creditmemo/create/items.phtml">
<arguments>
<argument name="viewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
<argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
<argument name="itemsToRenderViewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\ItemsToRender</argument>
</arguments>
<block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="order_items.default" as="default" template="Magento_Sales::order/creditmemo/create/items/renderer/default.phtml"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
?>
<?php
/** @var Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton $viewModel */
$viewModel = $block->getData('viewModel');
$viewModel = $block->getViewModel();
/** @var Magento\Sales\ViewModel\CreditMemo\Create\ItemsToRender $itemsToRenderViewModel */
$itemsToRenderViewModel = $block->getData('itemsToRenderViewModel');
$_items = $itemsToRenderViewModel->getItems();
Expand Down
4 changes: 3 additions & 1 deletion lib/internal/Magento/Framework/View/Element/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
* Example:
* <block name="my.block" class="Magento\Framework\View\Element\Template" template="My_Module::template.phtml" >
* <arguments>
* <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
* <argument name="view_model" xsi:type="object">My\Module\ViewModel\Custom</argument>
* </arguments>
* </block>
*
* Your class object can then be accessed by doing $block->getViewModel()
*
* @api
* @SuppressWarnings(PHPMD.NumberOfChildren)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
Expand Down