Improve tests

HypeMC · HypeMC · commit 282eef492df0 · 2022-12-07T17:32:34.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CacheAttributeListenerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CacheAttributeListenerTest.php
@@ -11,37 +11,40 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\Cache;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
-class AttributeListenerPriorityTest extends AbstractWebTestCase
+class CacheAttributeListenerTest extends AbstractWebTestCase
 {
     public function testAnonimousUserWithEtag()
     {
-        $client = self::createClient(['test_case' => 'AttributeListenerPriority']);
+        $client = self::createClient(['test_case' => 'CacheAttributeListener']);
 
-        $client->request('GET', '/12345', server: ['HTTP_IF_NONE_MATCH' => sprintf('"%s"', hash('sha256', '12345'))]);
+        $client->request('GET', '/', server: ['HTTP_IF_NONE_MATCH' => sprintf('"%s"', hash('sha256', '12345'))]);
 
         self::assertTrue($client->getResponse()->isRedirect('http://localhost/login'));
     }
 
     public function testAnonimousUserWithoutEtag()
     {
-        $client = self::createClient(['test_case' => 'AttributeListenerPriority']);
+        $client = self::createClient(['test_case' => 'CacheAttributeListener']);
 
-        $client->request('GET', '/12345');
+        $client->request('GET', '/');
 
         self::assertTrue($client->getResponse()->isRedirect('http://localhost/login'));
     }
 
     public function testLoggedInUserWithEtag()
     {
-        $client = self::createClient(['test_case' => 'AttributeListenerPriority']);
+        $client = self::createClient(['test_case' => 'CacheAttributeListener']);
 
         $client->loginUser(new InMemoryUser('the-username', 'the-password', ['ROLE_USER']));
-        $client->request('GET', '/12345', server: ['HTTP_IF_NONE_MATCH' => sprintf('"%s"', hash('sha256', '12345'))]);
+        $client->request('GET', '/', server: ['HTTP_IF_NONE_MATCH' => sprintf('"%s"', hash('sha256', '12345'))]);
 
         $response = $client->getResponse();
 
@@ -51,10 +54,10 @@ public function testLoggedInUserWithEtag()
 
     public function testLoggedInUserWithoutEtag()
     {
-        $client = self::createClient(['test_case' => 'AttributeListenerPriority']);
+        $client = self::createClient(['test_case' => 'CacheAttributeListener']);
 
         $client->loginUser(new InMemoryUser('the-username', 'the-password', ['ROLE_USER']));
-        $client->request('GET', '/12345');
+        $client->request('GET', '/');
 
         $response = $client->getResponse();
 
@@ -63,11 +66,32 @@ public function testLoggedInUserWithoutEtag()
     }
 }
 
+class TestEntityValueResolver implements ValueResolverInterface
+{
+    public function resolve(Request $request, ArgumentMetadata $argument): iterable
+    {
+        return Post::class === $argument->getType() ? [new Post()] : [];
+    }
+}
+
+class Post
+{
+    public function getId(): int
+    {
+        return 1;
+    }
+
+    public function getEtag(): string
+    {
+        return '12345';
+    }
+}
+
 class WithAttributesController
 {
     #[IsGranted('ROLE_USER')]
-    #[Cache(etag: 'etag')]
-    public function __invoke(): Response
+    #[Cache(etag: 'post.getEtag()')]
+    public function __invoke(Post $post): Response
     {
         return new Response('Hi there!');
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CacheAttributeListener/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CacheAttributeListener/bundles.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CacheAttributeListener/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CacheAttributeListener/config.yml
@@ -2,6 +2,10 @@ imports:
     - { resource: ../config/default.yml }
 
 services:
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\TestEntityValueResolver:
+        tags:
+            - { name: controller.argument_value_resolver, priority: 110 }
+
     Symfony\Bundle\FrameworkBundle\Tests\Functional\WithAttributesController:
         public: true
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CacheAttributeListener/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CacheAttributeListener/routing.yml
@@ -1,3 +1,3 @@
 with_attributes_controller:
-    path: /{etag}
+    path: /
     controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithAttributesController
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -26,7 +26,7 @@
         "symfony/error-handler": "^6.1",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-foundation": "^6.2",
-        "symfony/http-kernel": "^6.2",
+        "symfony/http-kernel": "^6.2.1",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
