🐛 default 60 sec for cache did not work (v2)

Signed-off-by: bnomei <[email protected]>

Author: bnomei

classes/Blueprints/Blueprint.php

@@ -80,7 +80,8 @@ public function toArray(): array
 
         // some might not be cacheable like when they are class based and have dynamic fields
         // only set here now if they will not be written on __destruct by trait
-        if ($this->cache && ! method_exists($this->modelClass, 'blueprintCacheKey')) {
+        // the cacha could be null which means it will use the default value
+        if (! in_array($this->cache, [false, 0]) && ! method_exists($this->modelClass, 'blueprintCacheKey')) {
             BlueprintCache::set($key, $blueprint);
         }
 

classes/Blueprints/BlueprintCache.php

@@ -37,8 +37,10 @@ public static function cacheDir(): ?string
         $file = self::cacheDirMemoryFile();
         if (F::exists($file)) {
             $dir = F::read($file);
+
             return $dir !== false ? $dir : null;
         }
+
         return null;
     }
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby-blueprints",
     "type": "kirby-plugin",
-    "version": "4.4.7",
+    "version": "4.4.8",
     "license": "MIT",
     "homepage": "https://github.com/bnomei/kirby3-blueprints",
     "description": "PHP Class-based Blueprints for Kirby CMS for better type safety and code completion",

composer.lock

@@ -2,4 +2,4 @@
 
 const KIRBY_HELPER_DUMP = false;
 require_once __DIR__.'/../vendor/autoload.php';
-echo (new Kirby())->render();
+echo (new Kirby)->render();

tests/bootstrap.php

@@ -7,7 +7,7 @@
 
 $micotime = microtime(true);
 //\Bnomei\Blueprints\BlueprintCache::preloadFromLoadMap();
-$kirby = new Kirby();
+$kirby = new Kirby;
 $render = $kirby->render();
 $micotime = microtime(true) - $micotime;
 header('X-Render-Time: '.number_format($micotime, 3, '.', '').'s');

tests/index.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby-blueprints',
-        'pretty_version' => '4.4.7',
-        'version' => '4.4.7.0',
+        'pretty_version' => '4.4.8',
+        'version' => '4.4.8.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby-blueprints' => array(
-            'pretty_version' => '4.4.7',
-            'version' => '4.4.7.0',
+            'pretty_version' => '4.4.8',
+            'version' => '4.4.8.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',