ACPT-1052: Some Luma Storefront Scenarios Are Broken

 - fix static tests

Author: andimov

app/code/Magento/Catalog/Model/Layer.php

@@ -42,29 +42,21 @@ class Layer extends \Magento\Framework\DataObject implements ResetAfterRequestIn
     protected $registry = null;
 
     /**
-     * Store manager
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Catalog product
-     *
      * @var \Magento\Catalog\Model\ResourceModel\Product
      */
     protected $_catalogProduct;
 
     /**
-     * Attribute collection factory
-     *
      * @var AttributeCollectionFactory
      */
     protected $_attributeCollectionFactory;
 
     /**
-     * Layer state factory
-     *
      * @var \Magento\Catalog\Model\Layer\StateFactory
      */
     protected $_layerStateFactory;
@@ -188,6 +180,7 @@ public function apply()
 
     /**
      * Retrieve current category model
+     *
      * If no category found in registry, the root will be taken
      *
      * @return \Magento\Catalog\Model\Category

app/code/Magento/CatalogRule/Model/Rule.php

@@ -36,22 +36,23 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Rule\Model\AbstractModel;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Catalog Rule data model
  *
- * @method \Magento\CatalogRule\Model\Rule setFromDate(string $value)
- * @method \Magento\CatalogRule\Model\Rule setToDate(string $value)
- * @method \Magento\CatalogRule\Model\Rule setCustomerGroupIds(string $value)
+ * @method Rule setFromDate(string $value)
+ * @method Rule setToDate(string $value)
+ * @method Rule setCustomerGroupIds(string $value)
  * @method string getWebsiteIds()
- * @method \Magento\CatalogRule\Model\Rule setWebsiteIds(string $value)
+ * @method Rule setWebsiteIds(string $value)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
-class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, IdentityInterface, ResetAfterRequestInterface
+class Rule extends AbstractModel implements RuleInterface, IdentityInterface, ResetAfterRequestInterface
 {
     /**
      * Prefix of model events names

app/code/Magento/Directory/Model/Country.php

@@ -65,6 +65,8 @@ public function __construct(
     }
 
     /**
+     * Country model constructor
+     *
      * @return void
      */
     protected function _construct()
@@ -95,6 +97,8 @@ public function getRegions()
     }
 
     /**
+     * Get region collection with loaded data
+     *
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
      */
     public function getLoadedRegionCollection()
@@ -105,6 +109,8 @@ public function getLoadedRegionCollection()
     }
 
     /**
+     * Get region collection
+     *
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
      */
     public function getRegionCollection()
@@ -115,6 +121,8 @@ public function getRegionCollection()
     }
 
     /**
+     * Format address
+     *
      * @param \Magento\Framework\DataObject $address
      * @param bool $html
      * @return string
@@ -204,9 +212,10 @@ public function getFormat($type)
     /**
      * Get country name
      *
+     * @param ?string $locale
      * @return string
      */
