Fix conflicts

OXID-eSales · Nov 14, 2024 · 8e3d142 · 8e3d142
1 parent 40d3420
commit 8e3d142
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 204 deletions.
diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
diff --git a/CHANGELOG-3.x.md b/CHANGELOG-3.x.md
@@ -2,6 +2,10 @@
 
 ## v3.0.0 - unreleased
 
+### Added
+- PHPUnit v11 support
+
 ### Removed
 - `SmartyCycleExtension` was removed
 - Short template names (without file extensions `".html.twig"`) are not longer supported.
+- PHPUnit v10 support
diff --git a/tests/Integration/Extensions/SmartyCycleExtensionTest.php b/tests/Integration/Extensions/SmartyCycleExtensionTest.php
diff --git a/tests/Integration/Resolver/TemplateFileResolverTest.php b/tests/Integration/Resolver/TemplateFileResolverTest.php