🔃 [Magento Community Engineering] Community Contributions - 2.3-develop

magento-engcom-team · web-flow · commit 034806f74b58 · 2019-08-16T15:15:10.000-05:00
Accepted Community Pull Requests: - #24142: fix function return type (by @maslii) - #24008: Resolve "Currency Converter API" can not get Currency Rate (by @edenduong) - #23762: Fix quote fixture. (by @swnsma) - #13580: [Forward Port 2.3] Increase flag_data size (by @aschrammel) - #23430: #23429 wrap url rewrite regeneration into transaction to keep existing urls form deletion (by @ilnytskyi) - #24146: Update Magento_AdvancedPricingImportExport ReadMe (by @diazwatson) - #24145: Update Admin Notification ReadMe (https) (by @diazwatson) - #23716: fix 404 url for sitemap content url (by @sunilit42) Fixed GitHub Issues: - #24007: "Currency Converter API" notify "Notice: Undefined index" when import currency rate (reported by @edenduong) has been fixed in #24008 by @edenduong in 2.3-develop branch Related commits: 1. e4f4701 2. 405fbcb 3. 9025307 4. 23d566b 5. 3fbdb4d 6. a011309 - #11657: app:config:import fails - flag column 'flag_data' is too short ? (reported by @peterjaap) has been fixed in #13580 by @aschrammel in 2.3-develop branch Related commits: 1. 7cde2fc 2. 83371e1 3. c5f50a8 - #23429: Url Rewrites are lost if an exception thrown or deadlock during regeneration (reported by @ilnytskyi) has been fixed in #23430 by @ilnytskyi in 2.3-develop branch Related commits: 1. b8f6a3a 2. a5c4a91 3. a562b15 4. a22f78e - #23706: Magento2.2.2 sitemap.xml google link in urlset tag attribute returns 404 (reported by @lano-vargas) has been fixed in #23716 by @sunilit42 in 2.3-develop branch Related commits: 1. 505d285 2. a95b55a
diff --git a/app/code/Magento/AdminNotification/README.md b/app/code/Magento/AdminNotification/README.md
@@ -6,7 +6,7 @@ The Magento_AdminNotification module provides the ability to alert administrator
 
 Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
 
