From 8474ee1063d11f1d5fd4b79674d2d734b82e18b0 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 08:59:03 +0000
Subject: [PATCH] relocate sorm classes, fixes #4106
Closes #4106
Merge request studip/studip!2953
---
lib/{models => classes}/SimpleCollection.class.php | 0
lib/{models => classes}/SimpleORMap.class.php | 0
lib/{models => classes}/SimpleORMapCollection.class.php | 0
tests/unit/lib/VisualTest.php | 2 +-
tests/unit/lib/classes/MigrationTest.php | 2 +-
5 files changed, 2 insertions(+), 2 deletions(-)
rename lib/{models => classes}/SimpleCollection.class.php (100%)
rename lib/{models => classes}/SimpleORMap.class.php (100%)
rename lib/{models => classes}/SimpleORMapCollection.class.php (100%)
diff --git a/lib/models/SimpleCollection.class.php b/lib/classes/SimpleCollection.class.php
similarity index 100%
rename from lib/models/SimpleCollection.class.php
rename to lib/classes/SimpleCollection.class.php
diff --git a/lib/models/SimpleORMap.class.php b/lib/classes/SimpleORMap.class.php
similarity index 100%
rename from lib/models/SimpleORMap.class.php
rename to lib/classes/SimpleORMap.class.php
diff --git a/lib/models/SimpleORMapCollection.class.php b/lib/classes/SimpleORMapCollection.class.php
similarity index 100%
rename from lib/models/SimpleORMapCollection.class.php
rename to lib/classes/SimpleORMapCollection.class.php
diff --git a/tests/unit/lib/VisualTest.php b/tests/unit/lib/VisualTest.php
index dfa2945bf6d..c62cd052a0a 100644
--- a/tests/unit/lib/VisualTest.php
+++ b/tests/unit/lib/VisualTest.php
@@ -9,7 +9,7 @@
* the License, or (at your option) any later version.
*/
-require_once 'lib/models/SimpleORMap.class.php';
+require_once 'lib/classes/SimpleORMap.class.php';
require_once 'lib/models/OpenGraphURL.class.php';
require_once 'lib/visual.inc.php';
require_once 'lib/classes/Config.class.php';
diff --git a/tests/unit/lib/classes/MigrationTest.php b/tests/unit/lib/classes/MigrationTest.php
index 444ebf2fe8e..4a45e71598c 100644
--- a/tests/unit/lib/classes/MigrationTest.php
+++ b/tests/unit/lib/classes/MigrationTest.php
@@ -16,10 +16,10 @@ class MigrationTest extends \Codeception\Test\Unit
$this->before = $GLOBALS['CACHING_ENABLE'] ?? null;
$GLOBALS['CACHING_ENABLE'] = false;
+ require_once 'lib/classes/SimpleORMap.class.php';
require_once 'lib/classes/StudipCache.class.php';
require_once 'lib/classes/StudipMemoryCache.class.php';
require_once 'lib/classes/StudipCacheFactory.class.php';
- require_once 'lib/models/SimpleORMap.class.php';
require_once 'lib/migrations/Migration.php';
require_once 'lib/migrations/Migrator.php';
--
GitLab