Merge pull request #162 from PrestaSafe/3.0.2

3.0.2

.github/workflows/php.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
       - name: Checkout
         uses: actions/checkout@v3
       - name: Cache dependencies

.gitignore

@@ -9,4 +9,4 @@ views/images/*
 **.DS_Store**
 test.php
 .php-cs-fixer.cache
-_dev/yarn.lock
+_dev/yarn.lock

_dev/package.json

@@ -6,7 +6,8 @@
     "dev": "vite --port 3002",
     "build": "vite build",
     "watch": "vite build --watch",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "watch-iframe": "vite build --watch --config vite.config.prettyblocks.js"
   },
   "dependencies": {
     "@headlessui/vue": "^1.7.16",

classes/PrettyBlocksModel.php

@@ -177,11 +177,11 @@ public function saveConfigField($name, $new_value)
         if (isset($this->configFields[$name])) {
             $newField = $this->configFields[$name]->setAttribute('new_value', $new_value)->compile();
             $jsonConfig = json_decode($this->config, true);
-            if (!is_null($jsonConfig)) {
-                $json = [];
+            if (is_null($jsonConfig)) {
+                $jsonConfig = [];
             }
-            $json[$name] = $newField;
-            $this->config = json_encode($json, true);
+            $jsonConfig[$name] = $newField;
+            $this->config = json_encode($jsonConfig, true);
 
             return $this->save();
         }

composer.json

@@ -41,7 +41,7 @@
       "php-cs-fixer fix --no-interaction --dry-run --diff"
     ],
     "fix": [
-      "php-cs-fixer fix --diff"
+      "php-cs-fixer fix"
     ],
     "autoindex": [
       "vendor/bin/autoindex prestashop:add:index ./"