Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-64047-WebAPI-Its-impossible-to-empty-numeric-fields

Author: Cari Spruiell

app/code/Magento/AdminNotification/i18n/en_US.csv

@@ -1,13 +1,13 @@
 "Read Details","Read Details"
 "Mark as Read","Mark as Read"
 "Are you sure?","Are you sure?"
-"Remove","Remove"
+Remove,Remove
 "Messages Inbox","Messages Inbox"
 "You have %1 new system messages","You have %1 new system messages"
 "You have %1 new system message","You have %1 new system message"
 "Incoming Message","Incoming Message"
-"close","close"
-"Notifications","Notifications"
+close,close
+Notifications,Notifications
 "The message has been marked as Read.","The message has been marked as Read."
 "We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
 "Please select messages.","Please select messages."
@@ -20,10 +20,10 @@
 "6 Hours","6 Hours"
 "12 Hours","12 Hours"
 "24 Hours","24 Hours"
-"critical","critical"
-"major","major"
-"minor","minor"
-"notice","notice"
+critical,critical
+major,major
+minor,minor
+notice,notice
 "Wrong message type","Wrong message type"
 "Wrong notification ID specified.","Wrong notification ID specified."
 "{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>."
@@ -32,20 +32,19 @@
 "We were unable to synchronize one or more media files. Please refer to the log file for details.","We were unable to synchronize one or more media files. Please refer to the log file for details."
 "Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
 "Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider.","Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider."
-"Close popup","Close popup"
-"Close","Close"
 "System Messages:","System Messages:"
 "Critical System Messages","Critical System Messages"
 "Major System Messages","Major System Messages"
 "System messages","System messages"
+Close,Close
 "See All (","See All ("
 " unread)"," unread)"
 "Show Toolbar","Show Toolbar"
 "Show List","Show List"
 "Use HTTPS to Get Feed","Use HTTPS to Get Feed"
 "Update Frequency","Update Frequency"
 "Last Update","Last Update"
-"Severity","Severity"
+Severity,Severity
 "Date Added","Date Added"
-"Message","Message"
-"Actions","Actions"
+Message,Message
+Actions,Actions

app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

@@ -19,11 +19,11 @@
             "autoOpen": true,
             "buttons": false,
             "modalClass": "modal-system-messages",
-            "title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
+            "title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
         }
     }'>
     <li class="message message-warning warning">
-        <?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
+        <?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
+        <a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
     </li>
 </ul>

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

@@ -15,31 +15,31 @@
         <?php if ($lastCritical): ?>
             <ul class="message-system-list">
                 <li class="message message-warning error">
-                    <?php /* @escapeNotVerified */ echo $lastCritical->getText();?>
+                    <?= /* @escapeNotVerified */ $lastCritical->getText() ?>
                 </li>
             </ul>
         <?php endif; ?>
         <div class="message-system-short">
             <span class="message-system-short-label">
-                <?php /* @escapeNotVerified */ echo __('System Messages:')?>
+                <?= /* @escapeNotVerified */ __('System Messages:') ?>
             </span>
 
             <?php if ($block->getCriticalCount()): ?>
                 <div class="message message-warning error">
-                    <a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>">
-                        <?php /* @escapeNotVerified */ echo $block->getCriticalCount();?>
+                    <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
+                        <?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
                     </a>
                 </div>
             <?php endif;?>
 
             <?php if ($block->getMajorCount()): ?>
                <div class="message message-warning warning">
-                   <a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>">
-                       <?php /* @escapeNotVerified */ echo $block->getMajorCount();?>
+                   <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
+                       <?= /* @escapeNotVerified */ $block->getMajorCount() ?>
                    </a>
                </div>
             <?php endif;?>
         </div>
-        <div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
+        <div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
     </div>
 </div>

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -9,11 +9,11 @@
 ?>
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
+<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
     <ul class="message-system-list messages">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
