Merge remote-tracking branch 'origin/MC-19218' into 2.3.3-develop-pr69

Author: zakdma

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

@@ -196,8 +196,7 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
     public function scopeDate($scope = null, $date = null, $includeTime = false)
     {
         $timezone = $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType, $scope);
-        $date = new \DateTime(is_numeric($date) ? '@' . $date : $date);
-        $date->setTimezone(new \DateTimeZone($timezone));
+        $date = new \DateTime(is_numeric($date) ? '@' . $date : $date, new \DateTimeZone($timezone));
         if (!$includeTime) {
             $date->setTime(0, 0, 0);
         }

lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php

@@ -253,15 +253,4 @@ private function scopeConfigWillReturnConfiguredTimezone($configuredTimezone)
     {
         $this->scopeConfig->method('getValue')->with('', '', null)->willReturn($configuredTimezone);
     }
-
-    public function testCheckIfScopeDateSetsTimeZone()
-    {
-        $scopeDate = new \DateTime('now', new \DateTimeZone('America/Vancouver'));
-        $this->scopeConfig->method('getValue')->willReturn('America/Vancouver');
-
-        $this->assertEquals(
-            $scopeDate->getTimezone(),
-            $this->getTimezone()->scopeDate(0, $scopeDate->getTimestamp())->getTimezone()
-        );
-    }
 }