tec: Upgrade to Foundry 2

Probesys · Jul 3, 2024 · 6fca2d6 · 6fca2d6
1 parent 6aba189
commit 6fca2d6
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 95 deletions.
diff --git a/.rector.php b/.rector.php
@@ -5,7 +5,6 @@
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\SetList;
 use Rector\Symfony\Set\SymfonySetList;
-use Zenstruck\Foundry\Utils\Rector\FoundrySetList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
@@ -25,6 +24,5 @@
         SymfonySetList::SYMFONY_63,
         SymfonySetList::SYMFONY_CODE_QUALITY,
         SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
-        FoundrySetList::UP_TO_FOUNDRY_2,
     ]);
 };
diff --git a/composer.json b/composer.json
@@ -115,6 +115,6 @@
         "symfony/phpunit-bridge": "6.4.*",
         "symfony/stopwatch": "6.4.*",
         "symfony/web-profiler-bundle": "6.4.*",
-        "zenstruck/foundry": "^1.22"
+        "zenstruck/foundry": "^2.0"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/tests/Controller/Tickets/TypeControllerTest.php b/tests/Controller/Tickets/TypeControllerTest.php
@@ -7,6 +7,7 @@
 namespace App\Tests\Controller\Tickets;
 
 use App\Tests\AuthorizationHelper;
+use App\Tests\FactoriesHelper;
 use App\Tests\Factory\TicketFactory;
 use App\Tests\Factory\UserFactory;
 use App\Tests\SessionHelper;
@@ -20,6 +21,7 @@ class TypeControllerTest extends WebTestCase
 {
     use AuthorizationHelper;
     use Factories;
+    use FactoriesHelper;
     use ResetDatabase;
     use SessionHelper;
 
@@ -62,6 +64,8 @@ public function testPostUpdateFailsIfTypeIsInvalid(): void
             'type' => $newType,
         ]);
 
+        $this->clearEntityManager();
+
         $this->assertResponseRedirects("/tickets/{$ticket->getUid()}", 302);
         $client->followRedirect();
         $this->assertSelectorTextContains('#notifications', 'Select a type from the list');

diff --git a/tests/Security/AuthorizerTest.php b/tests/Security/AuthorizerTest.php
@@ -6,6 +6,7 @@
 
 namespace App\Tests\Security;
 
+use App\Entity\Authorization;
 use App\Repository\AuthorizationRepository;
 use App\Security\Authorizer;
 use App\Tests\Factory\AuthorizationFactory;
@@ -38,10 +39,11 @@ public function setupTest(): void
         $authorizer = $container->get(Authorizer::class);
         $this->authorizer = $authorizer;
 
-        /** @var \Zenstruck\Foundry\RepositoryProxy<AuthorizationRepository> */
-        $authRepositoryProxy = AuthorizationFactory::repository();
+        /** @var \Doctrine\Bundle\DoctrineBundle\Registry */
+        $registry = $container->get('doctrine');
+        $entityManager = $registry->getManager();
         /** @var AuthorizationRepository */
-        $authRepository = $authRepositoryProxy->inner();
+        $authRepository = $entityManager->getRepository(Authorization::class);
         $this->authRepository = $authRepository;
     }
 

diff --git a/tests/Service/ActorsListerTest.php b/tests/Service/ActorsListerTest.php
@@ -6,6 +6,7 @@
 
 namespace App\Tests\Service;
 
+use App\Entity\Authorization;
 use App\Entity\User;
 use App\Repository\AuthorizationRepository;
 use App\Service\ActorsLister;
@@ -43,10 +44,11 @@ public function setupTest(): void
         $this->currentUser = UserFactory::createOne()->_real();
         $client->loginUser($this->currentUser);
 
-        /** @var \Zenstruck\Foundry\RepositoryProxy<AuthorizationRepository> */
-        $authRepositoryProxy = AuthorizationFactory::repository();
+        /** @var \Doctrine\Bundle\DoctrineBundle\Registry */
+        $registry = $container->get('doctrine');
+        $entityManager = $registry->getManager();
         /** @var AuthorizationRepository */
-        $authRepository = $authRepositoryProxy->inner();
+        $authRepository = $entityManager->getRepository(Authorization::class);
         $this->authRepository = $authRepository;
     }