-            <li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
-                <?php /* @escapeNotVerified */ echo $message->getText();?>
+            <li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
+                <?= /* @escapeNotVerified */ $message->getText() ?>
             </li>
         <?php endforeach;?>
     </ul>

app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

@@ -15,70 +15,70 @@
 <div
     data-mage-init='{"toolbarEntry": {}}'
     class="notifications-wrapper admin__action-dropdown-wrap"
-    data-notification-count="<?php /* @escapeNotVerified */ echo $notificationCount; ?>">
+    data-notification-count="<?= /* @escapeNotVerified */ $notificationCount ?>">
     <?php if ($notificationCount > 0) : ?>
         <a
-            href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
+            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
             class="notifications-action admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
-            title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>"
+            title="<?= /* @escapeNotVerified */ __('Notifications') ?>"
             data-toggle="dropdown">
             <span class="notifications-counter">
-                <?php /* @escapeNotVerified */ echo ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount; ?>
+                <?= /* @escapeNotVerified */ ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount ?>
             </span>
         </a>
         <ul
             class="admin__action-dropdown-menu"
-            data-mark-as-read-url="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
+            data-mark-as-read-url="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/ajaxMarkAsRead') ?>">
             <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
             <?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
             <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
-                data-notification-id="<?php /* @escapeNotVerified */ echo $notification->getId(); ?>"
+                data-notification-id="<?= /* @escapeNotVerified */ $notification->getId() ?>"
                 data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
                 <?php
                     $notificationDescription = $block->escapeHtml($notification->getDescription());
                     $notificationDescriptionLength = $block->getNotificationDescriptionLength();
                 ?>
                 <strong class="notifications-entry-title">
-                    <?php echo $block->escapeHtml($notification->getTitle()); ?>
+                    <?= $block->escapeHtml($notification->getTitle()) ?>
                 </strong>
                 <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
                     <p class="notifications-entry-description _cutted">
                         <span class="notifications-entry-description-start">
-                            <?php /* @escapeNotVerified */ echo substr($notificationDescription, 0, $notificationDescriptionLength); ?>
+                            <?= /* @escapeNotVerified */ substr($notificationDescription, 0, $notificationDescriptionLength) ?>
                         </span>
                         <span class="notifications-entry-description-end">
-                            <?php /* @escapeNotVerified */ echo substr($notificationDescription, $notificationDescriptionLength); ?>
+                            <?= /* @escapeNotVerified */ substr($notificationDescription, $notificationDescriptionLength) ?>
                         </span>
                     </p>
                 <?php else : ?>
                     <p class="notifications-entry-description">
-                        <?php /* @escapeNotVerified */ echo $notificationDescription; ?>
+                        <?= /* @escapeNotVerified */ $notificationDescription ?>
                     </p>
                 <?php endif; ?>
                 <time class="notifications-entry-time">
-                    <?php /* @escapeNotVerified */ echo $block->formatNotificationDate($notification->getDateAdded()); ?>
+                    <?= /* @escapeNotVerified */ $block->formatNotificationDate($notification->getDateAdded()) ?>
                 </time>
                 <button
                     type="button"
                     class="notifications-close"
-                    title="<?php /* @escapeNotVerified */ echo __('Close'); ?>"
+                    title="<?= /* @escapeNotVerified */ __('Close') ?>"
                     ></button>
             </li>
             <?php endforeach; ?>
             <li class="notifications-entry notifications-entry-last">
                 <a
-                    href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
+                    href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
                     class="action-tertiary action-more">
-                    <?php /* @escapeNotVerified */ echo __('See All (') ?><span class="notifications-counter"><?php /* @escapeNotVerified */ echo $notificationCount ?></span><?php /* @escapeNotVerified */ echo __(' unread)'); ?>
+                    <?= /* @escapeNotVerified */ __('See All (') ?><span class="notifications-counter"><?= /* @escapeNotVerified */ $notificationCount ?></span><?= /* @escapeNotVerified */ __(' unread)') ?>
                 </a>
             </li>
         </ul>
     <?php else : ?>
         <a
             class="notifications-action admin__action-dropdown"
