From 94ca46ca07a5949e1983ce35b302f85dcffb36f6 Mon Sep 17 00:00:00 2001
From: robertSt7 <robert.steinkellner@pimcore.com>
Date: Wed, 24 Sep 2025 10:12:58 +0200
Subject: [PATCH] add a CoreModel for the bundle installer

---
 tests/Model.suite.dist.yml         |  4 +--
 tests/Service.suite.dist.yml       |  4 +--
 tests/Support/Helper/CoreModel.php | 54 ++++++++++++++++++++++++++++++
 tests/Support/Helper/Model.php     | 31 -----------------
 tests/Unit.suite.dist.yml          |  2 +-
 5 files changed, 59 insertions(+), 36 deletions(-)
 create mode 100644 tests/Support/Helper/CoreModel.php

diff --git a/tests/Model.suite.dist.yml b/tests/Model.suite.dist.yml
index 5dd9a013602..6e022c1b4c0 100644
--- a/tests/Model.suite.dist.yml
+++ b/tests/Model.suite.dist.yml
@@ -2,6 +2,6 @@ actor: ModelTester
 modules:
     enabled:
         - \Pimcore\Tests\Support\Helper\Pimcore:
-            connect_db: true
+              connect_db: true
         - \Pimcore\Tests\Support\Helper\ClassManager
-        - \Pimcore\Tests\Support\Helper\Model
+        - \Pimcore\Tests\Support\Helper\CoreModel
diff --git a/tests/Service.suite.dist.yml b/tests/Service.suite.dist.yml
index e1672efcd4e..3620b9c5840 100644
--- a/tests/Service.suite.dist.yml
+++ b/tests/Service.suite.dist.yml
@@ -2,6 +2,6 @@ actor: ServiceTester
 modules:
     enabled:
         - \Pimcore\Tests\Support\Helper\Pimcore:
-            connect_db: true
+              connect_db: true
         - \Pimcore\Tests\Support\Helper\ClassManager
-        - \Pimcore\Tests\Support\Helper\Model
+        - \Pimcore\Tests\Support\Helper\CoreModel
diff --git a/tests/Support/Helper/CoreModel.php b/tests/Support/Helper/CoreModel.php
new file mode 100644
index 00000000000..fa2741b0e68
--- /dev/null
+++ b/tests/Support/Helper/CoreModel.php
@@ -0,0 +1,54 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * This source file is available under the terms of the
+ * Pimcore Open Core License (POCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (https://www.pimcore.com)
+ *  @license    Pimcore Open Core License (POCL)
+ */
+
+namespace Pimcore\Tests\Support\Helper;
+
+use Pimcore\Bundle\SeoBundle\Installer;
+use Pimcore\Bundle\SeoBundle\Model\Redirect;
+use Pimcore\Tests\Support\Util\Autoloader;
+
+class CoreModel extends Model
+{
+    public function _beforeSuite(array $settings = []): void
+    {
+        parent::_beforeSuite($settings);
+        $this->installSeoBundle();
+        $this->installSimpleBackendSearchBundle();
+    }
+
+    private function installSeoBundle(): void
+    {
+        /** @var Pimcore $pimcoreModule */
+        $pimcoreModule = $this->getModule('\\'.Pimcore::class);
+
+        $this->debug('[PimcoreSeoBundle] Running SeoBundle installer');
+
+        // install ecommerce framework
+        $installer = $pimcoreModule->getContainer()->get(Installer::class);
+        $installer->install();
+
+        //explicitly load installed classes so that the new ones are used during tests
+        Autoloader::load(Redirect::class);
+    }
+
+    private function installSimpleBackendSearchBundle(): void
+    {
+        /** @var Pimcore $pimcoreModule */
+        $pimcoreModule = $this->getModule('\\'.Pimcore::class);
+
+        $this->debug('[PimcoreSimpleBackendSearchBundle] Running SimpleBackendSearchBundle installer');
+
+        $installer = $pimcoreModule->getContainer()->get(\Pimcore\Bundle\SimpleBackendSearchBundle\Installer::class);
+        $installer->install();
+    }
+}
diff --git a/tests/Support/Helper/Model.php b/tests/Support/Helper/Model.php
index e52ee4acde1..c0770ece511 100644
--- a/tests/Support/Helper/Model.php
+++ b/tests/Support/Helper/Model.php
@@ -14,12 +14,9 @@
 namespace Pimcore\Tests\Support\Helper;
 
 use Exception;
-use Pimcore\Bundle\SeoBundle\Installer;
-use Pimcore\Bundle\SeoBundle\Model\Redirect;
 use Pimcore\Model\DataObject;
 use Pimcore\Model\DataObject\ClassDefinition;
 use Pimcore\Model\DataObject\Fieldcollection\Definition;
-use Pimcore\Tests\Support\Util\Autoloader;
 
 class Model extends AbstractDefinitionHelper
 {
@@ -27,8 +24,6 @@ public function _beforeSuite(array $settings = []): void
     {
         DataObject::setHideUnpublished(false);
         parent::_beforeSuite($settings);
-        $this->installSeoBundle();
-        $this->installSimpleBackendSearchBundle();
     }
 
     /**
@@ -1037,30 +1032,4 @@ public function setupQuantityValueUnits(): void
         $this->setupUnit('m');
         $this->setupUnit('km');
     }
-
-    private function installSeoBundle(): void
-    {
-        /** @var Pimcore $pimcoreModule */
-        $pimcoreModule = $this->getModule('\\'.Pimcore::class);
-
-        $this->debug('[PimcoreSeoBundle] Running SeoBundle installer');
-
-        // install ecommerce framework
-        $installer = $pimcoreModule->getContainer()->get(Installer::class);
-        $installer->install();
-
-        //explicitly load installed classes so that the new ones are used during tests
-        Autoloader::load(Redirect::class);
-    }
-
-    private function installSimpleBackendSearchBundle(): void
-    {
-        /** @var Pimcore $pimcoreModule */
-        $pimcoreModule = $this->getModule('\\'.Pimcore::class);
-
-        $this->debug('[PimcoreSimpleBackendSearchBundle] Running SimpleBackendSearchBundle installer');
-
-        $installer = $pimcoreModule->getContainer()->get(\Pimcore\Bundle\SimpleBackendSearchBundle\Installer::class);
-        $installer->install();
-    }
 }
diff --git a/tests/Unit.suite.dist.yml b/tests/Unit.suite.dist.yml
index cd947135917..85a3e556b0a 100644
--- a/tests/Unit.suite.dist.yml
+++ b/tests/Unit.suite.dist.yml
@@ -5,4 +5,4 @@ modules:
               connect_db: true
         - \Pimcore\Tests\Support\Helper\Unit
         - \Pimcore\Tests\Support\Helper\ClassManager
-        - \Pimcore\Tests\Support\Helper\Model
+        - \Pimcore\Tests\Support\Helper\CoreModel