MC-2338: 3rd party library/dependency upgrade for 2.3 pre Alpha

VitaliyBoyko · Jun 29, 2018 · 6e88fd9 · 6e88fd9
1 parent 4379caa
commit 6e88fd9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -79,7 +79,7 @@
                                 if (isset($methodsForms[$code])) {
                                     $block->setMethodFormTemplate($code, $methodsForms[$code]);
                                 }
-                            ?>
+                                ?>
                             <dt class="item-title">
                                 <?php if ($methodsCount > 1) : ?>
                                     <input type="radio"

diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml
@@ -11,7 +11,7 @@ $orderIds = $block->getOrderIds();
 <div class="multicheckout results">
     <p class="block-content">
         <?php if (!empty($orderIds)) : ?>
-        <?= $block->escapeHtml(__('Not all items were included.')); ?>
+            <?= $block->escapeHtml(__('Not all items were included.')); ?>
         <?php endif; ?>
         <?= $block->escapeHtml(__('For details, see')); ?>
         <a href="#failed"><?= $block->escapeHtml(__('Failed to Order')); ?></a>

diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -24,9 +24,9 @@
                         <?php if ($shippingAddress) : ?>
                         <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
                         <span class="shipping-address">
-                        <?= $block->escapeHtml(
-                            $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
-                        ); ?>
+                            <?= $block->escapeHtml(
+                                $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
+                            ); ?>
                         </span>
                         <?php else : ?>
                             <span class="shipping-address">

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -17,7 +17,7 @@
     <?php foreach ($_methods as $_method) :
         $_code = $_method->getCode();
         $_counter++;
-    ?>
+        ?>
         <dt class="admin__field-option">
         <?php if ($_methodsCount > 1) : ?>
             <input id="p_method_<?= $block->escapeHtml($_code); ?>"

diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php
@@ -21,7 +21,7 @@
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
 $coupon->setRuleId($items[1]->getId())->setCode('autogenerated_2_2')->setType(1)->save();
 
-// type SPECIFIC with generated coupons 
+// type SPECIFIC with generated coupons
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
 $coupon->setRuleId($items[2]->getId())->setCode('autogenerated_3_1')->setType(1)->save();
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);

diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
@@ -69,7 +69,7 @@ public function testCollectEntities()
         );
 
         $this->assertEquals(
-            ['\Magento\Eav\Api\Data\AttributeExtensionInterface'],
+            [\Magento\Eav\Api\Data\AttributeExtensionInterface::class],
             $this->_model->collectEntities($this->_testFiles)
         );
     }