Fix static test failures

Author: fredden

app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php

@@ -25,7 +25,7 @@
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
-    const FORM_ELEMENT_ID = 'rate-form';
+    public const FORM_ELEMENT_ID = 'rate-form';
 
     /**
      * @var null
@@ -38,8 +38,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     protected $_template = 'Magento_Tax::rate/form.phtml';
 
     /**
-     * Tax data
-     *
      * @var \Magento\Tax\Helper\Data|null
      */
     protected $_taxData = null;

app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php

@@ -90,6 +90,8 @@ public function getTitles()
     }
 
     /**
+     * Return all the stores
+     *
      * @return mixed
      */
     public function getStores()

app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php

@@ -35,6 +35,8 @@ public function __construct(
     }
 
     /**
+     * Get title formatted in HTML
+     *
      * @return string
      */
     public function getBasicChildrenHtml()

app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php

@@ -48,7 +48,7 @@ public function __construct(
     }
 
     /**
-     * {$@inheritdoc}
+     * @inheritDoc
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -57,7 +57,7 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
     }
 
     /**
-     * {$@inheritdoc}
+     * @inheritDoc
      */
     public function removeButton($buttonId)
     {
@@ -66,6 +66,8 @@ public function removeButton($buttonId)
     }
 
     /**
+     * Prepare the layout
+     *
      * @return $this
      */
     protected function _prepareLayout()
@@ -84,7 +86,7 @@ protected function _prepareLayout()
     }
 
     /**
-     * {$@inheritdoc}
+     * @inheritDoc
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -93,7 +95,7 @@ public function updateButton($buttonId, $key, $data)
     }
 
     /**
-     * {$@inheritdoc}
+     * @inheritDoc
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {

app/code/Magento/Tax/Block/Adminhtml/Rule.php

@@ -16,6 +16,8 @@
 class Rule extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
+     * Initialise the block
+     *
      * @return void
      */
     protected function _construct()

app/code/Magento/Tax/Block/Item/Price/Renderer.php

@@ -105,6 +105,8 @@ public function setZone($zone)
     }
 
     /**
+     * Return the store ID
+     *
      * @return int|null|string
      */
     public function getStoreId()
@@ -200,8 +202,7 @@ public function formatPrice($price)
     }
 
     /**
-     * Get item price in display currency or order currency depending
-     * on item type
+     * Get item price in display currency or order currency depending on item type
      *
      * @return float
      */

app/code/Magento/Tax/Controller/Adminhtml/Rule.php

@@ -19,11 +19,9 @@ abstract class Rule extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
+    public const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;

app/code/Magento/Tax/Controller/Adminhtml/Tax.php

@@ -18,7 +18,7 @@ abstract class Tax extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
+    public const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
 
     /**
      * @var \Magento\Tax\Api\TaxClassRepositoryInterface

app/code/Magento/Tax/Model/Calculation/Rate/Title.php

@@ -19,11 +19,13 @@ class Title extends \Magento\Framework\Model\AbstractExtensibleModel implements
      *
      * Tax rate field key.
      */
-    const KEY_STORE_ID = 'store_id';
-    const KEY_VALUE_ID = 'value';
+    public const KEY_STORE_ID = 'store_id';
+    public const KEY_VALUE_ID = 'value';
     /**#@-*/
 
     /**
+     * Initialise the model
+     *
      * @return void
      */
     protected function _construct()
@@ -32,6 +34,8 @@ protected function _construct()
     }
 
     /**
+     * Delete a rate with specified ID
+     *
      * @param int $rateId
      * @return $this
      */
@@ -41,17 +45,18 @@ public function deleteByRateId($rateId)
         return $this;
     }
 
+    // @codeCoverageIgnoreStart
+
     /**
-     * @codeCoverageIgnoreStart
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getStoreId()
     {
         return $this->getData(self::KEY_STORE_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getValue()
     {
@@ -83,7 +88,7 @@ public function setValue($value)
     // @codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      *
      * @return \Magento\Tax\Api\Data\TaxRateTitleExtensionInterface|null
      */
@@ -93,7 +98,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      *
      * @param \Magento\Tax\Api\Data\TaxRateTitleExtensionInterface $extensionAttributes
      * @return $this

app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule/Collection.php

@@ -168,7 +168,6 @@ public function setClassTypeFilter($type, $id)
                 break;
             default:
                 throw new \Magento\Framework\Exception\LocalizedException(__('Invalid type supplied'));
-                break;
         }
 
         $this->joinCalculationData('cd');