Release 1.5.6

benjaminjonard · Feb 13, 2024 · 9ad5249 · 9ad5249
1 parent e070aca
commit 9ad5249
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/docker-release-frankenphp.yml b/.github/workflows/docker-release-frankenphp.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: benjaminjonard/koillection
-          ref: 1.5.5
+          ref: 1.5.6
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
@@ -34,5 +34,5 @@ jobs:
         with:
           file: Dockerfile.frankenphp
           push: true
-          tags: docker.io/koillection/koillection:frankenphp,docker.io/koillection/koillection:latest-frankenphp,docker.io/koillection/koillection:1.5.5-frankenphp
+          tags: docker.io/koillection/koillection:frankenphp,docker.io/koillection/koillection:latest-frankenphp,docker.io/koillection/koillection:1.5.6-frankenphp
           platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: benjaminjonard/koillection
-          ref: 1.5.5
+          ref: 1.5.6
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
@@ -34,5 +34,5 @@ jobs:
         with:
           file: Dockerfile
           push: true
-          tags: docker.io/koillection/koillection:latest,docker.io/koillection/koillection:1.5.5
+          tags: docker.io/koillection/koillection:latest,docker.io/koillection/koillection:1.5.6
           platforms: linux/amd64,linux/arm64
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.5.6] / 2024-02-13
+### Fixes
+- Fix quotes in doctrine json datatype migrations (benjaminjonard)
+
 ## [1.5.5] / 2024-02-13
 ### Fixes
 - Fix doctrine json datatype migrations (benjaminjonard)

diff --git a/assets/package.json b/assets/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koillection",
   "preferGlobal": true,
-  "version": "1.5.5",
+  "version": "1.5.6",
   "author": "Benjamin Jonard",
   "description": "Front assets for Koillection",
   "license": "MIT",

diff --git a/composer.json b/composer.json
@@ -3,6 +3,7 @@
     "description": "Koillection is a self-hosted service allowing users to manage any kind of collection.",
     "type": "project",
     "license": "MIT",
+    "version": "1.5.6",
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {

diff --git a/config/packages/api_platform.yaml b/config/packages/api_platform.yaml
@@ -1,6 +1,6 @@
 api_platform:
   title: 'Koillection API'
-  version: 1.5.5
+  version: 1.5.6
   show_webby: false
 
   formats:

diff --git a/config/services.yaml b/config/services.yaml
@@ -1,5 +1,5 @@
 parameters:
-    release: '1.5.5'
+    release: '1.5.6'
     default_locale: 'en'
     container.dumper.inline_factories: true
 

diff --git a/migrations/Mysql/Version20240204172429.php b/migrations/Mysql/Version20240204172429.php
@@ -41,7 +41,7 @@ private function convertValueFromArrayToJson($table, $property): void
             $id = $row['id'];
             $data = $row[$property];
             $encodedData = $data ? unserialize($data) : [];
-            $encodedData = json_encode($encodedData);
+            $encodedData = addslashes(json_encode($encodedData));
 
             $this->addSql("UPDATE $table SET $property = '$encodedData' WHERE id = '$id'");
         }

diff --git a/migrations/Postgresql/Version20240204165839.php b/migrations/Postgresql/Version20240204165839.php
@@ -44,7 +44,7 @@ private function convertValueFromArrayToJson($table, $property): void
             $id = $row['id'];
             $data = $row[$property];
             $encodedData = $data ? unserialize($data) : [];
-            $encodedData = json_encode($encodedData);
+            $encodedData = str_replace("'", "''", json_encode($encodedData));
 
             $this->addSql("UPDATE $table SET $property = '$encodedData' WHERE id = '$id'");
         }