Merge branch 'master' into haste5

CHANGELOG.md

@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 - Added: dynamically load either StringUtil or StringParser methods based on which version of contao-haste is installed
 - Changed: adapt StringUtil to haste 5 changes
 
+## [1.15.14] - 2023-02-28
+- Fixed: invalid return type
+
+## [1.15.13] - 2023-02-22
+- Fixed: invalid syntax
+
 ## [1.15.12] - 2023-01-09
 - Changed: allow phpfastcache 7 for usage in projects with php 8
 - Changed: adapt usage of phpfastcache to work with the new version

library/Haste/Cache/Cache.php

@@ -35,7 +35,7 @@ public function __construct(string $driver = 'auto', $config = null)
      *
      * @return Cache The object instance
      */
-    public static function getInstance($config = null): Cache
+    public static function getInstance($config = null)
     {
         if (static::$objInstance === null) {
             static::$objInstance = CacheManager::getInstance(static::$driver, self::getOptions($config));

library/Haste/Cache/FileCache.php

@@ -18,8 +18,12 @@ class FileCache extends Cache
 
     protected static $driver = 'files';
 
-    protected static function extendOptions($config = new ConfigurationOption): ConfigurationOption
+    protected static function extendOptions($config = null): ConfigurationOption
     {
+        if (!$config) {
+            $config = new ConfigurationOption();
+        }
+
         $filename = TL_ROOT . '/' . ltrim(self::$cacheDir, '/');
 
         if (!is_dir($filename)) {