From e5b5bc10ba53634a7b5de257ed10e3fa3d472023 Mon Sep 17 00:00:00 2001
From: Surabhi Srivastava <surabhisrivastava@cedcoss.com>
Date: Sat, 4 May 2019 06:16:50 +0000
Subject: [PATCH 1/4] Fixed issue #22640

Fixed issue #22640
---
 .../Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index c0d185c36b0d6..14abaeba0c71a 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -10,7 +10,7 @@
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
+<div class="form-inline admin__scope-old" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
     <?= $block->getFormHtml() ?>
     <?= $block->getChildHtml('form_after') ?>
 </div>

From ae9fa7981ef8925baf8ed8f0914440d700cf70aa Mon Sep 17 00:00:00 2001
From: Surabhi Srivastava <surabhisrivastava@cedcoss.com>
Date: Sat, 4 May 2019 06:49:06 +0000
Subject: [PATCH 2/4] Fixed issue #22640

Fixed issue #22640
---
 app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index c4c4f28e8a7d1..25e0599a1dcc1 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -176,7 +176,7 @@ protected function _prepareForm()
         }
 
         $legend = $this->getShowLegend() ? __('Tax Rate Information') : '';
-        $fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend, 'class' => 'form-inline']);
+        $fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend, 'class' => 'admin__scope-old form-inline']);
 
         if (isset($formData['tax_calculation_rate_id']) && $formData['tax_calculation_rate_id'] > 0) {
             $fieldset->addField(

From a2fc106bf4808cdccf179e288f71ba36ed1e1958 Mon Sep 17 00:00:00 2001
From: Surabhi Srivastava <surabhisrivastava@cedcoss.com>
Date: Sat, 4 May 2019 07:00:32 +0000
Subject: [PATCH 3/4] Changes done in wrong file so i am reverting my chnages

Changes done in wrong file so i am reverting my chnages
---
 .../Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index 14abaeba0c71a..c0d185c36b0d6 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -10,7 +10,7 @@
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline admin__scope-old" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
+<div class="form-inline" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
     <?= $block->getFormHtml() ?>
     <?= $block->getChildHtml('form_after') ?>
 </div>

From 6fc7d7a27a251a19da1afd0afa230bbc6fb8b96d Mon Sep 17 00:00:00 2001
From: Nazarn96 <nazarn96@gmail.com>
Date: Tue, 7 May 2019 13:03:42 +0300
Subject: [PATCH 4/4] magento/magento2#22655 static-test-fix

---
 app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 25e0599a1dcc1..790d19ceaeaa7 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -17,6 +17,8 @@
 use Magento\Tax\Controller\RegistryConstants;
 
 /**
+ * Tax rate form.
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -110,7 +112,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -119,6 +121,8 @@ protected function _construct()
     }
 
     /**
+     * Prepare form before rendering HTML.
+     *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -132,8 +136,9 @@ protected function _prepareForm()
             if ($taxRateId) {
                 $taxRateDataObject = $this->_taxRateRepository->get($taxRateId);
             }
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (NoSuchEntityException $e) {
-            /* tax rate not found */
+            //tax rate not found//
         }
 
         $sessionFormValues = (array)$this->_coreRegistry->registry(RegistryConstants::CURRENT_TAX_RATE_FORM_DATA);
@@ -176,7 +181,10 @@ protected function _prepareForm()
         }
 
         $legend = $this->getShowLegend() ? __('Tax Rate Information') : '';
-        $fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend, 'class' => 'admin__scope-old form-inline']);
+        $fieldset = $form->addFieldset(
+            'base_fieldset',
+            ['legend' => $legend, 'class' => 'admin__scope-old form-inline']
+        );
 
         if (isset($formData['tax_calculation_rate_id']) && $formData['tax_calculation_rate_id'] > 0) {
             $fieldset->addField(