Skip to content

FIX: remove not used count() from templates #12901

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

Merged
merged 1 commit into from
Jan 9, 2018
Merged

FIX: remove not used count() from templates #12901

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
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<?php $items = $block->getChildren($parentItem) ?>
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?>

<?php $_prevOptionId = '' ?>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>

<?php $items = $block->getChildren($parentItem) ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?>

<?php $_prevOptionId = '' ?>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
?>
<?php $parentItem = $block->getItem() ?>
<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?>

<?php $_prevOptionId = '' ?>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<?php $parentItem = $block->getItem() ?>
<?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
<?php $shipItems = $block->getChildren($parentItem) ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?>

<?php $_prevOptionId = '' ?>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
</tr>
</thead>
<?php $_items = $_creditmemo->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) {
continue;
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
</tr>
</thead>
<?php $_items = $_invoice->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) {
continue;
Expand Down
7 changes: 3 additions & 4 deletions app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@
</tr>
</thead>
<?php $_items = $_creditmemo->getAllItems(); ?>
<?php $_count = count($_items); ?>
<?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) {
continue;
} ?>
<?php if ($_item->getOrderItem()->getParentItem()): ?>
continue;
Copy link
Contributor

@ihor-sviziev ihor-sviziev Jan 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continue; will be shown. It is regression. Am I wrong?
@orlangur could you check it?

It was merged "as is" in 0d04ec6

Copy link
Contributor Author

@coderimus coderimus Jan 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ihor-sviziev @orlangur thank you for your review. Yep, it was an error. Thanks once more for your help!

<?php endif; ?>
<tbody>
<?= $block->getItemHtml($_item) ?>
</tbody>
Expand Down
7 changes: 3 additions & 4 deletions app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@
</tr>
</thead>
<?php $_items = $_invoice->getItemsCollection(); ?>
<?php $_count = $_items->count(); ?>
<?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) {
continue;
} ?>
<?php if ($_item->getOrderItem()->getParentItem()): ?>
continue;
Copy link
Contributor

@ihor-sviziev ihor-sviziev Jan 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same issue it there.

Copy link
Contributor Author

@coderimus coderimus Jan 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ihor-sviziev Thank you so much for your review. Sorry, it was my fail :(

Copy link
Contributor

@ihor-sviziev ihor-sviziev Jan 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coderimus no problem. I just created new PR that fixing this issue

<?php endif; ?>
<tbody>
<?= $block->getItemHtml($_item) ?>
</tbody>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Shipping/view/frontend/templates/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
</tr>
</thead>
<?php $_items = $_shipment->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) {
continue;
Expand Down