From 649cb7ec925eae7af27cc1e304e5226e215cdd7e Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Tue, 29 Aug 2023 11:11:02 +0200
Subject: [PATCH 1/4] Exporter: Handle NULL values properly

---
 src/DatabaseExporter.php | 6 +++++-
 src/DatabaseImporter.php | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/DatabaseExporter.php b/src/DatabaseExporter.php
index d576499f7..a87343813 100644
--- a/src/DatabaseExporter.php
+++ b/src/DatabaseExporter.php
@@ -302,7 +302,11 @@ protected function buildXmlData()
 				{
 					if (!in_array($key, $colblob))
 					{
-						$buffer[] = '    <field name="' . $key . '">' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</field>';
+						if (is_null($value)) {
+							$buffer[] = '    <field name="' . $key . '" value_is_null></field>';
+						} else {
+							$buffer[] = '    <field name="' . $key . '">' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</field>';
+						}
 					}
 					else
 					{
diff --git a/src/DatabaseImporter.php b/src/DatabaseImporter.php
index fe704d8d1..cedc60b17 100644
--- a/src/DatabaseImporter.php
+++ b/src/DatabaseImporter.php
@@ -267,7 +267,11 @@ public function importData()
 
 					foreach ($row->children() as $data)
 					{
-						$entry->{(string) $data['name']} = (string) $data;
+						if (isset($data['value_is_null'])) {
+							$entry->{(string)$data['name']} = null;
+						} else {
+							$entry->{(string)$data['name']} = (string)$data;
+						}
 					}
 
 					$this->db->insertObject($tableName, $entry);

From 0e65625697f286161b5163cbfbb9ab944ff43835 Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Fri, 22 Sep 2023 09:42:40 +0200
Subject: [PATCH 2/4] Codestylefixes

---
 src/DatabaseExporter.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/DatabaseExporter.php b/src/DatabaseExporter.php
index a87343813..2e367c68a 100644
--- a/src/DatabaseExporter.php
+++ b/src/DatabaseExporter.php
@@ -302,9 +302,12 @@ protected function buildXmlData()
 				{
 					if (!in_array($key, $colblob))
 					{
-						if (is_null($value)) {
+						if (is_null($value))
+						{
 							$buffer[] = '    <field name="' . $key . '" value_is_null></field>';
-						} else {
+						}
+						else
+						{
 							$buffer[] = '    <field name="' . $key . '">' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</field>';
 						}
 					}

From 215c15d332643c82058801744d2669850090a475 Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Fri, 22 Sep 2023 09:43:09 +0200
Subject: [PATCH 3/4] Codestyle

---
 src/DatabaseImporter.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/DatabaseImporter.php b/src/DatabaseImporter.php
index cedc60b17..e1a855c14 100644
--- a/src/DatabaseImporter.php
+++ b/src/DatabaseImporter.php
@@ -267,9 +267,12 @@ public function importData()
 
 					foreach ($row->children() as $data)
 					{
-						if (isset($data['value_is_null'])) {
+						if (isset($data['value_is_null']))
+						{
 							$entry->{(string)$data['name']} = null;
-						} else {
+						}
+						else
+						{
 							$entry->{(string)$data['name']} = (string)$data;
 						}
 					}

From 92a7d0613ee2bad9ca1c7f9265dbaa6949e8ec7a Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Fri, 22 Sep 2023 09:46:48 +0200
Subject: [PATCH 4/4] Codestyle

---
 src/DatabaseImporter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DatabaseImporter.php b/src/DatabaseImporter.php
index e1a855c14..4eabbdd56 100644
--- a/src/DatabaseImporter.php
+++ b/src/DatabaseImporter.php
@@ -269,11 +269,11 @@ public function importData()
 					{
 						if (isset($data['value_is_null']))
 						{
-							$entry->{(string)$data['name']} = null;
+							$entry->{(string) $data['name']} = null;
 						}
 						else
 						{
-							$entry->{(string)$data['name']} = (string)$data;
+							$entry->{(string) $data['name']} = (string) $data;
 						}
 					}