Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into bugfix_s47

Author: Roman Ganin

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -88,9 +88,12 @@ protected function setUp()
 
         $this->deploymentConfig = $this->getMockBuilder('Magento\Framework\App\DeploymentConfig')
             ->disableOriginalConstructor()->getMock();
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
-        $this->productMetadata = $this->getMock('Magento\Framework\App\ProductMetadata');
+        $this->productMetadata = $this->getMockBuilder('Magento\Framework\App\ProductMetadata')
+            ->disableOriginalConstructor()->getMock();
+
         $this->urlBuilder = $this->getMock('Magento\Framework\UrlInterface');
 
         $this->feed = $this->objectManagerHelper->getObject(

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -200,10 +200,7 @@ public function getChartUrl($directUrl = true)
             $this->setAxisLabels($axis, $this->getRowsData($attr, true));
         }
 
-        $timezoneLocal = $this->_scopeConfig->getValue(
-            $this->_localeDate->getDefaultTimezonePath(),
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
+        $timezoneLocal = $this->_localeDate->getConfigTimezone();
 
         /** @var \DateTime $dateStart */
         /** @var \DateTime $dateEnd */
@@ -214,10 +211,14 @@ public function getChartUrl($directUrl = true)
             true
         );
 
+        $dateStart->setTimezone(new \DateTimeZone($timezoneLocal));
+        $dateEnd->setTimezone(new \DateTimeZone($timezoneLocal));
+
         if ($this->getDataHelper()->getParam('period') == '24h') {
-            $dateStart->setTimezone(new \DateTimeZone($timezoneLocal));
-            $dateEnd->setTimezone(new \DateTimeZone($timezoneLocal));
             $dateEnd->modify('-1 hour');
+        } else {
+            $dateEnd->setTime(23, 59, 59);
+            $dateStart->setTime(0, 0, 0);
         }
 
         $dates = [];

app/code/Magento/Backend/Block/Page/Footer.php

@@ -17,11 +17,40 @@ class Footer extends \Magento\Backend\Block\Template
      */
     protected $_template = 'page/footer.phtml';
 
+    /**
+     * @var \Magento\Framework\App\ProductMetadataInterface
+     */
+    protected $productMetadata;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\App\ProductMetadataInterface $productMetadata,
+        array $data = []
+    ) {
+        $this->productMetadata = $productMetadata;
+        parent::__construct($context, $data);
+    }
+
     /**
      * @return void
      */
     protected function _construct()
     {
         $this->setShowProfiler(true);
     }
+
+    /**
+     * Get product version
+     *
+     * @return string
+     */
+    public function getMagentoVersion()
+    {
+        return $this->productMetadata->getVersion();
+    }
 }

app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml

@@ -9,5 +9,5 @@
 ?>
 <p class="magento-version">
     <strong><?php /* @escapeNotVerified */ echo __('Magento'); ?></strong>
-    <?php /* @escapeNotVerified */ echo __('ver. %1', \Magento\Framework\AppInterface::VERSION) ?>
+    <?php /* @escapeNotVerified */ echo __('ver. %1', $block->getMagentoVersion()) ?>
 </p>

app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php

@@ -35,6 +35,11 @@ class Suffix extends \Magento\Framework\App\Config\Value
     /** @var \Magento\Framework\DB\Adapter\AdapterInterface */
     protected $connection;
 
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    protected $resource;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -67,6 +72,7 @@ public function __construct(
         $this->connection = $appResource->getConnection();
         $this->urlFinder = $urlFinder;
         $this->storeManager = $storeManager;
+        $this->resource = $appResource;
     }
 
     /**
@@ -118,7 +124,7 @@ protected function updateSuffixForUrlRewrites()
                 ? [UrlRewrite::REQUEST_PATH => preg_replace($oldSuffixPattern, $suffix, $urlRewrite->getRequestPath())]
                 : [UrlRewrite::TARGET_PATH => preg_replace($oldSuffixPattern, $suffix, $urlRewrite->getTargetPath())];
             $this->connection->update(
-                DbStorage::TABLE_NAME,
+                $this->resource->getTableName(DbStorage::TABLE_NAME),
                 $bind,
                 $this->connection->quoteIdentifier(UrlRewrite::URL_REWRITE_ID) . ' = ' . $urlRewrite->getUrlRewriteId()
             );

app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Block\Adminhtml\Block\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Class BackButton
+ */
+class BackButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * @return array
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Back'),
+            'on_click' => sprintf("location.href = '%s';", $this->getBackUrl()),
+            'class' => 'back',
+            'sort_order' => 10
+        ];
+    }
+
+    /**
+     * Get URL for back (reset) button
+     *
+     * @return string
+     */
+    public function getBackUrl()
+    {
+        return $this->getUrl('*/*/');
+    }
+}

app/code/Magento/Cms/Block/Adminhtml/Block/Edit/BackButton.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Block\Adminhtml\Block\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Class DeleteButton
+ */
+class DeleteButton extends GenericButton implements ButtonProviderInterface
+{
+
+    /**
+     * @return array
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        if ($this->getPageId()) {
+            $data = [
+                'label' => __('Delete Block'),
+                'class' => 'delete',
+                'on_click' => 'deleteConfirm(\'' . __(
+                    'Are you sure you want to do this?'
+                ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                'sort_order' => 20,
+            ];
+        }
+        return $data;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDeleteUrl()
+    {
+        return $this->getUrl('*/*/delete', ['block_id' => $this->getPageId()]);
+    }
+}