Convert local timestamp into GMT timestamp

Author: bnymn

app/code/Magento/Newsletter/Model/Queue.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverterInterface;
 
 /**
  * Newsletter queue model.
@@ -117,6 +118,11 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      */
     private $timezone;
 
+    /**
+     * @var LocalizedDateToUtcConverterInterface
+     */
+    private $utcConverter;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -144,7 +150,8 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        TimezoneInterface $timezone = null
+        TimezoneInterface $timezone = null,
+        LocalizedDateToUtcConverterInterface $utcConverter = null
     ) {
         parent::__construct(
             $context,
@@ -159,9 +166,10 @@ public function __construct(
         $this->_problemFactory = $problemFactory;
         $this->_subscribersCollection = $subscriberCollectionFactory->create();
         $this->_transportBuilder = $transportBuilder;
-        $this->timezone = $timezone ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            TimezoneInterface::class
-        );
+
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->timezone = $timezone ?: $objectManager->get(TimezoneInterface::class);
+        $this->utcConverter = $utcConverter ?? $objectManager->get(LocalizedDateToUtcConverterInterface::class);
     }
 
     /**
@@ -196,7 +204,7 @@ public function setQueueStartAtByString($startAt)
         if ($startAt === null || $startAt == '') {
             $this->setQueueStartAt(null);
         } else {
-            $this->setQueueStartAt($this->timezone->convertConfigTimeToUtc($startAt));
+            $this->setQueueStartAt($this->utcConverter->convertLocalizedDateToUtc($startAt));
         }
         return $this;
     }

app/code/Magento/Store/etc/di.xml

@@ -294,12 +294,6 @@
             <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverter">
-        <arguments>
-            <argument name="defaultTimezonePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_TIMEZONE</argument>
-            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Locale\Resolver">
         <arguments>
             <argument name="defaultLocalePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE</argument>

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\Stdlib\DateTime\Timezone;
 
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
@@ -23,62 +24,49 @@ class LocalizedDateToUtcConverter implements LocalizedDateToUtcConverterInterfac
     private $defaultFormat = 'Y-m-d H:i:s';
 
     /**
-     * @var ResolverInterface
-     */
-    private $localeResolver;
-
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @var string
+     * @var TimezoneInterface
      */
-    private $scopeType;
+    private $timezone;
 
     /**
-     * @var string
+     * @var ResolverInterface
      */
-    private $defaultTimezonePath;
+    private $localeResolver;
 
     /**
      * LocalizedDateToUtcConverter constructor.
      *
      * @param ResolverInterface $localeResolver
      */
     public function __construct(
-        ResolverInterface $localeResolver,
-        ScopeConfigInterface $scopeConfig,
-        $scopeType,
-        $defaultTimezonePath
+        TimezoneInterface $timezone,
+        ResolverInterface $localeResolver
     )
     {
+        $this->timezone = $timezone;
         $this->localeResolver = $localeResolver;
-        $this->scopeConfig = $scopeConfig;
-        $this->scopeType = $scopeType;
-        $this->defaultTimezonePath = $defaultTimezonePath;
     }
 
     /**
      * @inheritdoc
      */
     public function convertLocalizedDateToUtc($date)
     {
+        $configTimezone = $this->timezone->getConfigTimezone();
         $locale = $this->localeResolver->getLocale();
+
         $formatter = new \IntlDateFormatter(
             $locale,
             \IntlDateFormatter::MEDIUM,
             \IntlDateFormatter::MEDIUM,
-            $this->getConfigTimezone(),
-            null,
-            null
+            $configTimezone
         );
-        $unixTime = $formatter->parse($date);
-        $dateTime = new DateTime($this);
-        $dateUniversal = $dateTime->gmtDate(null, $unixTime);
-        $date = new \DateTime($dateUniversal, new \DateTimeZone($this->getConfigTimezone()));
 
+        $localTimestamp = $formatter->parse($date);
+        $gmtTimestamp = $this->timezone->date($localTimestamp)->getTimestamp();
+        $formattedUniversalTime = date($this->defaultFormat, $gmtTimestamp);
+
+        $date = new \DateTime($formattedUniversalTime, new \DateTimeZone($configTimezone));
         $date->setTimezone(new \DateTimeZone('UTC'));
 
         return $date->format($this->defaultFormat);