From 7f8f5990a72f00a5749491f41250e9cacbefc70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 7 Mar 2026 22:30:39 +0100
Subject: [PATCH] Fixed phpstan issues

---
 composer.json                                 |  5 ++
 composer.lock                                 |  2 +-
 phpstan.banned_code.neon                      | 86 +++++++++++++++++++
 phpstan.dist.neon                             |  6 +-
 .../ImportExportSystem/EntityImporter.php     |  6 +-
 5 files changed, 100 insertions(+), 5 deletions(-)
 create mode 100644 phpstan.banned_code.neon

diff --git a/composer.json b/composer.json
index 89e0f19b..9d51033e 100644
--- a/composer.json
+++ b/composer.json
@@ -177,6 +177,11 @@
             "allow-contrib": false,
             "require": "7.4.*",
             "docker": true
+        },
+        "phpstan/extension-installer": {
+            "ignore" : [
+                "ekino/phpstan-banned-code"
+            ]
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index 12a32829..8d224c67 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "32c5677a31185e0ed124904012500154",
+    "content-hash": "8fd737684b48f8d24fcad35fce37a297",
     "packages": [
         {
             "name": "amphp/amp",
diff --git a/phpstan.banned_code.neon b/phpstan.banned_code.neon
new file mode 100644
index 00000000..3099c384
--- /dev/null
+++ b/phpstan.banned_code.neon
@@ -0,0 +1,86 @@
+# Manually configure ekino/phpstan-banned-code to detect usage of echo, eval, die/exit, print, shell execution and a set of functions that should not be used in production code.
+
+parametersSchema:
+	banned_code: structure([
+		nodes: listOf(structure([
+			type: string()
+			functions: schema(listOf(string()), nullable())
+		]))
+		use_from_tests: bool()
+		non_ignorable: bool()
+	])
+
+parameters:
+	banned_code:
+		nodes:
+			# enable detection of echo
+			-
+				type: Stmt_Echo
+				functions: null
+
+			# enable detection of eval
+			-
+				type: Expr_Eval
+				functions: null
+
+			# enable detection of die/exit
+			-
+				type: Expr_Exit
+				functions: null
+
+			# enable detection of a set of functions
+			-
+				type: Expr_FuncCall
+				functions:
+					- dd
+					- debug_backtrace
+					- dump
+					- exec
+					- passthru
+					- phpinfo
+					- print_r
+					- proc_open
+					- shell_exec
+					- system
+					- var_dump
+
+			# enable detection of print statements
+			-
+				type: Expr_Print
+				functions: null
+
+			# enable detection of shell execution by backticks
+			-
+				type: Expr_ShellExec
+				functions: null
+
+			# enable detection of empty()
+			#-
+			#	type: Expr_Empty
+			#	functions: null
+
+		# enable detection of `use Tests\Foo\Bar` in a non-test file
+		use_from_tests: true
+
+		# when true, errors cannot be excluded
+		non_ignorable: false
+
+services:
+	-
+		class: Ekino\PHPStanBannedCode\Rules\BannedNodesRule
+		tags:
+			- phpstan.rules.rule
+		arguments:
+			- '%banned_code.nodes%'
+
+	-
+		class: Ekino\PHPStanBannedCode\Rules\BannedUseTestRule
+		tags:
+			- phpstan.rules.rule
+		arguments:
+			- '%banned_code.use_from_tests%'
+
+	-
+		class: Ekino\PHPStanBannedCode\Rules\BannedNodesErrorBuilder
+		arguments:
+			- '%banned_code.non_ignorable%'
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index b03c20c2..fe51518d 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -1,3 +1,6 @@
+includes:
+    - phpstan.banned_code.neon
+
 parameters:
 
     level: 5
@@ -6,9 +9,6 @@ parameters:
         - src
     #    - tests
 
-    banned_code:
-         non_ignorable: false # Allow to ignore some banned code
-
     excludePaths:
             - src/DataTables/Adapter/*
             - src/Configuration/*
diff --git a/src/Services/ImportExportSystem/EntityImporter.php b/src/Services/ImportExportSystem/EntityImporter.php
index e57f2126..c33d6e6a 100644
--- a/src/Services/ImportExportSystem/EntityImporter.php
+++ b/src/Services/ImportExportSystem/EntityImporter.php
@@ -325,7 +325,11 @@ class EntityImporter
 
         //Iterate over each $entity write it to DB (the invalid entities were already filtered out).
         foreach ($entities as $entity) {
-            $this->persistRecursively($entity);
+            if ($entity instanceof AbstractStructuralDBElement) {
+                $this->persistRecursively($entity);
+            } else {
+                $this->em->persist($entity);
+            }
         }
 
         //Save changes to database, when no error happened, or we should continue on error.