magento/magento2#39169: Special Price To Date is wrongly validated on applySpecialPrice

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\Stdlib\DateTime;
@@ -274,9 +274,9 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
         $scopeTimeStamp = $this->scopeTimeStamp($scope);
         $fromTimeStamp = strtotime($dateFrom);
         $toTimeStamp = strtotime($dateTo);
-        if ($dateTo) {
+        if ($dateTo && date('H:i:s', strtotime($dateTo)) === '00:00:00') {
             // fix date YYYY-MM-DD 00:00:00 to YYYY-MM-DD 23:59:59
-            $toTimeStamp += 86400;
+            $toTimeStamp += 86399;
         }
 
         return !(!$this->_dateTime->isEmptyDate($dateFrom) && $scopeTimeStamp < $fromTimeStamp ||

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

@@ -0,0 +1,134 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
+ */
+
+namespace Magento\Framework\Stdlib\Test\Unit\DateTime;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
+use Magento\Framework\Stdlib\DateTime\Timezone;
+use PHPUnit\Framework\MockObject\Exception;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for scope date interval functionality @see Timezone
+ */
+class TimezoneScopeTest extends TestCase
+{
+    /**
+     * @var string|null
+     */
+    private ?string $defaultTimeZone;
+
+    /**
+     * @var string
+     */
+    private string $scopeType = 'store';
+
+    /**
+     * @var string
+     */
+    private string $defaultTimezonePath = 'default/timezone/path';
+
+    /**
+     * @var ScopeResolverInterface|MockObject
+     */
+    private ScopeResolverInterface|MockObject $scopeResolver;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private MockObject|ScopeConfigInterface $scopeConfig;
+
+    /**
+     * @var ResolverInterface|MockObject
+     */
+    private ResolverInterface|MockObject $localeResolver;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->defaultTimeZone = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+        $this->scopeType = 'store';
+        $this->defaultTimezonePath = 'default/timezone/path';
+
+        $this->scopeResolver = $this->getMockBuilder(ScopeResolverInterface::class)
+            ->getMock();
+        $this->localeResolver = $this->getMockBuilder(ResolverInterface::class)
+            ->getMock();
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMock();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        date_default_timezone_set($this->defaultTimeZone);
+    }
+
+    /**
+     * @return Timezone
+     * @throws Exception
+     */
+    private function getTimezone(): Timezone
+    {
+        return new Timezone(
+            $this->scopeResolver,
+            $this->localeResolver,
+            $this->createMock(DateTime::class),
+            $this->scopeConfig,
+            $this->scopeType,
+            $this->defaultTimezonePath,
+            new DateFormatterFactory()
+        );
+    }
+
+    /**
+     * @return void
+     * @throws Exception
+     */
+    public function testIsScopeDateInInterval()
+    {
+        $scopeMock = $this->createMock(ScopeInterface::class);
+        $this->scopeResolver->method('getScope')->willReturn($scopeMock);
+
+        $result = $this->getTimezone()->isScopeDateInInterval(
+            null,
+            '2025-04-01 00:00:00',
+            '2999-05-01 00:00:00',
+        );
+
+        $this->assertTrue($result);
+    }
+
+    /**
+     * @return void
+     * @throws Exception
+     */
+    public function testIsScopeDateInIntervalFalse()
+    {
+        $scopeMock = $this->createMock(ScopeInterface::class);
+        $this->scopeResolver->method('getScope')->willReturn($scopeMock);
+
+        $result = $this->getTimezone()->isScopeDateInInterval(
+            null,
+            '2025-03-01 00:00:00',
+            '2025-04-01 00:00:00',
+        );
+
+        $this->assertFalse($result);
+    }
+}