Advertisement
Guest User

Magento diff patch

a guest
Jun 1st, 2020
1,799
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.60 KB | None | 0 0
  1. diff --git a/vendor/magento/framework/Stdlib/DateTime/Timezone.php b/vendor/magento/framework/Stdlib/DateTime/Timezone.php
  2. index 2568a5ccf21c..0791c89ab793 100644
  3. --- a/vendor/magento/framework/Stdlib/DateTime/Timezone.php
  4. +++ b/vendor/magento/framework/Stdlib/DateTime/Timezone.php
  5. @@ -206,25 +206,9 @@ public function scopeDate($scope = null, $date = null, $includeTime = false)
  6.              case ($date instanceof \DateTimeImmutable):
  7.                  $date = $date->setTimezone($timezone);
  8.                  break;
  9. -            case (!is_numeric($date)):
  10. -                $timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
  11. -                $formatter = new \IntlDateFormatter(
  12. -                    $this->_localeResolver->getLocale(),
  13. -                    \IntlDateFormatter::SHORT,
  14. -                    $timeType,
  15. -                    $timezone
  16. -                );
  17. -                $timestamp = $formatter->parse($date);
  18. -                $date = $timestamp
  19. -                    ? (new \DateTime('@' . $timestamp))->setTimezone($timezone)
  20. -                    : new \DateTime($date, $timezone);
  21. -                break;
  22. -            case (is_numeric($date)):
  23. -                $date = new \DateTime('@' . $date);
  24. -                $date = $date->setTimezone($timezone);
  25. -                break;
  26.              default:
  27. -                $date = new \DateTime($date, $timezone);
  28. +                $date = new \DateTime(is_numeric($date) ? '@' . $date : $date);
  29. +                $date->setTimezone($timezone);
  30.                  break;
  31.          }
  32.  
  33. diff --git a/vendor/magento/framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php b/vendor/magento/framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
  34. index 566992c70b5e..12ba34778b66 100644
  35. --- a/vendor/magento/framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
  36. +++ b/vendor/magento/framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
  37. @@ -314,14 +314,15 @@ public function scopeDateDataProvider(): array
  38.  
  39.          return [
  40.              ['2018-10-20 00:00:00', 'UTC', 'en_US', '2018-10-20 00:00:00'],
  41. -            ['2018-10-20 00:00:00', 'America/Los_Angeles', 'en_US', '2018-10-20 00:00:00'],
  42. -            ['2018-10-20 00:00:00', 'Asia/Qatar', 'en_US', '2018-10-20 00:00:00'],
  43. +            ['2018-10-20 00:00:00', 'America/Los_Angeles', 'en_US', '2018-10-19 17:00:00'],
  44. +            ['2018-10-20 00:00:00', 'Asia/Qatar', 'en_US', '2018-10-20 03:00:00'],
  45. +            ['2018-10-20 00:00:00', 'America/Los_Angeles', 'en_GB', '2018-10-19 17:00:00'],
  46.              ['10/20/18 00:00', 'UTC', 'en_US', '2018-10-20 00:00:00'],
  47. -            ['10/20/18 00:00', 'America/Los_Angeles', 'en_US', '2018-10-20 00:00:00'],
  48. -            ['10/20/18 00:00', 'Asia/Qatar', 'en_US', '2018-10-20 00:00:00'],
  49. -            ['20/10/18 00:00', 'UTC', 'fr_FR', '2018-10-20 00:00:00'],
  50. -            ['20/10/18 00:00', 'America/Los_Angeles', 'fr_FR', '2018-10-20 00:00:00'],
  51. -            ['20/10/18 00:00', 'Asia/Qatar', 'fr_FR', '2018-10-20 00:00:00'],
  52. +            ['10/20/18 00:00', 'America/Los_Angeles', 'en_US', '2018-10-19 17:00:00'],
  53. +            ['10/20/18 00:00', 'Asia/Qatar', 'en_US', '2018-10-20 03:00:00'],
  54. +            ['10/20/18 00:00', 'UTC', 'fr_FR', '2018-10-20 00:00:00'],
  55. +            ['10/20/18 00:00', 'America/Los_Angeles', 'fr_FR', '2018-10-19 17:00:00'],
  56. +            ['10/20/18 00:00', 'Asia/Qatar', 'fr_FR', '2018-10-20 03:00:00'],
  57.              [1539993600, 'UTC', 'en_US', '2018-10-20 00:00:00'],
  58.              [1539993600, 'America/Los_Angeles', 'en_US', '2018-10-19 17:00:00'],
  59.              [1539993600, 'Asia/Qatar', 'en_US', '2018-10-20 03:00:00'],
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement