Merge remote-tracking branch 'origin/pimcore6' into pimcore6

elements-at · Dec 22, 2021 · 72e6c7a · 72e6c7a
2 parents 78ddaff + 43803b5
commit 72e6c7a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/src/Model/CallbackSetting/Dao.php b/src/Model/CallbackSetting/Dao.php
@@ -60,8 +60,13 @@ public function save()
 
     public function delete()
     {
-        if ($this->model->getId()) {
-            $this->db->query('DELETE FROM '.$this->getTableName().' where id='.$this->model->getId());
+        $id = $this->model->getId();
+
+        if ($id) {
+            $this->db
+                ->prepare('DELETE FROM ' . $this->getTableName() . ' WHERE `id` = ?')
+                ->execute([$id]);
+
             $this->model = null;
         }
     }

diff --git a/src/Model/Configuration/Dao.php b/src/Model/Configuration/Dao.php
@@ -34,14 +34,20 @@ protected function getTableName()
 
     public function delete()
     {
-        if ($this->model->getId()) {
-            $list = new MonitoringItem\Listing();
-            $list->setCondition('configurationId = ?', [$this->model->getId()]);
-            $items = $list->load();
+        $id = $this->model->getId();
+
+        if ($id) {
+            $items = (new MonitoringItem\Listing())
+                ->setCondition('configurationId = ?', [$id])
+                ->load();
+
             foreach ($items as $item) {
                 $item->delete();
             }
-            $this->db->query('DELETE FROM ' . $this->getTableName() . ' where id=' . $this->model->getId());
+
+            $this->db
+                ->prepare('DELETE FROM ' . $this->getTableName() . ' WHERE `id` = ?')
+                ->execute([$id]);
         }
     }
 

diff --git a/src/Model/MonitoringItem/Dao.php b/src/Model/MonitoringItem/Dao.php
@@ -85,7 +85,9 @@ public function save($preventModificationDateUpdate = false)
 
     public function delete()
     {
-        if ($this->model->getId()) {
+        $id = $this->model->getId();
+
+        if ($id) {
             foreach ((array)$this->model->getActions() as $action) {
                 if ($class = $action['class']) {
                     /**
@@ -96,10 +98,14 @@ public function delete()
                 }
             }
 
-            $this->db->query('DELETE FROM '.$this->getTableName().' where id='.$this->model->getId());
+            $this->db
+                ->prepare('DELETE FROM ' . $this->getTableName() . ' WHERE `id` = ?')
+                ->execute([$id]);
+
             if ($logFile = $this->model->getLogFile()) {
                 @unlink($logFile);
             }
+
             $this->model = null;
         }
     }