Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-33727-getBaseUrl

Author: otoolec

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

@@ -66,7 +66,7 @@ public function getUnreadMessages()
     /**
      * Retrieve popup title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getPopupTitle()
     {

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -114,7 +114,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

@@ -31,7 +31,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

@@ -30,7 +30,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -129,7 +129,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/Backend/Block/System/Account/Edit.php

@@ -27,7 +27,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {

app/code/Magento/Backend/Block/System/Store/Delete.php

@@ -49,7 +49,7 @@ protected function _construct()
     /**
      * Get edit form container header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {

app/code/Magento/Backend/Block/System/Variable/Edit.php

@@ -97,7 +97,7 @@ public function getFormHtml()
     /**
      * Return translated header text depending on creating/editing action
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php

@@ -83,7 +83,7 @@ protected function _getShowEmptyStoresLabelFlag()
      * Render row store views
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -135,7 +135,7 @@ public function render(\Magento\Framework\Object $row)
      * Render row store views for export
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function renderExport(\Magento\Framework\Object $row)

app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Controller\Adminhtml\Dashboard;
+
+class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+{
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param array $reportTypes
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        array $reportTypes,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        parent::__construct($context, $dateFilter, $resultRedirectFactory, $reportTypes);
+        $this->logger = $logger;
+    }
+
+    /**
+     * @return \Magento\Backend\Model\View\Result\Redirect
+     */
+    public function execute()
+    {
+        try {
+            $collectionsNames = array_values($this->reportTypes);
+            foreach ($collectionsNames as $collectionName) {
+                $this->_objectManager->create($collectionName)->aggregate();
+            }
+            $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
+        } catch (\Exception $e) {
+            $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
+            $this->logger->critical($e);
+        }
+        return $this->resultRedirectFactory->create()->setPath('*/*');
+    }
+}