MC-33823: Merge CE, EE and B2B changes

Oleksandr Gorkun · Oleksandr Gorkun · commit cd58d3d601fa · 2020-05-15T11:34:04.000-05:00
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -87,9 +87,7 @@ switch ($block->getCheckoutType()):
                                 <div class="control">
                                     <textarea id="gift-message-whole-message" class="input-text"
                                               name="giftmessage[quote][<?=(int)$block->getEntity()->getId()?>][message]"
-                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10">
-                                        <?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?>
-                                    </textarea>
+                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
@@ -196,11 +194,7 @@ script;
                                                       name="giftmessage[quote_item][<?= (int) $_item->getId()
                                                         ?>][message]"
                                                       title="<?= $block->escapeHtmlAttr(__('Message')) ?>"
-                                                      rows="5" cols="40">
-                                                <?= /* @noEscape */ $block->getEscaped(
-                                                    $block->getMessage($_item)->getMessage()
-                                                ) ?>
-                                            </textarea>
+                                                      rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
                                          </div>
                                      </div>
                                 </fieldset>
@@ -322,9 +316,7 @@ script;
                                     <textarea id="gift-message-<?= (int) $block->getEntity()->getId() ?>-message"
                                               class="input-text" name="giftmessage[quote_address][<?= (int) $block
                                                 ->getEntity()->getId() ?>][message]"
-                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40">
-                                        <?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?>
-                                    </textarea>
+                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
@@ -429,10 +421,7 @@ script;
                                                           name="giftmessage[quote_address_item][<?= (int) $_item
                                                               ->getId() ?>][message]"
                                                           title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5"
-                                                          cols="10">
-                                                    <?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)
-                                                        ->getMessage()) ?>
-                                                </textarea>
+                                                          cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
                                             </div>
                                         </div>
                                  </fieldset>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
@@ -106,10 +106,10 @@ public function testRenderEventListenerAsTag(): void
      * Check handler validation
      *
      * @return void
-     * @expectedException \InvalidArgumentException
      */
     public function testInvalidEventListener(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->helper->renderEventListenerAsTag('nonevent', '', '');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,10 @@ public function testRenderEventListenerAsTag(): void`
`106`	`106`	`* Check handler validation`
`107`	`107`	`*`
`108`	`108`	`* @return void`
`109`		`- * @expectedException \InvalidArgumentException`
`110`	`109`	`*/`
`111`	`110`	`public function testInvalidEventListener(): void`
`112`	`111`	`{`
	`112`	`+ $this->expectException(\InvalidArgumentException::class);`
`113`	`113`	`$this->helper->renderEventListenerAsTag('nonevent', '', '');`
`114`	`114`	`}`
`115`	`115`