fix deprecations (#84)

alexz707 · web-flow · commit 78e2f8069d55 · 2025-01-15T17:09:54.000+01:00
diff --git a/src/Lib/CacheResolver.php b/src/Lib/CacheResolver.php
@@ -28,7 +28,7 @@ public function save(
         mixed $data,
         string $key,
         array $tags = [],
-        DateInterval|int $lifetime = null,
+        DateInterval|int|null $lifetime = null,
         int $priority = 0,
         bool $force = false
     ): void {
diff --git a/src/Lib/CacheResolverInterface.php b/src/Lib/CacheResolverInterface.php
@@ -27,7 +27,7 @@ public function save(
         mixed $data,
         string $key,
         array $tags = [],
-        DateInterval|int $lifetime = null,
+        DateInterval|int|null $lifetime = null,
         int $priority = 0,
         bool $force = false
     ): void;
diff --git a/src/Lib/ConfigResolver.php b/src/Lib/ConfigResolver.php
@@ -29,25 +29,25 @@ public function locateConfigFile(string $name): string
         return Config::locateConfigFile($name);
     }
 
-    public function getSystemConfiguration(string $offset = null): ?array
+    public function getSystemConfiguration(?string $offset = null): ?array
     {
         return Config::getSystemConfiguration($offset);
     }
 
-    public function getWebsiteConfigRuntimeCacheKey(string $language = null): string
+    public function getWebsiteConfigRuntimeCacheKey(?string $language = null): string
     {
         return Config::getWebsiteConfigRuntimeCacheKey($language);
     }
 
-    public function getWebsiteConfig(string $language = null): array
+    public function getWebsiteConfig(?string $language = null): array
     {
         return Config::getWebsiteConfig($language);
     }
 
     public function getWebsiteConfigValue(
-        string $key = null,
+        ?string $key = null,
         mixed $default = null,
-        string $language = null
+        ?string $language = null
     ): mixed {
         return Config::getWebsiteConfigValue($key, $default, $language);
     }
diff --git a/src/Lib/ConfigResolverInterface.php b/src/Lib/ConfigResolverInterface.php
@@ -25,16 +25,16 @@ interface ConfigResolverInterface
 {
     public function locateConfigFile(string $name): string;
 
-    public function getSystemConfiguration(string $offset = null): ?array;
+    public function getSystemConfiguration(?string $offset = null): ?array;
 
-    public function getWebsiteConfigRuntimeCacheKey(string $language = null): string;
+    public function getWebsiteConfigRuntimeCacheKey(?string $language = null): string;
 
-    public function getWebsiteConfig(string $language = null): array;
+    public function getWebsiteConfig(?string $language = null): array;
 
     public function getWebsiteConfigValue(
-        string $key = null,
+        ?string $key = null,
         mixed $default = null,
-        string $language = null
+        ?string $language = null
     ): mixed;
 
     /**
diff --git a/src/Lib/DocumentResolver.php b/src/Lib/DocumentResolver.php
@@ -28,7 +28,7 @@ final class DocumentResolver implements DocumentResolverInterface
     /**
      * @throws Exception
      */
-    public function getInstance(string $adapter = null): ?Adapter
+    public function getInstance(?string $adapter = null): ?Adapter
     {
         Document::getInstance($adapter);
     }
diff --git a/src/Lib/DocumentResolverInterface.php b/src/Lib/DocumentResolverInterface.php
@@ -27,7 +27,7 @@ interface DocumentResolverInterface
     /**
      * @throws Exception
      */
-    public function getInstance(string $adapter = null): ?Adapter;
+    public function getInstance(?string $adapter = null): ?Adapter;
 
     public function isAvailable(): bool;
 
diff --git a/src/Lib/Helper/MailResolver.php b/src/Lib/Helper/MailResolver.php
@@ -47,7 +47,7 @@ public function formatDebugReceivers(array $receivers): string
     /**
      * @throws Exception
      */
-    public function setAbsolutePaths(string $string, ?Document $document = null, string $hostUrl = null): string
+    public function setAbsolutePaths(string $string, ?Document $document = null, ?string $hostUrl = null): string
     {
         return MailHelper::setAbsolutePaths($string, $document, $hostUrl);
     }
diff --git a/src/Lib/Helper/MailResolverInterface.php b/src/Lib/Helper/MailResolverInterface.php
@@ -37,7 +37,7 @@ public function formatDebugReceivers(array $receivers): string;
     /**
      * @throws Exception
      */
-    public function setAbsolutePaths(string $string, ?Document $document = null, string $hostUrl = null): string;
+    public function setAbsolutePaths(string $string, ?Document $document = null, ?string $hostUrl = null): string;
 
     /**
      * @throws Exception
diff --git a/src/Lib/ToolResolver.php b/src/Lib/ToolResolver.php
@@ -46,7 +46,7 @@ public function getDefaultLanguage(): ?string
     /**
      * @throws Exception
      */
-    public function getMail(array|string $recipients = null, string $subject = null): Mail
+    public function getMail(array|string|null $recipients = null, ?string $subject = null): Mail
     {
         return Tool::getMail($recipients, $subject);
     }
diff --git a/src/Lib/ToolResolverInterface.php b/src/Lib/ToolResolverInterface.php
@@ -36,5 +36,5 @@ public function getDefaultLanguage(): ?string;
     /**
      * @throws Exception
      */
-    public function getMail(array|string $recipients = null, string $subject = null): Mail;
+    public function getMail(array|string|null $recipients = null, ?string $subject = null): Mail;
 }
diff --git a/src/Lib/Tools/Authentication/AuthenticationResolver.php b/src/Lib/Tools/Authentication/AuthenticationResolver.php
@@ -25,7 +25,7 @@
  */
 final class AuthenticationResolver implements AuthenticationResolverInterface
 {
-    public function authenticateSession(Request $request = null): ?User
+    public function authenticateSession(?Request $request = null): ?User
     {
         return Authentication::authenticateSession($request);
     }
diff --git a/src/Lib/Tools/Authentication/AuthenticationResolverInterface.php b/src/Lib/Tools/Authentication/AuthenticationResolverInterface.php
@@ -24,7 +24,7 @@
  */
 interface AuthenticationResolverInterface
 {
-    public function authenticateSession(Request $request = null): ?User;
+    public function authenticateSession(?Request $request = null): ?User;
 
     public function generateTokenByUser(User $user): string;
 
diff --git a/src/Models/Asset/AssetServiceResolver.php b/src/Models/Asset/AssetServiceResolver.php
@@ -39,7 +39,7 @@ public function createFolderByPath(string $path, array $options = []): Folder
         return Service::createFolderByPath($path, $options);
     }
 
-    public function pathExists(string $path, string $type = null): bool
+    public function pathExists(string $path, ?string $type = null): bool
     {
         return Service::pathExists($path, $type);
     }
diff --git a/src/Models/Asset/AssetServiceResolverInterface.php b/src/Models/Asset/AssetServiceResolverInterface.php
@@ -28,5 +28,5 @@ public function rewriteIds(Asset $asset, array $rewriteConfig): Asset;
 
     public function createFolderByPath(string $path, array $options = []): Folder;
 
-    public function pathExists(string $path, string $type = null): bool;
+    public function pathExists(string $path, ?string $type = null): bool;
 }
diff --git a/src/Models/DataObject/DataObjectServiceResolver.php b/src/Models/DataObject/DataObjectServiceResolver.php
@@ -56,7 +56,7 @@ public function createFolderByPath(string $path, array $options = []): Folder
         return Service::createFolderByPath($path, $options);
     }
 
