Merge pull request #88 from magento-tango/MAGETWO-32571

[Tango] S46 Controller Refactoring, Exceptions, Bug Fixes
magento · Feb 12, 2015 · b32bd91 · b32bd91
2 parents bc18e4c + dfa392b
commit b32bd91
Show file tree

Hide file tree

Showing 349 changed files with 3,543 additions and 1,379 deletions.
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php b/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()
     {

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/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()
     {

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/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()
     {

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php b/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()
     {

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/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()
     {

diff --git a/app/code/Magento/Backend/Block/System/Account/Edit.php b/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()
     {

diff --git a/app/code/Magento/Backend/Block/System/Store/Delete.php b/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()
     {

diff --git a/app/code/Magento/Backend/Block/System/Variable/Edit.php b/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()
     {

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php b/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)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/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('*/*');
+    }
+}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
@@ -16,7 +16,6 @@ public function execute()
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) {
             $this->messageManager->addError(__('Unable to proceed. Please, try again.'));
-            $this->_redirect('adminhtml/*/');
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');

diff --git a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
@@ -42,7 +42,7 @@ public function __construct(StoreManagerInterface $storeManager)
      * Translate element attribute
      *
      * @param string $code
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     protected function _getTranslatedAttribute($code)
     {

diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
@@ -385,7 +385,7 @@ protected function _getStaticOptions(array $options)
      * Translate a label
      *
      * @param string $label an option label that should be translated
-     * @return string the translated version of the input label
+     * @return \Magento\Framework\Phrase
      */
     private function _translateLabel($label)
     {

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
@@ -15,7 +15,9 @@
             </block>
         </referenceContainer>
         <referenceContainer name="content">
-            <block class="Magento\Backend\Block\Dashboard" name="dashboard"/>
+            <block class="Magento\Backend\Block\Dashboard" name="dashboard">
+                <block class="Magento\Backend\Block\Template" name="refresh_statistics" template="Magento_Backend::dashboard/totalbar/refreshstatistics.phtml"/>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -81,6 +81,7 @@ window.changeDiagramsPeriod = function(periodObj) {
              <div class="dashboard-store-stats">
                  <?php echo $block->getChildHtml('grids') ?>
                  <div id="grid_tab_content" class="dashboard-store-stats-content"></div>
+                 <?php echo $block->getChildHtml('refresh_statistics') ?>
              </div>
          </div>
          <div class="dashboard-secondary">

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<form action="<?php echo $block->getUrl('*/*/refreshStatistics'); ?>" method="post">
+    <input name="form_key" type="hidden" value="<?php echo $block->getFormKey(); ?>" />
+    <button type="submit" style="float:right; margin: 15px"  title="Refresh data">
+        <?php echo __('Refresh data') ?>
+    </button>
+</form>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -131,15 +131,15 @@ public function getProduct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
         return __('Bundle Items');
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -670,7 +670,7 @@ public function isSalable($product)
      * @param \Magento\Framework\Object $buyRequest
      * @param \Magento\Catalog\Model\Product $product
      * @param string $processMode
-     * @return array|string
+     * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -852,7 +852,7 @@ private function multiToFlatArray(array $array)
     /**
      * Retrieve message for specify option(s)
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSpecifyOptionMessage()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
@@ -237,7 +237,7 @@ public function getTabsHtml()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getHeader()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -106,7 +106,7 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
     /**
      * Retrieve header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -183,7 +183,7 @@ public function getSetFormHtml()
     /**
      * Retrieve Block Header Text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getHeader()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -53,7 +53,7 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getHeader()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -44,7 +44,7 @@ public function getNewButtonHtml()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getHeader()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -154,15 +154,15 @@ protected function _getAdditionalElementHtml($element)
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
         return __('Attributes');
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -82,15 +82,15 @@ public function getDefaultConfigValue($field)
     /**
      * Tab settings
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
         return __('Advanced Inventory');
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
@@ -45,15 +45,15 @@ public function getStoreCollection(Group $group)
     /**
      * Tab settings
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
         return __('Websites');
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
@@ -72,7 +72,7 @@ public function __construct(
     /**
      * Get label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
@@ -52,7 +52,7 @@ public function getLink()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {

diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -52,7 +52,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {

diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -192,7 +192,7 @@ public function getAttributes()
      *
      * @param Product $product
      * @param \Magento\Catalog\Model\Resource\Eav\Attribute $attribute
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getProductAttributeValue($product, $attribute)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ protected function _construct() @@
         }
         /**
-         * @return string
+         * @return \Magento\Framework\Phrase
          */
         public function getHeaderText()
         {
@@ Expand Down @@