chg: pkg: upgrade the BE deps to the latest possible version #14

composer.json

@@ -27,34 +27,34 @@
     "scheb/2fa-backup-code": "^8.5",
     "scheb/2fa-bundle": "^8.5",
     "scheb/2fa-totp": "^8.5",
-    "symfony/console": "7.4.*",
+    "symfony/console": "8.1.*",
     "symfony/flex": "^2.10.0",
-    "symfony/form": "7.4.*",
+    "symfony/form": "8.1.*",
-    "symfony/framework-bundle": "7.4.*",
+    "symfony/framework-bundle": "8.1.*",
-    "symfony/http-client": "7.4.*",
+    "symfony/http-client": "8.1.*",
-    "symfony/mailer": "7.4.*",
+    "symfony/mailer": "8.1.*",
     "symfony/mercure": "^0.7",
     "symfony/mercure-bundle": "^0.4",
-    "symfony/messenger": "7.4.*",
+    "symfony/messenger": "8.1.*",
     "symfony/monolog-bundle": "^4.0",
-    "symfony/scheduler": "7.4.*",
+    "symfony/scheduler": "8.1.*",
-    "symfony/security-bundle": "7.4.*",
+    "symfony/security-bundle": "8.1.*",
-    "symfony/translation": "7.4.*",
+    "symfony/translation": "8.1.*",
-    "symfony/twig-bundle": "7.4.*",
+    "symfony/twig-bundle": "8.1.*",
-    "symfony/validator": "7.4.*",
+    "symfony/validator": "8.1.*",
-    "symfony/yaml": "7.4.*",
+    "symfony/yaml": "8.1.*",
     "web-auth/webauthn-framework": "^5.2"
   },
   "require-dev": {
     "dama/doctrine-test-bundle": "^8.6",
     "phpunit/phpunit": "^13.1",
     "roave/security-advisories": "dev-master",
-    "symfony/browser-kit": "7.4.*",
+    "symfony/browser-kit": "8.1.*",
-    "symfony/css-selector": "7.4.*",
+    "symfony/css-selector": "8.1.*",
-    "symfony/dotenv": "7.4.*",
+    "symfony/dotenv": "8.1.*",
     "symfony/maker-bundle": "^1.5",
-    "symfony/stopwatch": "7.4.*",
+    "symfony/stopwatch": "8.1.*",
-    "symfony/web-profiler-bundle": "7.4.*",
+    "symfony/web-profiler-bundle": "8.1.*",
     "zenstruck/foundry": "^2.9"
   },
   "config": {
@@ -104,7 +104,7 @@
   "extra": {
     "symfony": {
       "allow-contrib": false,
-      "require": "7.4.*"
+      "require": "8.1.*"
     }
   }
 }

config/packages/zenstruck_foundry.yaml

@@ -1,6 +1,7 @@
 when@dev: &dev
     # See full configuration: https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#full-default-bundle-configuration
     zenstruck_foundry:
+        enable_auto_refresh_with_lazy_objects: true
         persistence:
             # Flush only once per call of `PersistentObjectFactory::create()`
             flush_once: true

config/routes/dev/twig.yaml

@@ -1,3 +1,3 @@
 _errors:
-    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+    resource: '@FrameworkBundle/Resources/config/routing/errors.php'
     prefix: /_error

config/routes/dev/web_profiler.yaml

@@ -1,7 +1,7 @@
 web_profiler_wdt:
-    resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
+    resource: '@WebProfilerBundle/Resources/config/routing/wdt.php'
     prefix: /_wdt
 
 web_profiler_profiler:
-    resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
+    resource: '@WebProfilerBundle/Resources/config/routing/profiler.php'
     prefix: /_profiler

src/Controller/GameController.php