-    public function pathExists(string $path, string $type = null): bool
+    public function pathExists(string $path, ?string $type = null): bool
     {
         return Service::pathExists($path, $type);
     }
@@ -68,7 +68,7 @@ public function getCustomLayoutDefinitionForGridColumnConfig(ClassDefinition $cl
 
     public function enrichLayoutDefinition(
         ClassDefinition\Data|ClassDefinition\Layout|null &$layout,
-        Concrete $object = null,
+        ?Concrete $object = null,
         array $context = []
     ): void {
         Service::enrichLayoutDefinition($layout, $object, $context);
diff --git a/src/Models/DataObject/DataObjectServiceResolverInterface.php b/src/Models/DataObject/DataObjectServiceResolverInterface.php
@@ -39,13 +39,13 @@ public function rewriteIds(AbstractObject $object, array $rewriteConfig, array $
 
     public function createFolderByPath(string $path, array $options = []): Folder;
 
-    public function pathExists(string $path, string $type = null): bool;
+    public function pathExists(string $path, ?string $type = null): bool;
 
     public function getCustomLayoutDefinitionForGridColumnConfig(ClassDefinition $class, int $objectId): array;
 
     public function enrichLayoutDefinition(
         ClassDefinition\Data|ClassDefinition\Layout|null &$layout,
-        Concrete $object = null,
+        ?Concrete $object = null,
         array $context = []
     ): void;
 
diff --git a/src/Models/Document/DocumentServiceResolver.php b/src/Models/Document/DocumentServiceResolver.php
@@ -43,7 +43,7 @@ public function createFolderByPath(string $path, array $options = []): Folder
         return Service::createFolderByPath($path, $options);
     }
 
-    public function pathExists(string $path, string $type = null): bool
+    public function pathExists(string $path, ?string $type = null): bool
     {
         return Service::pathExists($path, $type);
     }
diff --git a/src/Models/Document/DocumentServiceResolverInterface.php b/src/Models/Document/DocumentServiceResolverInterface.php
@@ -33,5 +33,5 @@ public function rewriteIds(
 
     public function createFolderByPath(string $path, array $options = []): Folder;
 
-    public function pathExists(string $path, string $type = null): bool;
+    public function pathExists(string $path, ?string $type = null): bool;
 }
diff --git a/src/Models/Element/ServiceResolver.php b/src/Models/Element/ServiceResolver.php
@@ -48,7 +48,7 @@ public function findForbiddenPaths(string $type, User $user): array
         return Service::findForbiddenPaths($type, $user);
     }
 
-    public function isPublished(ElementInterface $element = null): bool
+    public function isPublished(?ElementInterface $element = null): bool
     {
         return Service::isPublished($element);
     }
diff --git a/src/Models/Element/ServiceResolverInterface.php b/src/Models/Element/ServiceResolverInterface.php
@@ -43,7 +43,7 @@ public function getElementType(ElementInterface $element): ?string;
 
     public function findForbiddenPaths(string $type, User $user): array;
 
-    public function isPublished(ElementInterface $element = null): bool;
+    public function isPublished(?ElementInterface $element = null): bool;
 
     public function getValidKey(string $key, string $type): string;
 

Original file line number	Diff line number	Diff line change
`@@ -29,25 +29,25 @@ public function locateConfigFile(string $name): string`
`29`	`29`	`return Config::locateConfigFile($name);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function getSystemConfiguration(string $offset = null): ?array`
	`32`	`+ public function getSystemConfiguration(?string $offset = null): ?array`
`33`	`33`	`{`
`34`	`34`	`return Config::getSystemConfiguration($offset);`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function getWebsiteConfigRuntimeCacheKey(string $language = null): string`
	`37`	`+ public function getWebsiteConfigRuntimeCacheKey(?string $language = null): string`
`38`	`38`	`{`
`39`	`39`	`return Config::getWebsiteConfigRuntimeCacheKey($language);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function getWebsiteConfig(string $language = null): array`
	`42`	`+ public function getWebsiteConfig(?string $language = null): array`
`43`	`43`	`{`
`44`	`44`	`return Config::getWebsiteConfig($language);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function getWebsiteConfigValue(`
`48`		`- string $key = null,`
	`48`	`+ ?string $key = null,`
`49`	`49`	`mixed $default = null,`
`50`		`- string $language = null`
	`50`	`+ ?string $language = null`
`51`	`51`	`): mixed {`
`52`	`52`	`return Config::getWebsiteConfigValue($key, $default, $language);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class DocumentResolver implements DocumentResolverInterface`
`28`	`28`	`/**`
`29`	`29`	`* @throws Exception`
`30`	`30`	`*/`
`31`		`- public function getInstance(string $adapter = null): ?Adapter`
	`31`	`+ public function getInstance(?string $adapter = null): ?Adapter`
`32`	`32`	`{`
`33`	`33`	`Document::getInstance($adapter);`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function formatDebugReceivers(array $receivers): string`
`47`	`47`	`/**`
`48`	`48`	`* @throws Exception`
`49`	`49`	`*/`
`50`		`- public function setAbsolutePaths(string $string, ?Document $document = null, string $hostUrl = null): string`
	`50`	`+ public function setAbsolutePaths(string $string, ?Document $document = null, ?string $hostUrl = null): string`
`51`	`51`	`{`
`52`	`52`	`return MailHelper::setAbsolutePaths($string, $document, $hostUrl);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function getDefaultLanguage(): ?string`
`46`	`46`	`/**`
`47`	`47`	`* @throws Exception`
`48`	`48`	`*/`
`49`		`- public function getMail(array\|string $recipients = null, string $subject = null): Mail`
	`49`	`+ public function getMail(array\|string\|null $recipients = null, ?string $subject = null): Mail`
`50`	`50`	`{`
`51`	`51`	`return Tool::getMail($recipients, $subject);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,5 @@ public function getDefaultLanguage(): ?string;`
`36`	`36`	`/**`
`37`	`37`	`* @throws Exception`
`38`	`38`	`*/`
`39`		`- public function getMail(array\|string $recipients = null, string $subject = null): Mail;`
	`39`	`+ public function getMail(array\|string\|null $recipients = null, ?string $subject = null): Mail;`
`40`	`40`	`}`