-            href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
-            title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>">
+            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
+            title="<?= /* @escapeNotVerified */ __('Notifications') ?>">
         </a>
     <?php endif; ?>
 </div>

app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv

@@ -1,4 +1,4 @@
 "Please correct the data sent.","Please correct the data sent."
-"Entity type model \'%1\' is not found","Entity type model \'%1\' is not found"
+"Entity type model '%1' is not found","Entity type model '%1' is not found"
 "Entity type model must be an instance of \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
 "There are no product types available for export","There are no product types available for export"

app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Analytics\Controller\Adminhtml\Reports;
 
+use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
 use Magento\Analytics\Model\ReportUrlProvider;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
@@ -55,6 +56,9 @@ public function execute()
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         try {
             $resultRedirect->setUrl($this->reportUrlProvider->getUrl());
+        } catch (SubscriptionUpdateException $e) {
+            $this->getMessageManager()->addNoticeMessage($e->getMessage());
+            $resultRedirect->setPath('adminhtml');
         } catch (LocalizedException $e) {
             $this->getMessageManager()->addExceptionMessage($e, $e->getMessage());
             $resultRedirect->setPath('adminhtml');

app/code/Magento/Analytics/Cron/Update.php

@@ -5,14 +5,14 @@
  */
 namespace Magento\Analytics\Cron;
 
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
 use Magento\Analytics\Model\Connector;
-use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
 use Magento\Framework\FlagManager;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 
 /**
- * Class Update
  * Executes by cron schedule in case base url was changed
  */
 class Update
@@ -28,8 +28,6 @@ class Update
     private $configWriter;
 
     /**
-     * Reinitable Config Model.
-     *
      * @var ReinitableConfigInterface
      */
     private $reinitableConfig;
@@ -40,22 +38,29 @@ class Update
     private $flagManager;
 
     /**
-     * Update constructor.
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
      * @param Connector $connector
      * @param WriterInterface $configWriter
      * @param ReinitableConfigInterface $reinitableConfig
      * @param FlagManager $flagManager
+     * @param AnalyticsToken $analyticsToken
      */
     public function __construct(
         Connector $connector,
         WriterInterface $configWriter,
         ReinitableConfigInterface $reinitableConfig,
-        FlagManager $flagManager
+        FlagManager $flagManager,
+        AnalyticsToken $analyticsToken
     ) {
         $this->connector = $connector;
         $this->configWriter = $configWriter;
         $this->reinitableConfig = $reinitableConfig;
         $this->flagManager = $flagManager;
+        $this->analyticsToken = $analyticsToken;
     }
 
     /**
@@ -65,13 +70,23 @@ public function __construct(
      */
     public function execute()
     {
-        $updateResult = $this->connector->execute('update');
-        if ($updateResult === false) {
-            return false;
+        $result = false;
+        $attemptsCount = $this->flagManager
+            ->getFlagData(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
+
+        if ($attemptsCount) {
+            $attemptsCount -= 1;
+            $result = $this->connector->execute('update');
+        }
+
+        if ($result || ($attemptsCount <= 0) || (!$this->analyticsToken->isTokenExist())) {
+            $this->flagManager
+                ->deleteFlag(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
+            $this->flagManager->deleteFlag(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE);
+            $this->configWriter->delete(SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH);
+            $this->reinitableConfig->reinit();
         }
-        $this->configWriter->delete(BaseUrlConfigPlugin::UPDATE_CRON_STRING_PATH);
-        $this->flagManager->deleteFlag(BaseUrlConfigPlugin::OLD_BASE_URL_FLAG_CODE);
-        $this->reinitableConfig->reinit();
-        return true;
+
+        return $result;
     }
 }