enable native lazy orm objects

g5bot · g5bot · commit e601d41cce79 · 2025-10-05T23:12:44.000+02:00
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest']
-        php: [8.3, 8.4]
+        php: [8.4]
     steps:
       - uses: actions/checkout@v5
 
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,6 @@ src/Public/robots.txt
 backup
 *.sqlite
 build
-OrmProxy
 src/lang/*/*/*.mo
 .php-cs-fixer.cache
 .githooks
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -27,7 +27,6 @@ filter:
   excluded_paths:
     - 'src/html/'
     - 'src/Migrations/'
-    - 'src/OrmProxy/'
     - 'src/Public/assets/'
   dependency_paths:
     - 'vendor/'
diff --git a/Makefile b/Makefile
@@ -50,7 +50,6 @@ generateMigrations:force
 
 migrateDatabase:force
 	vendor/bin/doctrine-migrations migrate --all-or-nothing --allow-no-migration --quiet -vv
-	bin/doctrine orm:generate-proxies
 
 resetGame:force
 	bin/cli game:reset
diff --git a/README.md b/README.md
@@ -37,13 +37,7 @@ Code:
 
 ## DB-Änderungen via Doctrine-Migrations
 
-- Entities editieren und danach Proxies generieren:
-
-```shell
-bin/doctrine orm:generate-proxies
-```
-
-- DB-Änderungen mit Script generieren. In src/Migrations/Sqlite darf immer nur die aktuellste Datei liegen!
+- Entities editieren und danach die DB-Änderungen mit Script generieren. In src/Migrations/Sqlite darf immer nur die aktuellste Datei liegen!
 
 ```shell
 generate-migrations.sh
diff --git a/composer.json b/composer.json
@@ -106,7 +106,6 @@
     }
   ],
   "scripts": {
-    "orm:proxies": "./bin/doctrine orm:generate-proxies",
     "unittests": "@php vendor/bin/phpunit --testsuite 'STU unit'",
     "integrationtests": "@php vendor/bin/phpunit --testsuite 'STU integration'",
     "stan": "phpstan",
diff --git a/config/config.dist.json b/config/config.dist.json
@@ -8,8 +8,7 @@
     "pass": "me",
     "database": "change_me",
     "backup_dir": "change/me",
-    "backup_cycle_time": 2592000,
-    "proxy_namespace": "Stu\\Orm\\Proxy"
+    "backup_cycle_time": 2592000
   },
   "mq": {
     "host": "stu-mq",
diff --git a/phpunit.xml b/phpunit.xml
@@ -13,7 +13,6 @@
     <exclude>
       <directory suffix="services.php">src</directory>
       <directory>src/Migrations</directory>
-      <directory>src/OrmProxy</directory>
       <directory>src/Public</directory>
     </exclude>
   </source>
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.organization=st-universe
 sonar.projectKey=st-universe_core
 sonar.sources=src
 sonar.tests=tests
-sonar.exclusions=src/html/**/*,src/Migrations/**/*,src/OrmProxy/**/*,src/Public/**/*,**/__snapshots__/**
+sonar.exclusions=src/html/**/*,src/Migrations/**/*,src/Public/**/*,**/__snapshots__/**
 sonar.test.exclusions=**/__snapshots__/**
-sonar.coverage.exclusions=src/html/**/*,src/Migrations/**/*,src/OrmProxy/**/*,src/Public/**/*,**/__snapshots__/**
+sonar.coverage.exclusions=src/html/**/*,src/Migrations/**/*,src/Public/**/*,**/__snapshots__/**
 sonar.php.coverage.reportPaths=build/coverage-clover.xml
diff --git a/src/Module/Config/Model/DbSettings.php b/src/Module/Config/Model/DbSettings.php
@@ -9,7 +9,6 @@ final class DbSettings extends AbstractSettings implements DbSettingsInterface
     private const string SETTING_USE_SQLITE = 'useSqlite';
     private const string SETTING_SQLITE_DSN = 'sqliteDsn';
     private const string SETTING_DATABASE = 'database';
-    private const string SETTING_PROXY_NAMESPACE = 'proxy_namespace';
 
     #[Override]
     public function useSqlite(): bool
@@ -28,10 +27,4 @@ public function getDatabase(): string
     {
         return $this->settingsCore->getStringConfigValue(self::SETTING_DATABASE);
     }
-
-    #[Override]
-    public function getProxyNamespace(): string
-    {
-        return $this->settingsCore->getStringConfigValue(self::SETTING_PROXY_NAMESPACE);
-    }
 }
diff --git a/src/Module/Config/Model/DbSettingsInterface.php b/src/Module/Config/Model/DbSettingsInterface.php
@@ -9,6 +9,4 @@ public function useSqlite(): bool;
     public function getSqliteDsn(): string;
 
     public function getDatabase(): string;
-
-    public function getProxyNamespace(): string;
 }
diff --git a/src/Orm/Transaction/services.php b/src/Orm/Transaction/services.php
@@ -25,14 +25,13 @@
     Configuration::class => function (ContainerInterface $c): Configuration {
         $stuConfig = $c->get(StuConfigInterface::class);
 
-        $emConfig = ORMSetup::createAttributeMetadataConfiguration(
+        $emConfig = ORMSetup::createAttributeMetadataConfig(
             [__DIR__ . '/../../Orm/Entity/'],
             $stuConfig->getDebugSettings()->isDebugMode(),
-            __DIR__ . '/../../OrmProxy/',
+            (string)$stuConfig->getGameSettings()->getVersion(),
             $c->get(CacheItemPoolInterface::class)
         );
-        $emConfig->setAutoGenerateProxyClasses(0);
-        $emConfig->setProxyNamespace($stuConfig->getDbSettings()->getProxyNamespace());
+        $emConfig->enableNativeLazyObjects(true);
 
         return $emConfig;
     },
diff --git a/tests/IntegrationTestCase.php b/tests/IntegrationTestCase.php
@@ -9,7 +9,6 @@
 use Doctrine\Migrations\DependencyFactory;
 use Doctrine\Migrations\Tools\Console\Command\MigrateCommand;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Tools\Console\Command\GenerateProxiesCommand;
 use Doctrine\ORM\Tools\Console\Command\SchemaTool\DropCommand;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Doctrine\ORM\Tools\Console\EntityManagerProvider\SingleManagerProvider;
@@ -38,13 +37,11 @@ abstract class IntegrationTestCase extends StuTestCase
     protected static ?TestSession $testSession = null;
 
     protected static bool $isSchemaInitializationNeeded = true;
-    private static bool $areProxiesInitialized = false;
     private static ?StuContainer $INTTEST_CONTAINER = null;
 
     #[Override]
     public function setUp(): void
     {
-        $this->initializeProxies();
         $this->initializeSchemaAndTestdataIfNeeded();
         $this->setupTestSession();
         $this->setupServiceMocks();
@@ -166,14 +163,6 @@ private function initializeSchemaAndTestData(): IntegrationTestCase
         return $this;
     }
 
-    private function initializeProxies(): void
-    {
-        if (!self::$areProxiesInitialized) {
-            $this->runCommand(GenerateProxiesCommand::class, "orm:generate-proxies --quiet");
-            self::$areProxiesInitialized = true;
-        }
-    }
-
     protected function runCommand(string $commandClass, string $input): void
     {
         $dic = $this->getContainer();
diff --git a/tests/unit/Module/Config/Model/DbSettingsTest.php b/tests/unit/Module/Config/Model/DbSettingsTest.php
@@ -59,17 +59,4 @@ public function testGetDatabase(): void
 
         $this->assertEquals('test', $namespace);
     }
-
-
-    public function testGetProxyNamespace(): void
-    {
-        $this->settingsCore->shouldReceive('getStringConfigValue')
-            ->with('proxy_namespace')
-            ->once()
-            ->andReturn('test');
-
-        $namespace = $this->subject->getProxyNamespace();
-
-        $this->assertEquals('test', $namespace);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@`
`106`	`106`	`}`
`107`	`107`	`],`
`108`	`108`	`"scripts": {`
`109`		`- "orm:proxies": "./bin/doctrine orm:generate-proxies",`
`110`	`109`	`"unittests": "@php vendor/bin/phpunit --testsuite 'STU unit'",`
`111`	`110`	`"integrationtests": "@php vendor/bin/phpunit --testsuite 'STU integration'",`
`112`	`111`	`"stan": "phpstan",`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ final class DbSettings extends AbstractSettings implements DbSettingsInterface`
`9`	`9`	`private const string SETTING_USE_SQLITE = 'useSqlite';`
`10`	`10`	`private const string SETTING_SQLITE_DSN = 'sqliteDsn';`
`11`	`11`	`private const string SETTING_DATABASE = 'database';`
`12`		`- private const string SETTING_PROXY_NAMESPACE = 'proxy_namespace';`
`13`	`12`
`14`	`13`	`#[Override]`
`15`	`14`	`public function useSqlite(): bool`
`@@ -28,10 +27,4 @@ public function getDatabase(): string`
`28`	`27`	`{`
`29`	`28`	`return $this->settingsCore->getStringConfigValue(self::SETTING_DATABASE);`
`30`	`29`	`}`
`31`		`-`
`32`		`- #[Override]`
`33`		`- public function getProxyNamespace(): string`
`34`		`- {`
`35`		`- return $this->settingsCore->getStringConfigValue(self::SETTING_PROXY_NAMESPACE);`
`36`		`- }`
`37`	`30`	`}`