fixes for Static Tests

Author: silinmykola

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -53,6 +53,31 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
     public const COLUMN_ROW_SORT = '_custom_option_row_sort';
 
+    /**
+     * Error codes
+     */
+    public const ERROR_INVALID_STORE = 'optionInvalidStore';
+
+    public const ERROR_INVALID_TYPE = 'optionInvalidType';
+
+    public const ERROR_EMPTY_TITLE = 'optionEmptyTitle';
+
+    public const ERROR_INVALID_PRICE = 'optionInvalidPrice';
+
+    public const ERROR_INVALID_MAX_CHARACTERS = 'optionInvalidMaxCharacters';
+
+    public const ERROR_INVALID_SORT_ORDER = 'optionInvalidSortOrder';
+
+    public const ERROR_INVALID_ROW_PRICE = 'optionInvalidRowPrice';
+
+    public const ERROR_INVALID_ROW_SORT = 'optionInvalidRowSort';
+
+    public const ERROR_AMBIGUOUS_NEW_NAMES = 'optionAmbiguousNewNames';
+
+    public const ERROR_AMBIGUOUS_OLD_NAMES = 'optionAmbiguousOldNames';
+
+    public const ERROR_AMBIGUOUS_TYPES = 'optionAmbiguousTypes';
+
     /**
      * XML path to page size parameter
      */
@@ -229,31 +254,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     protected $_optionCollection;
 
-    /**
-     * Error codes
-     */
-    const ERROR_INVALID_STORE = 'optionInvalidStore';
-
-    const ERROR_INVALID_TYPE = 'optionInvalidType';
-
-    const ERROR_EMPTY_TITLE = 'optionEmptyTitle';
-
-    const ERROR_INVALID_PRICE = 'optionInvalidPrice';
-
-    const ERROR_INVALID_MAX_CHARACTERS = 'optionInvalidMaxCharacters';
-
-    const ERROR_INVALID_SORT_ORDER = 'optionInvalidSortOrder';
-
-    const ERROR_INVALID_ROW_PRICE = 'optionInvalidRowPrice';
-
-    const ERROR_INVALID_ROW_SORT = 'optionInvalidRowSort';
-
-    const ERROR_AMBIGUOUS_NEW_NAMES = 'optionAmbiguousNewNames';
-
-    const ERROR_AMBIGUOUS_OLD_NAMES = 'optionAmbiguousOldNames';
-
-    const ERROR_AMBIGUOUS_TYPES = 'optionAmbiguousTypes';
-
     /**
      * @var CollectionByPagesIterator
      */

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

@@ -21,17 +21,17 @@ class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements T
     /**
      * Constants defined for keys of array, makes typos less likely
      */
-    const KEY_ID              = 'id';
-    const KEY_COUNTRY_ID      = 'tax_country_id';
-    const KEY_REGION_ID       = 'tax_region_id';
-    const KEY_REGION_NAME     = 'region_name';
-    const KEY_POSTCODE        = 'tax_postcode';
-    const KEY_ZIP_IS_RANGE    = 'zip_is_range';
-    const KEY_ZIP_RANGE_FROM  = 'zip_from';
-    const KEY_ZIP_RANGE_TO    = 'zip_to';
-    const KEY_PERCENTAGE_RATE = 'rate';
-    const KEY_CODE            = 'code';
-    const KEY_TITLES          = 'titles';
+    public const KEY_ID              = 'id';
+    public const KEY_COUNTRY_ID      = 'tax_country_id';
+    public const KEY_REGION_ID       = 'tax_region_id';
+    public const KEY_REGION_NAME     = 'region_name';
+    public const KEY_POSTCODE        = 'tax_postcode';
+    public const KEY_ZIP_IS_RANGE    = 'zip_is_range';
+    public const KEY_ZIP_RANGE_FROM  = 'zip_from';
+    public const KEY_ZIP_RANGE_TO    = 'zip_to';
+    public const KEY_PERCENTAGE_RATE = 'rate';
+    public const KEY_CODE            = 'code';
+    public const KEY_TITLES          = 'titles';
 
     /**
      * @var null