Merge remote-tracking branch 'origin/2.x' into Add-Contracts

Author: herbertroth

.github/workflows/codeception.yaml

@@ -14,9 +14,9 @@ jobs:
     strategy:
         matrix:
             include:
-                - { php-version: 8.1, dependencies: lowest, pimcore_version: "", experimental: false }
-                - { php-version: 8.3, dependencies: highest, pimcore_version: "", experimental: false }
-                - { php-version: 8.3, dependencies: highest, pimcore_version: "11.x-dev as 11.99.9", experimental: true }
+                - { php-version: 8.3, dependencies: lowest, pimcore_version: "", experimental: false }
+                - { php-version: 8.4, dependencies: highest, pimcore_version: "", experimental: false }
+                - { php-version: 8.4, dependencies: highest, pimcore_version: "12.x-dev as 12.99.9", experimental: true }
     steps:
       - name: Checkout
         uses: actions/checkout@v3

composer.json

@@ -20,9 +20,11 @@
       "Pimcore\\Bundle\\StaticResolverBundle\\Tests\\": "tests"
     }
   },
+  "prefer-stable": true,
+  "minimum-stability": "dev",
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-    "pimcore/pimcore": "^11.0",
+    "php": "~8.3.0 || ~8.4.0",
+    "pimcore/pimcore": "^12.0",
     "friendsofphp/proxy-manager-lts": "^1"
   },
   "require-dev": {

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 {

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;

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);
     }

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;
 
     /**

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);
     }

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;
 

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);
     }

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