-    public function getName($locale = null)
+    public function getName(string $locale = null)
     {
         if ($locale == null) {
             $cache_key = 'name_default';

app/code/Magento/Directory/Model/ResourceModel/Currency.php

@@ -17,7 +17,7 @@
 class Currency extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements ResetAfterRequestInterface
 {
     /**
-     * Currency rate table
+     * Currency rate table name
      *
      * @var string
      */

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -35,7 +35,9 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-abstract class AbstractEntity extends AbstractResource implements EntityInterface, DefaultAttributesProvider,
+abstract class AbstractEntity extends AbstractResource implements
+    EntityInterface,
+    DefaultAttributesProvider,
     ResetAfterRequestInterface
 {
     /**

app/code/Magento/GraphQl/Model/Query/Resolver/Context.php

@@ -13,15 +13,15 @@
 /**
  * Do not use this class. It was kept for backward compatibility.
  *
- * @deprecated 100.3.3 \Magento\GraphQl\Model\Query\Context is used instead of this
+ * @deprecated 100.3.3 @see \Magento\GraphQl\Model\Query\Context
  */
 class Context extends \Magento\Framework\Model\AbstractExtensibleModel implements ContextInterface
 {
     /**#@+
      * Constants defined for type of context
      */
-    const USER_TYPE_ID  = 'user_type';
-    const USER_ID = 'user_id';
+    public const USER_TYPE_ID  = 'user_type';
+    public const USER_ID = 'user_id';
     /**#@-*/
 
     /**
@@ -95,6 +95,4 @@ public function _resetState(): void
     {
         $this->_data = [];
     }
-
-
 }

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

@@ -30,37 +30,37 @@ class Calculation extends \Magento\Framework\Model\AbstractModel implements Rese
     /**
      * Identifier constant for Tax calculation before discount excluding TAX
      */
-    const CALC_TAX_BEFORE_DISCOUNT_ON_EXCL = '0_0';
+    public const CALC_TAX_BEFORE_DISCOUNT_ON_EXCL = '0_0';
 
     /**
      * Identifier constant for Tax calculation before discount including TAX
      */
-    const CALC_TAX_BEFORE_DISCOUNT_ON_INCL = '0_1';
+    public const CALC_TAX_BEFORE_DISCOUNT_ON_INCL = '0_1';
 
     /**
      * Identifier constant for Tax calculation after discount excluding TAX
      */
-    const CALC_TAX_AFTER_DISCOUNT_ON_EXCL = '1_0';
+    public const CALC_TAX_AFTER_DISCOUNT_ON_EXCL = '1_0';
 
     /**
      * Identifier constant for Tax calculation after discount including TAX
      */
-    const CALC_TAX_AFTER_DISCOUNT_ON_INCL = '1_1';
+    public const CALC_TAX_AFTER_DISCOUNT_ON_INCL = '1_1';
 
     /**
      * Identifier constant for unit based calculation
      */
-    const CALC_UNIT_BASE = 'UNIT_BASE_CALCULATION';
+    public const CALC_UNIT_BASE = 'UNIT_BASE_CALCULATION';
 
     /**
      * Identifier constant for row based calculation
      */
-    const CALC_ROW_BASE = 'ROW_BASE_CALCULATION';
+    public const CALC_ROW_BASE = 'ROW_BASE_CALCULATION';
 
     /**
      * Identifier constant for total based calculation
      */
-    const CALC_TOTAL_BASE = 'TOTAL_BASE_CALCULATION';
+    public const CALC_TOTAL_BASE = 'TOTAL_BASE_CALCULATION';
 
     /**
      * Identifier constant for unit based calculation
@@ -169,22 +169,16 @@ class Calculation extends \Magento\Framework\Model\AbstractModel implements Rese
     protected $priceCurrency;
 
     /**
-     * Filter Builder
-     *
      * @var FilterBuilder
      */
     protected $filterBuilder;
 
     /**
-     * Search Criteria Builder
-     *
      * @var SearchCriteriaBuilder
      */
     protected $searchCriteriaBuilder;
 
     /**
-     * Tax Class Repository
-     *
      * @var TaxClassRepositoryInterface
      */
     protected $taxClassRepository;
@@ -250,6 +244,8 @@ public function __construct(
     }
 
     /**
+     * Tax Calculation Model Contructor
+     *
      * @return void
      */
     protected function _construct()
@@ -495,7 +491,7 @@ protected function _isCrossBorderTradeEnabled($store = null)
      * @param null|int $customerTaxClass
      * @param null|int|\Magento\Store\Model\Store $store
      * @param int $customerId
-     * @return  \Magento\Framework\DataObject
+     * @return \Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -651,6 +647,7 @@ public function reproduceProcess($rates)
 
     /**
      * Calculate rated tax amount based on price and tax rate.
+     *
      * If you are using price including tax $priceIncludeTax should be true.
      *
      * @param   float $price
@@ -688,6 +685,8 @@ public function round($price)
     }
 
     /**
+     * Get Tax Rates
+     *
      * @param array $billingAddress
      * @param array $shippingAddress
      * @param int $customerTaxClassId

app/code/Magento/Tax/Model/ClassModelRegistry.php

@@ -17,8 +17,6 @@
 class ClassModelRegistry implements ResetAfterRequestInterface
 {
     /**
-     * Tax class model factory
-     *
      * @var TaxClassModelFactory
      */
     private $taxClassModelFactory;

app/code/Magento/Tax/Model/TaxCalculation.php

@@ -81,15 +81,11 @@ class TaxCalculation implements TaxCalculationInterface, ResetAfterRequestInterf
     private $parentToChildren;
 
     /**
-     * Tax Class Management
-     *
      * @var TaxClassManagementInterface
      */
     protected $taxClassManagement;
 
     /**
-     * Calculator Factory
-     *
      * @var CalculatorFactory
      */
     protected $calculatorFactory;
@@ -130,7 +126,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function calculateTax(
         \Magento\Tax\Api\Data\QuoteDetailsInterface $quoteDetails,
@@ -201,7 +197,7 @@ public function calculateTax(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultCalculatedRate(
         $productTaxClassID,
@@ -212,7 +208,7 @@ public function getDefaultCalculatedRate(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCalculatedRate(
         $productTaxClassID,

app/code/Magento/UrlRewrite/Model/UrlRewrite.php

@@ -242,6 +242,6 @@ public function afterSave()
      */
     public function _resetState(): void
     {
-       $this->entityToCacheTagMap = [];
+        $this->entityToCacheTagMap = [];
     }
 }