@@ -60,6 +60,7 @@ class GameController extends AbstractController
     {
         return $this->render('Game/play.html.twig', [
             'env'                    => $this->env,
+            'game_assoc'             => $gameAssoc,
             'mercure_hub_url'        => $this->mercurePublicUrl,
             'mercure_subscriber_jwt' => $this->mercureJwtService->mintSubscriberToken(
                 $gameAssoc ?? '', $this->opponentNameService->resolveUserName(),

src/Security/UserChecker.php

@@ -11,6 +11,7 @@
 namespace App\Security;
 
 use App\Entity\User;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -40,5 +41,5 @@ final class UserChecker implements UserCheckerInterface
         }
     }
 
-    public function checkPostAuth(UserInterface $user): void { }
+    public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void { }
 }

templates/Game/play.html.twig

@@ -14,7 +14,7 @@
     <div class="mine-container">
         <div id="mine-wrapper"
              data-env="{{ env }}"
-             data-game-id="{{ app.request.get('gameAssoc') }}"
+             data-game-id="{{ game_assoc }}"
              data-opponent-name="{{ opponent_name }}"
              data-is-authenticated="{{ app.user ? '1' : '0' }}"
              data-mercure-hub-url="{{ mercure_hub_url }}"

tests/Command/PurgeExpiredPendingUsersCommandTest.php

@@ -48,9 +48,9 @@ class PurgeExpiredPendingUsersCommandTest extends WebTestCase
         $tester->execute([]);
 
         $em = static::getContainer()->get(EntityManagerInterface::class);
-        self::assertNull($em->find(User::class, $expiredUser->_real()->id));
+        self::assertNull($em->find(User::class, $expiredUser->id));
-        self::assertNotNull($em->find(User::class, $pendingUser->_real()->id));
+        self::assertNotNull($em->find(User::class, $pendingUser->id));
-        self::assertNotNull($em->find(User::class, $verifiedUser->_real()->id));
+        self::assertNotNull($em->find(User::class, $verifiedUser->id));
     }
 
     #[Test]
@@ -68,6 +68,6 @@ class PurgeExpiredPendingUsersCommandTest extends WebTestCase
         $tester->execute(['--dry-run' => true]);
 
         $em = static::getContainer()->get(EntityManagerInterface::class);
-        self::assertNotNull($em->find(User::class, $expiredUser->_real()->id));
+        self::assertNotNull($em->find(User::class, $expiredUser->id));
     }
 }

tests/Controller/SecurityControllerTest.php

@@ -119,7 +119,7 @@ class SecurityControllerTest extends WebTestCase
 
         self::assertResponseRedirects('/login');
 
-        static::getContainer()->get(EntityManagerInterface::class)->refresh($user->_real());
+        static::getContainer()->get(EntityManagerInterface::class)->refresh($user);
         self::assertFalse($user->isVerified);
         self::assertSame('expired-activation-token', $user->verificationToken);
     }