-For information about module installation in Magento 2, see [Enable or disable modules](http://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
 
 ### Events
 
@@ -21,10 +21,10 @@ This module introduces the following layouts and layout handles in the `view/adm
 - `adminhtml_notification_index`
 - `adminhtml_notification_block`
 
-For more information about layouts in Magento 2, see the [Layout documentation](http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
 
 ### UI components
 
 You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
 
-For information about UI components in Magento 2, see [Overview of UI components](http://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
+For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
diff --git a/app/code/Magento/AdvancedPricingImportExport/README.md b/app/code/Magento/AdvancedPricingImportExport/README.md
@@ -1 +1,4 @@
-The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+# Magento_AdvancedPricingImportExport module
+
+The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+
diff --git a/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php b/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php
@@ -7,12 +7,17 @@
 
 namespace Magento\Directory\Model\Currency\Import;
 
+/**
+ * Currency rate import model (From http://free.currencyconverterapi.com/)
+ *
+ * Class \Magento\Directory\Model\Currency\Import\CurrencyConverterApi
+ */
 class CurrencyConverterApi extends AbstractImport
 {
     /**
      * @var string
      */
-    const CURRENCY_CONVERTER_URL = 'http://free.currencyconverterapi.com/api/v3/convert?q={{CURRENCY_FROM}}_{{CURRENCY_TO}}&compact=ultra'; //@codingStandardsIgnoreLine
+    const CURRENCY_CONVERTER_URL = 'http://free.currencyconverterapi.com/api/v3/convert?q={{CURRENCY_FROM}}_{{CURRENCY_TO}}&compact=ultra&apiKey={{API_KEY}}'; //@codingStandardsIgnoreLine
 
     /**
      * Http Client Factory
@@ -46,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function fetchRates()
     {
@@ -74,23 +79,25 @@ public function fetchRates()
      */
     private function convertBatch($data, $currencyFrom, $currenciesTo)
     {
+        $apiKey = $this->scopeConfig->getValue(
+            'currency/currencyconverterapi/api_key',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        if (!$apiKey) {
+            $this->_messages[] = __('No API Key was specified.');
+            return $data;
+        }
         foreach ($currenciesTo as $to) {
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             set_time_limit(0);
             try {
                 $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
                 $url = str_replace('{{CURRENCY_TO}}', $to, $url);
-                $response = $this->getServiceResponse($url);
+                $url = str_replace('{{API_KEY}}', $apiKey, $url);
                 if ($currencyFrom == $to) {
                     $data[$currencyFrom][$to] = $this->_numberFormat(1);
                 } else {
-                    if (empty($response)) {
-                        $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $to);
-                        $data[$currencyFrom][$to] = null;
-                    } else {
-                        $data[$currencyFrom][$to] = $this->_numberFormat(
-                            (double)$response[$currencyFrom . '_' . $to]
-                        );
-                    }
+                    $data[$currencyFrom][$to] = $this->getCurrencyRate($currencyFrom, $to, $url);
                 }
             } finally {
                 ini_restore('max_execution_time');
@@ -100,6 +107,36 @@ private function convertBatch($data, $currencyFrom, $currenciesTo)
         return $data;
     }
 
+    /**
+     * Get currency rate from api
+     *
+     * @param string $currencyFrom
+     * @param string $to
+     * @param string $url
+     * @return double
+     */
+    private function getCurrencyRate($currencyFrom, $to, $url)
+    {
+        $rate = null;
+        $response = $this->getServiceResponse($url);
+        if (empty($response)) {
+            $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $to);
+            $rate = null;
+        } else {
+            if (isset($response['error']) && $response['error']) {
+                if (!in_array($response['error'], $this->_messages)) {
+                    $this->_messages[] = $response['error'];
+                }
+                $rate = null;
+            } else {
+                $rate = $this->_numberFormat(
+                    (double)$response[$currencyFrom . '_' . $to]
+                );
+            }
+        }
+        return $rate;
+    }
+
     /**
      * Get Fixer.io service response
      *
@@ -137,7 +174,7 @@ private function getServiceResponse($url, $retry = 0)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _convert($currencyFrom, $currencyTo)
     {
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -47,7 +47,12 @@
             </group>
             <group id="currencyconverterapi" translate="label" sortOrder="45" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Currency Converter API</label>
-                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="api_key" translate="label" type="obscure" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>API Key</label>
+                    <config_path>currency/currencyconverterapi/api_key</config_path>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                </field>
+                <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
                 </field>
             </group>
diff --git a/app/code/Magento/Directory/etc/config.xml b/app/code/Magento/Directory/etc/config.xml
@@ -24,6 +24,7 @@
             </fixerio>
             <currencyconverterapi>
                 <timeout>100</timeout>
+                <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
             </currencyconverterapi>
             <import>
                 <enabled>0</enabled>
diff --git a/app/code/Magento/Directory/i18n/en_US.csv b/app/code/Magento/Directory/i18n/en_US.csv
@@ -52,3 +52,4 @@ Service,Service
 "The """%1"" is not allowed as base currency for your subscription plan.","The """%1"" is not allowed as base currency for your subscription plan."
 "An invalid base currency has been entered.","An invalid base currency has been entered."
 "Currency rates can't be retrieved.","Currency rates can't be retrieved."
+"No API Key was specified.","No API Key was specified."
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -362,7 +362,6 @@ protected function _initSitemapItems()
                 self::OPEN_TAG_KEY => '<?xml version="1.0" encoding="UTF-8"?>' .
                     PHP_EOL .
                     '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"' .
-                    ' xmlns:content="http://www.google.com/schemas/sitemap-content/1.0"' .
                     ' xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">' .
                     PHP_EOL,
                 self::CLOSE_TAG_KEY => '</urlset>',
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-1.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-1.xml
@@ -6,7 +6,6 @@
  */
 -->
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-        xmlns:content="http://www.google.com/schemas/sitemap-content/1.0"
         xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
     <url>
         <loc>http://store.com/category.html</loc>
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-2.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-2.xml
@@ -6,7 +6,6 @@
  */
 -->
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-        xmlns:content="http://www.google.com/schemas/sitemap-content/1.0"
         xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
     <url>
         <loc>http://store.com/category/sub-category.html</loc>
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml
@@ -6,7 +6,6 @@
  */
 -->
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-        xmlns:content="http://www.google.com/schemas/sitemap-content/1.0"
         xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
     <url>
         <loc>http://store.com/product.html</loc>
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-4.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-4.xml
@@ -6,7 +6,6 @@
  */
 -->
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-        xmlns:content="http://www.google.com/schemas/sitemap-content/1.0"
         xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
     <url>
         <loc>http://store.com/product2.html</loc>
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
@@ -6,7 +6,6 @@
  */
 -->
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-        xmlns:content="http://www.google.com/schemas/sitemap-content/1.0"
         xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
     <url>
         <loc>http://store.com/category.html</loc>
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -49,9 +49,9 @@ class DbStorage extends AbstractStorage
     private $logger;
 
     /**
-     * @param UrlRewriteFactory $urlRewriteFactory
-     * @param DataObjectHelper $dataObjectHelper
-     * @param ResourceConnection $resource
+     * @param UrlRewriteFactory    $urlRewriteFactory
+     * @param DataObjectHelper     $dataObjectHelper
+     * @param ResourceConnection   $resource
      * @param LoggerInterface|null $logger
      */
     public function __construct(
@@ -71,7 +71,7 @@ public function __construct(
     /**
      * Prepare select statement for specific filter
      *
-     * @param array $data
+     * @param  array $data
      * @return Select
      */
     protected function prepareSelect(array $data)
@@ -106,12 +106,14 @@ protected function doFindOneByData(array $data)
 
             $requestPath = $data[UrlRewrite::REQUEST_PATH];
             $decodedRequestPath = urldecode($requestPath);
-            $data[UrlRewrite::REQUEST_PATH] = array_unique([
+            $data[UrlRewrite::REQUEST_PATH] = array_unique(
+                [
                 rtrim($requestPath, '/'),
                 rtrim($requestPath, '/') . '/',
                 rtrim($decodedRequestPath, '/'),
                 rtrim($decodedRequestPath, '/') . '/',
-            ]);
+                ]
+            );
 
             $resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
             if ($resultsFromDb) {
@@ -128,8 +130,8 @@ protected function doFindOneByData(array $data)
     /**
      * Extract most relevant url rewrite from url rewrites list
      *
-     * @param string $requestPath
-     * @param array $urlRewrites
+     * @param  string $requestPath
+     * @param  array  $urlRewrites
      * @return array|null
      */
     private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRewrites): ?array
@@ -166,8 +168,8 @@ private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRe
      * If request path matches the DB value or it's redirect - we can return result from DB
      * Otherwise return 301 redirect to request path from DB results
      *
-     * @param string $requestPath
-     * @param array $urlRewrite
+     * @param  string $requestPath
+     * @param  array  $urlRewrite
      * @return array
      */
     private function prepareUrlRewrite(string $requestPath, array $urlRewrite): array
@@ -197,7 +199,7 @@ private function prepareUrlRewrite(string $requestPath, array $urlRewrite): arra
     /**
      * Delete old URLs from DB.
      *
-     * @param UrlRewrite[] $urls
+     * @param  UrlRewrite[] $urls
      * @return void
      */
     private function deleteOldUrls(array $urls): void
@@ -242,7 +244,7 @@ private function deleteOldUrls(array $urls): void
     /**
      * Prepare array with unique entities
      *
-     * @param UrlRewrite[] $urls
+     * @param  UrlRewrite[] $urls
      * @return array
      */
     private function prepareUniqueEntities(array $urls): array
@@ -258,23 +260,33 @@ private function prepareUniqueEntities(array $urls): array
             }
             $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
         }
+
         return $uniqueEntities;
     }
 
     /**
      * @inheritDoc
      */
-    protected function doReplace(array $urls)
+    protected function doReplace(array $urls): array
     {
-        $this->deleteOldUrls($urls);
+        $this->connection->beginTransaction();
 
-        $data = [];
-        foreach ($urls as $url) {
-            $data[] = $url->toArray();
-        }
         try {
+            $this->deleteOldUrls($urls);
+
+            $data = [];
+            foreach ($urls as $url) {
+                $data[] = $url->toArray();
+            }
+
             $this->insertMultiple($data);
+
+            $this->connection->commit();
+            // @codingStandardsIgnoreStart
         } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
+            // @codingStandardsIgnoreEnd
+            $this->connection->rollBack();
+
             /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $urlConflicted */
             $urlConflicted = [];
             foreach ($urls as $url) {
@@ -298,6 +310,9 @@ protected function doReplace(array $urls)
             } else {
                 throw $e->getPrevious() ?: $e;
             }
+        } catch (\Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
         }
 
         return $urls;
@@ -306,12 +321,12 @@ protected function doReplace(array $urls)
     /**
      * Insert multiple
      *
-     * @param array $data
+     * @param  array $data
      * @return void
      * @throws \Magento\Framework\Exception\AlreadyExistsException|\Exception
      * @throws \Exception
      */
-    protected function insertMultiple($data)
+    protected function insertMultiple($data): void
     {
         try {
             $this->connection->insertMultiple($this->resource->getTableName(self::TABLE_NAME), $data);
@@ -331,11 +346,11 @@ protected function insertMultiple($data)
     /**
      * Get filter for url rows deletion due to provided urls
      *
-     * @param UrlRewrite[] $urls
-     * @return array
+     * @param      UrlRewrite[] $urls
+     * @return     array
      * @deprecated Not used anymore.
      */
-    protected function createFilterDataBasedOnUrls($urls)
+    protected function createFilterDataBasedOnUrls($urls): array
     {
         $data = [];
         foreach ($urls as $url) {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
@@ -56,7 +56,7 @@
 $quote->collectTotals();
 
 $quoteRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+    ->get(\Magento\Quote\Api\CartRepositoryInterface::class);
 $quoteRepository->save($quote);
 
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
@@ -259,7 +259,7 @@ public function getLastPageNumber()
         if (0 === $collectionSize) {
             return 1;
         } elseif ($this->_pageSize) {
-            return ceil($collectionSize / $this->_pageSize);
+            return (int)ceil($collectionSize / $this->_pageSize);
         } else {
             return 1;
         }
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
