Merge branch 'b-7.3.x' into b-8.0.x

# Conflicts: # CHANGELOG-2.x.md # tests/Integration/TwigEngine/TemplateChain/ModulesTemplateChainTest.php # tests/Integration/TwigEngine/TemplateChainSorting/ModulesTemplateChainSortingTest.php # tests/Integration/TwigEngine/ThemeInheritance/ShopTemplateDirectoryResolvingTest.php # tests/Unit/Extensions/Filters/DateFormatExtensionTest.php
OXID-eSales · Feb 14, 2025 · a0252f0 · a0252f0
2 parents 3dbb3de + 6c8fc9e
commit a0252f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/Extensions/Filters/DateFormatExtension.php b/src/Extensions/Filters/DateFormatExtension.php
@@ -13,6 +13,9 @@
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
+/**
+ * @deprecated in next major version, use twig date filter
+ */
 class DateFormatExtension extends AbstractExtension
 {
     public function __construct(private DateFormatHelper $dateFormatHelper)

diff --git a/tests/Unit/Loader/CmsLoaderTest.php b/tests/Unit/Loader/CmsLoaderTest.php
@@ -61,16 +61,14 @@ public function setUp(): void
 
         $contentFactoryMock
             ->method('getContent')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        ['ident', 'valid', $validContentMock],
-                        ['oxid', 'english', $englishContentMock],
-                        ['ident', 'field', $fieldContentMock],
-                        ['oxid', 'notFresh', $notFreshContentMock],
-                        ['ident', 'notValid', $notValidContentMock]
-                    ]
-                )
+            ->willReturnMap(
+                [
+                    ['ident', 'valid', $validContentMock],
+                    ['oxid', 'english', $englishContentMock],
+                    ['ident', 'field', $fieldContentMock],
+                    ['oxid', 'notFresh', $notFreshContentMock],
+                    ['ident', 'notValid', $notValidContentMock]
+                ]
             );
 
         /** @var ContentFactory $contentFactoryMock */