MC-18527: Merge release branch into 2.3-develop

- minor code changes

Author: krissyhiserote

app/code/Magento/AdminAnalytics/Model/ResourceModel/Viewer/Logger.php

@@ -18,6 +18,9 @@
  */
 class Logger
 {
+    /**
+     * Admin Analytics usage version log table name
+     */
     const LOG_TABLE_NAME = 'admin_analytics_usage_version_log';
 
     /**

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php

@@ -12,7 +12,6 @@
 use Magento\Framework\Registry;
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\Framework\App\Request\DataPersistorInterface;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * Save action for catalog rule
@@ -26,27 +25,19 @@ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog imple
      */
     protected $dataPersistor;
 
-    /**
-     * @var TimezoneInterface
-     */
-    private $localeDate;
-
     /**
      * @param Context $context
      * @param Registry $coreRegistry
      * @param Date $dateFilter
      * @param DataPersistorInterface $dataPersistor
-     * @param TimezoneInterface $localeDate
      */
     public function __construct(
         Context $context,
         Registry $coreRegistry,
         Date $dateFilter,
-        DataPersistorInterface $dataPersistor,
-        TimezoneInterface $localeDate
+        DataPersistorInterface $dataPersistor
     ) {
         $this->dataPersistor = $dataPersistor;
-        $this->localeDate = $localeDate;
         parent::__construct($context, $coreRegistry, $dateFilter);
     }
 
@@ -55,15 +46,16 @@ public function __construct(
      *
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
         if ($this->getRequest()->getPostValue()) {
+
             /** @var \Magento\CatalogRule\Api\CatalogRuleRepositoryInterface $ruleRepository */
             $ruleRepository = $this->_objectManager->get(
                 \Magento\CatalogRule\Api\CatalogRuleRepositoryInterface::class
             );
+
             /** @var \Magento\CatalogRule\Model\Rule $model */
             $model = $this->_objectManager->create(\Magento\CatalogRule\Model\Rule::class);
 
@@ -73,9 +65,7 @@ public function execute()
                     ['request' => $this->getRequest()]
                 );
                 $data = $this->getRequest()->getPostValue();
-                if (!$this->getRequest()->getParam('from_date')) {
-                    $data['from_date'] = $this->localeDate->formatDate();
-                }
+
                 $filterValues = ['from_date' => $this->_dateFilter];
                 if ($this->getRequest()->getParam('to_date')) {
                     $filterValues['to_date'] = $this->_dateFilter;

app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php

@@ -101,9 +101,7 @@ public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
             $scopeTz = new \DateTimeZone(
                 $this->localeDate->getConfigTimezone(ScopeInterface::SCOPE_WEBSITE, $websiteId)
             );
-            $fromTime = $rule->getFromDate()
-                ? (new \DateTime($rule->getFromDate(), $scopeTz))->getTimestamp()
-                : 0;
+            $fromTime = (new \DateTime($rule->getFromDate(), $scopeTz))->getTimestamp();
             $toTime = $rule->getToDate()
                 ? (new \DateTime($rule->getToDate(), $scopeTz))->getTimestamp() + IndexBuilder::SECONDS_IN_DAY - 1
                 : 0;

app/code/Magento/Customer/Model/Session.php

@@ -441,7 +441,7 @@ public function setCustomerAsLoggedIn($customer)
     }
 
     /**
-     * Sets customer data as logged in
+     * Sets customer as logged in
      *
      * @param CustomerData $customer
      * @return $this
@@ -593,7 +593,7 @@ public function regenerateId()
     }
 
     /**
-     * Creates URL factory
+     * Creates URL object
      *
      * @return \Magento\Framework\UrlInterface
      */

app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

@@ -15,18 +15,34 @@
 /**
  * Class Downloadable
  *
+ * phpcs:disable Magento2.Commenting.ConstantsPHPDocFormatting
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
+    /**
+     * Pair value separator.
+     */
     const PAIR_VALUE_SEPARATOR = '=';
 
+    /**
+     * Default sort order
+     */
     const DEFAULT_SORT_ORDER = 0;
 
+    /**
+     * Default number of downloads
+     */
     const DEFAULT_NUMBER_OF_DOWNLOADS = 0;
 
+    /**
+     * Default is shareable
+     */
     const DEFAULT_IS_SHAREABLE = 2;
 
+    /**
+     * Default website id
+     */
     const DEFAULT_WEBSITE_ID = 0;
 
     /**
@@ -64,6 +80,9 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      */
     const COL_DOWNLOADABLE_LINKS = 'downloadable_links';
 
+    /**
+     * Default group title
+     */
     const DEFAULT_GROUP_TITLE = '';
 
     /**

app/code/Magento/ImportExport/Model/Import.php

@@ -107,6 +107,9 @@ class Import extends AbstractModel
      */
     const DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR = ',';
 
+    /**
+     * Import empty attribute default value
+     */
     const DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '__EMPTY__VALUE__';
     const DEFAULT_SIZE = 50;
     const MAX_IMPORT_CHUNKS = 4;

dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php

@@ -7,6 +7,7 @@
 
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteRepository;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 
@@ -18,13 +19,15 @@
 $quoteFactory = $objectManager->get(QuoteFactory::class);
 /** @var QuoteRepository $quoteRepository */
 $quoteRepository = $objectManager->get(QuoteRepository::class);
+/** @var Store $store */
+$store = $objectManager->get(Store::class);
 
 $quotes = [
     'quote for first store' => [
-        'store' => 1,
+        'store' => $store->load('default', 'code')->getId(),
     ],
     'quote for second store' => [
-        'store' => $storeId,
+        'store' => $store->load('test_second_store', 'code')->getId(),
     ],
 ];
 

dev/tests/integration/testsuite/Magento/Store/_files/second_store.php

@@ -8,8 +8,7 @@
 
 /** @var \Magento\Store\Model\Store $store */
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-$storeId = $store->load('fixture_second_store', 'code')->getId();
-if (!$storeId) {
+if (!$store->load('fixture_second_store', 'code')->getId()) {
     $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
         \Magento\Store\Model\StoreManagerInterface::class
     )->getWebsite()
@@ -31,6 +30,4 @@
         1
     );
     $store->save();
-
-    $storeId = $store->getId();
 }

lib/internal/Magento/Framework/App/ProductMetadata.php

@@ -67,7 +67,7 @@ public function __construct(
         CacheInterface $cache = null
     ) {
         $this->composerJsonFinder = $composerJsonFinder;
-        $this->cache = $cache ?? ObjectManager::getInstance()->get(CacheInterface::class);
+        $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
     }
 
     /**
@@ -77,8 +77,7 @@ public function __construct(
      */
     public function getVersion()
     {
-        $versionFromCache = $this->cache->load(self::VERSION_CACHE_KEY);
-        $this->version = $this->version ?: $versionFromCache;
+        $this->version = $this->version ?: $this->cache->load(self::VERSION_CACHE_KEY);
         if (!$this->version) {
             if (!($this->version = $this->getSystemPackageVersion())) {
                 if ($this->getComposerInformation()->isMagentoRoot()) {