Merge branch 'MAGETWO-45343-address-feedback-in-cr' into MAGETWO-43960-custom-timezone-merged

Author: Igor Melnikov

app/code/Magento/Email/Model/ResourceModel/Template.php

@@ -14,22 +14,14 @@
  */
 class Template extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
-    /**
-     * @var \Magento\Framework\Stdlib\DateTime
-     */
-    protected $dateTime;
-
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param string $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
         $connectionName = null
     ) {
-        $this->dateTime = $dateTime;
         parent::__construct($context, $connectionName);
     }
 

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -235,7 +235,7 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
     }
 
     /**
-     * @param \DateTimeInterface $date
+     * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
      * @param null $locale
@@ -244,13 +244,17 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
      * @return string
      */
     public function formatDateTime(
-        \DateTimeInterface $date,
+        $date,
         $dateType = \IntlDateFormatter::SHORT,
         $timeType = \IntlDateFormatter::SHORT,
         $locale = null,
         $timezone = null,
         $pattern = null
     ) {
+        if (!($date instanceof \DateTime)) {
+            $date = new \DateTime($date);
+        }
+
         if ($timezone === null) {
             if ($date->getTimezone() == null || $date->getTimezone()->getName() == 'UTC'
                 || $date->getTimezone()->getName() == '+00:00'

lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php

@@ -121,7 +121,7 @@ public function getConfigTimezone($scopeType = null, $scopeCode = null);
     public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
 
     /**
-     * @param \DateTimeInterface $date
+     * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
      * @param null $locale
@@ -130,7 +130,7 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
      * @return string
      */
     public function formatDateTime(
-        \DateTimeInterface $date,
+        $date,
         $dateType = \IntlDateFormatter::SHORT,
         $timeType = \IntlDateFormatter::SHORT,
         $locale = null,