From ae0b6bd70af414b4a99af5e75baf1e32ea996f29 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Fri, 17 Jul 2026 10:28:10 +0200
Subject: [PATCH] [REFACTOR] Move ilias3.sql database template to Database
 component

The ilias3.sql database dump template lived in the Setup component
(formerly setup_). It is the database template consumed exclusively by
the Database setup (ilDatabaseSetupConfig / ilDatabasePopulatedObjective),
so it belongs in the Database component.

Moved components/ILIAS/Setup/sql/ilias3.sql to
components/ILIAS/Database/sql/ilias3.sql and updated all path references:
ilDatabaseSetupConfig::DEFAULT_PATH_TO_DB_DUMP, ilDBUpdate custom updates
path, composer.json classmap exclude, PHP-CS-Fixer exclude and .gitignore.
---
 .gitignore                                                      | 2 +-
 .../ILIAS/Database/classes/Setup/ilDatabaseSetupConfig.php      | 2 +-
 components/ILIAS/Database/classes/ilDBUpdate.php                | 2 +-
 components/ILIAS/{Setup => Database}/sql/ilias3.sql             | 0
 composer.json                                                   | 2 +-
 scripts/PHP-CS-Fixer/code-format.php_cs                         | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename components/ILIAS/{Setup => Database}/sql/ilias3.sql (100%)

diff --git a/.gitignore b/.gitignore
index da9bdca6e50d..81929aa66c58 100755
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@
 /ilias.ini.php
 /ilias.log
 /db_template_writer.php
-/components/ILIAS/Setup/sql/dbupdate_custom.php
+/components/ILIAS/Database/sql/dbupdate_custom.php
 /install_client.php
 
 # Directories
diff --git a/components/ILIAS/Database/classes/Setup/ilDatabaseSetupConfig.php b/components/ILIAS/Database/classes/Setup/ilDatabaseSetupConfig.php
index 39b8376f3592..226b7d2f0213 100755
--- a/components/ILIAS/Database/classes/Setup/ilDatabaseSetupConfig.php
+++ b/components/ILIAS/Database/classes/Setup/ilDatabaseSetupConfig.php
@@ -24,7 +24,7 @@
 class ilDatabaseSetupConfig implements Config
 {
     public const DEFAULT_COLLATION = "utf8_general_ci";
-    public const DEFAULT_PATH_TO_DB_DUMP = "./components/ILIAS/Setup/sql/ilias3.sql";
+    public const DEFAULT_PATH_TO_DB_DUMP = "./components/ILIAS/Database/sql/ilias3.sql";
 
     protected string $type;
 
diff --git a/components/ILIAS/Database/classes/ilDBUpdate.php b/components/ILIAS/Database/classes/ilDBUpdate.php
index bad2feeb13ad..926a6fa0df31 100755
--- a/components/ILIAS/Database/classes/ilDBUpdate.php
+++ b/components/ILIAS/Database/classes/ilDBUpdate.php
@@ -250,7 +250,7 @@ private function readCustomUpdatesInfo(bool $a_force = false): void
         }
 
         $this->custom_updates_setting = new ilSetting();
-        $custom_updates_file = $this->PATH . './components/ILIAS/Setup/sql/dbupdate_custom.php';
+        $custom_updates_file = $this->PATH . './components/ILIAS/Database/sql/dbupdate_custom.php';
         if (is_file($custom_updates_file)) {
             $this->custom_updates_content = @file($custom_updates_file);
             $this->custom_updates_current_version = (int) $this->custom_updates_setting->get('db_version_custom', '0');
diff --git a/components/ILIAS/Setup/sql/ilias3.sql b/components/ILIAS/Database/sql/ilias3.sql
similarity index 100%
rename from components/ILIAS/Setup/sql/ilias3.sql
rename to components/ILIAS/Database/sql/ilias3.sql
diff --git a/composer.json b/composer.json
index e6356cde6bf7..1c6b314928b2 100755
--- a/composer.json
+++ b/composer.json
@@ -96,7 +96,7 @@
 			"./components/ILIAS/Migration",
 			"./*/*/lib",
 			"./public/Customizing/**/vendor",
-			"./components/ILIAS/Setup/sql",
+			"./components/ILIAS/Database/sql",
 			"./cli/setup.php",
 			"./components/ILIAS/Setup/client.master.ini.php",
 			"./components/ILIAS/Setup/ilias.master.ini.php"
diff --git a/scripts/PHP-CS-Fixer/code-format.php_cs b/scripts/PHP-CS-Fixer/code-format.php_cs
index 6dc6ea125f33..277457a725ba 100755
--- a/scripts/PHP-CS-Fixer/code-format.php_cs
+++ b/scripts/PHP-CS-Fixer/code-format.php_cs
@@ -2,7 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()
 	->exclude(array(
-		__DIR__ . '/../../components/ILIAS/Setup/sql',
+		__DIR__ . '/../../components/ILIAS/Database/sql',
 		__DIR__ . '/example'
 	))
 	->in(array(