Skip to content

Commit 6e88fd9

Browse files
committed
MC-2338: 3rd party library/dependency upgrade for 2.3 pre Alpha
1 parent 4379caa commit 6e88fd9

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
if (isset($methodsForms[$code])) {
8080
$block->setMethodFormTemplate($code, $methodsForms[$code]);
8181
}
82-
?>
82+
?>
8383
<dt class="item-title">
8484
<?php if ($methodsCount > 1) : ?>
8585
<input type="radio"

app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $orderIds = $block->getOrderIds();
1111
<div class="multicheckout results">
1212
<p class="block-content">
1313
<?php if (!empty($orderIds)) : ?>
14-
<?= $block->escapeHtml(__('Not all items were included.')); ?>
14+
<?= $block->escapeHtml(__('Not all items were included.')); ?>
1515
<?php endif; ?>
1616
<?= $block->escapeHtml(__('For details, see')); ?>
1717
<a href="#failed"><?= $block->escapeHtml(__('Failed to Order')); ?></a>

app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<?php if ($shippingAddress) : ?>
2525
<span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
2626
<span class="shipping-address">
27-
<?= $block->escapeHtml(
28-
$block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
29-
); ?>
27+
<?= $block->escapeHtml(
28+
$block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
29+
); ?>
3030
</span>
3131
<?php else : ?>
3232
<span class="shipping-address">

app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php foreach ($_methods as $_method) :
1818
$_code = $_method->getCode();
1919
$_counter++;
20-
?>
20+
?>
2121
<dt class="admin__field-option">
2222
<?php if ($_methodsCount > 1) : ?>
2323
<input id="p_method_<?= $block->escapeHtml($_code); ?>"

dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
2222
$coupon->setRuleId($items[1]->getId())->setCode('autogenerated_2_2')->setType(1)->save();
2323

24-
// type SPECIFIC with generated coupons
24+
// type SPECIFIC with generated coupons
2525
$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
2626
$coupon->setRuleId($items[2]->getId())->setCode('autogenerated_3_1')->setType(1)->save();
2727
$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);

setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testCollectEntities()
6969
);
7070

7171
$this->assertEquals(
72-
['\Magento\Eav\Api\Data\AttributeExtensionInterface'],
72+
[\Magento\Eav\Api\Data\AttributeExtensionInterface::class],
7373
$this->_model->collectEntities($this->_testFiles)
7474
);
7575
}

0 commit comments

Comments
 (0)