OXDEV-9585 Support PHP v8.5

Author: AshrafOxid

CHANGELOG-2.x.md

@@ -4,6 +4,7 @@
 
 ### Added
 - Template Filter to sanitize HTML content
+- PHP v8.5 support
 
 ### Changed
 - Extension include_content uses HTML sanitizer

src/Extensions/Filters/CatExtension.php

@@ -28,7 +28,7 @@ public function getFilters(): array
      *
      * @return string
      */
-    public function cat(string $string = null, string $cat = null): string
+    public function cat(?string $string = null, ?string $cat = null): string
     {
         return $string . $cat;
     }

src/Extensions/Filters/FormatDateExtension.php

@@ -38,7 +38,7 @@ public function getFilters(): array
      *
      * @return string
      */
-    public function formatDate($convObject, string $fieldType = null, bool $passedValue = false): ?string
+    public function formatDate($convObject, ?string $fieldType = null, bool $passedValue = false): ?string
     {
         return $this->formatDateLogic->formdate($convObject, $fieldType, $passedValue);
     }

src/Extensions/Filters/TranslateSalutationExtension.php

@@ -36,7 +36,7 @@ public function getFilters(): array
      *
      * @return string
      */
-    public function translateSalutation(string $ident = null): string
+    public function translateSalutation(?string $ident = null): string
     {
         if (isset($ident) && is_string($ident)) {
             return $this->translateSalutationLogic->translateSalutation($ident);

src/Extensions/Filters/TruncateExtension.php

@@ -33,7 +33,7 @@ public function getFilters(): array
     }
 
     public function truncate(
-        string $string = null,
+        ?string $string = null,
         int $length = 80,
         string $suffix = '...',
         bool $breakWords = false,

src/Extensions/IfContentExtension.php

@@ -34,7 +34,7 @@ public function getTokenParsers(): array
      *
      * @return mixed
      */
-    public function getContent(string $sIdent = null, string $sOxid = null)
+    public function getContent(?string $sIdent = null, ?string $sOxid = null)
     {
         return $this->ifContentLogic->getContent($sIdent, $sOxid);
     }

src/Extensions/InsertTrackerExtension.php

@@ -29,7 +29,7 @@ public function getFunctions(): array
      *
      * @return string
      */
-    public function insertTracker(Environment $env = null, $params = []): string
+    public function insertTracker(?Environment $env = null, $params = []): string
     {
         return '';
     }

src/Loader/FilesystemLoader.php

@@ -16,7 +16,7 @@ class FilesystemLoader extends \Twig\Loader\FilesystemLoader
     public function __construct(
         private TemplateDirectoryResolverInterface $templateDirectoryResolver,
         $paths = [],
-        string $rootPath = null
+        ?string $rootPath = null
     ) {
         parent::__construct(
             $paths,