From fbf3f93418502549b879f501f3e2ff33d3265d7c Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 8 Nov 2018 17:56:07 +0100
Subject: [PATCH] [REFACTORING] Static database reset
---
migration/18.04/migratePriorities.php | 4 +---
migration/18.10/migrateConvertedPdf.php | 4 +---
src/core/models/DatabasePDO.php | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/migration/18.04/migratePriorities.php b/migration/18.04/migratePriorities.php
index d43b5b1e53d..2945e7d7f71 100644
--- a/migration/18.04/migratePriorities.php
+++ b/migration/18.04/migratePriorities.php
@@ -46,9 +46,7 @@ foreach ($customs as $custom) {
}
}
- if (!empty($db)) {
- $db->reset();
- }
+ \SrcCore\models\DatabasePDO::reset();
$db = new \SrcCore\models\DatabasePDO(['customId' => $custom]);
foreach ($priorities as $key => $priority) {
diff --git a/migration/18.10/migrateConvertedPdf.php b/migration/18.10/migrateConvertedPdf.php
index 8e32d1e6e59..bbaf8314a09 100644
--- a/migration/18.10/migrateConvertedPdf.php
+++ b/migration/18.10/migrateConvertedPdf.php
@@ -15,9 +15,7 @@ foreach ($customs as $custom) {
continue;
}
- if (!empty($db)) {
- $db->reset();
- }
+ \SrcCore\models\DatabasePDO::reset();
$db = new \SrcCore\models\DatabasePDO(['customId' => $custom]);
diff --git a/src/core/models/DatabasePDO.php b/src/core/models/DatabasePDO.php
index 12bda566d64..b117e807a1e 100755
--- a/src/core/models/DatabasePDO.php
+++ b/src/core/models/DatabasePDO.php
@@ -191,7 +191,7 @@ class DatabasePDO
return ['where' => $where, 'limit' => $limit];
}
- public function reset()
+ public static function reset()
{
self::$pdo = null;
self::$preparedQueries = [];
--
GitLab