@@ -138,7 +138,7 @@ class SecurityControllerTest extends WebTestCase
     public function authenticatedUserRedirectsFromLogin(): void
     {
         $user = UserFactory::createOne();
-        $this->client->loginUser($user->_real());
+        $this->client->loginUser($user);
 
         $this->client->request('GET', '/login');
 
@@ -150,7 +150,7 @@ class SecurityControllerTest extends WebTestCase
     public function authenticatedUserRedirectsFromRegister(): void
     {
         $user = UserFactory::createOne();
-        $this->client->loginUser($user->_real());
+        $this->client->loginUser($user);
 
         $this->client->request('GET', '/register');
 

tests/Factory/ContactMessageFactory.php

@@ -11,7 +11,7 @@
 namespace App\Tests\Factory;
 
 use App\Entity\ContactMessage;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class ContactMessageFactory
@@ -23,9 +23,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<ContactMessage>
+ * @extends PersistentObjectFactory<ContactMessage>
  */
-class ContactMessageFactory extends PersistentProxyObjectFactory
+class ContactMessageFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {

tests/Factory/GamerFactory.php

@@ -12,7 +12,7 @@ namespace App\Tests\Factory;
 
 use App\Entity\Gamer;
 use DateTime;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class GamerFactory
@@ -24,9 +24,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<Gamer>
+ * @extends PersistentObjectFactory<Gamer>
  */
-class GamerFactory extends PersistentProxyObjectFactory
+class GamerFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {

tests/Factory/GridFactory.php

@@ -12,7 +12,7 @@ namespace App\Tests\Factory;
 
 use App\Entity\Grid;
 use App\Entity\GridRow;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class GridFactory
@@ -24,9 +24,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<Grid>
+ * @extends PersistentObjectFactory<Grid>
  */
-class GridFactory extends PersistentProxyObjectFactory
+class GridFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {
@@ -45,7 +45,7 @@ class GridFactory extends PersistentProxyObjectFactory
         return $this->afterInstantiate(function (Grid $grid): void {
             for ($i = 0; $i < 16; $i++) {
                 /** @var GridRow $factory */
-                $factory = GridRowFactory::new()->create()->_real();
+                $factory = GridRowFactory::new()->create();
                 $grid->addGridRow($factory);
             }
         });

tests/Factory/GridRowFactory.php

@@ -11,7 +11,7 @@
 namespace App\Tests\Factory;
 
 use App\Entity\GridRow;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class GridRowFactory
@@ -23,9 +23,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<GridRow>
+ * @extends PersistentObjectFactory<GridRow>
  */
-class GridRowFactory extends PersistentProxyObjectFactory
+class GridRowFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {

tests/Factory/PlayedGameFactory.php

@@ -13,7 +13,7 @@ namespace App\Tests\Factory;
 use App\Entity\PlayedGame;
 use DateTime;
 use Symfony\Component\Uid\Uuid;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class PlayedGameFactory
@@ -25,9 +25,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<PlayedGame>
+ * @extends PersistentObjectFactory<PlayedGame>
  */
-class PlayedGameFactory extends PersistentProxyObjectFactory
+class PlayedGameFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {

tests/Factory/StepFactory.php

@@ -12,7 +12,7 @@ namespace App\Tests\Factory;
 
 use App\Entity\Step;
 use DateTime;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class StepFactory
@@ -24,9 +24,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<Step>
+ * @extends PersistentObjectFactory<Step>
  */
-class StepFactory extends PersistentProxyObjectFactory
+class StepFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {

tests/Factory/UserFactory.php

@@ -11,7 +11,7 @@
 namespace App\Tests\Factory;
 
 use App\Entity\User;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class UserFactory
@@ -23,9 +23,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<User>
+ * @extends PersistentObjectFactory<User>
  */
-class UserFactory extends PersistentProxyObjectFactory
+class UserFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {

tests/Factory/WebAuthnCredentialFactory.php

@@ -12,7 +12,7 @@ namespace App\Tests\Factory;
 
 use App\Entity\WebAuthnCredential;
 use DateTime;
-use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 
 /**
  * Class WebAuthnCredentialFactory
@@ -24,9 +24,9 @@ use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
  * @link     www.splendidbear.org
  * @since    2026. 04. 21.
  *
- * @extends PersistentProxyObjectFactory<WebAuthnCredential>
+ * @extends PersistentObjectFactory<WebAuthnCredential>
  */
-class WebAuthnCredentialFactory extends PersistentProxyObjectFactory
+class WebAuthnCredentialFactory extends PersistentObjectFactory
 {
     protected function defaults(): array
     {

tests/Integration/FactoryExampleTest.php

@@ -44,7 +44,7 @@ class FactoryExampleTest extends WebTestCase
     {
         $user = UserFactory::createOne();
 
-        self::assertInstanceOf(User::class, $user->_real());
+        self::assertInstanceOf(User::class, $user);
         self::assertNotNull($user->username);
         self::assertNotNull($user->email);
         self::assertTrue($user->isVerified);
@@ -87,7 +87,7 @@ class FactoryExampleTest extends WebTestCase
             ->withRegisteredPlayers()
             ->create();
 
-        self::assertInstanceOf(PlayedGame::class, $game->_real());
+        self::assertInstanceOf(PlayedGame::class, $game);
         self::assertNotNull($game->red);
         self::assertNotNull($game->blue);
         self::assertNull($game->redAnon);
@@ -181,7 +181,7 @@ class FactoryExampleTest extends WebTestCase
             ->recentlyUsed()
             ->create(['user' => $user]);
 
-        self::assertEquals($user->_real(), $credential->user);
+        self::assertEquals($user, $credential->user);
         self::assertEquals('YubiKey 5C', $credential->credentialName);
         self::assertNotNull($credential->lastUsedAt);
     }