fixed profiler collector

Author: yceruto

composer.json

@@ -16,6 +16,7 @@
         "symfony/css-selector": "^7.3",
         "symfony/translation": "^7.3",
         "symfony/twig-bundle": "^7.3",
+        "symfony/web-profiler-bundle": "^7.3",
         "symfony/yaml": "^7.3"
     },
     "config": {

config/services.php

@@ -2,7 +2,6 @@
 
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Yceruto\FormFlowBundle\Form\Extension\HttpFoundation\Type\FormFlowTypeSessionDataStorageExtension;
-use Yceruto\FormFlowBundle\Form\ResolvedFormTypeFactory;
 
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
@@ -12,9 +11,6 @@
 return static function (ContainerConfigurator $container): void {
     $container
         ->services()
-            ->set(ResolvedFormTypeFactory::class)
-                ->decorate('form.resolved_type_factory')
-
             ->set('form.type_extension.form.flow.session_data_storage', FormFlowTypeSessionDataStorageExtension::class)
                 ->args([service('request_stack')->ignoreOnInvalid()])
                 ->tag('form.type_extension')

src/FormFlowBundle.php

@@ -2,17 +2,36 @@
 
 namespace Yceruto\FormFlowBundle;
 
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy;
 use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
+use Yceruto\FormFlowBundle\Form\ResolvedFormTypeFactory;
 
 /**
  * @link https://symfony.com/doc/current/bundles/best_practices.html
  */
-class FormFlowBundle extends AbstractBundle
+class FormFlowBundle extends AbstractBundle implements CompilerPassInterface
 {
+    public function build(ContainerBuilder $container): void
+    {
+        $container->addCompilerPass($this);
+    }
+
     public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
     {
         $container->import('../config/services.php');
     }
+
+    public function process(ContainerBuilder $container): void
+    {
+        $def = $container->getDefinition('form.resolved_type_factory');
+
+        if (ResolvedTypeFactoryDataCollectorProxy::class === $def->getClass()) {
+            $def->getArgument(0)->setClass(ResolvedFormTypeFactory::class);
+        } else {
+            $def->setClass(ResolvedFormTypeFactory::class);
+        }
+    }
 }

tests/Integration/AbstractWebTestCase.php

@@ -55,7 +55,7 @@ protected static function createKernel(array $options = []): KernelInterface
         }
 
         return new $class(
-            static::getVarDir(),
+            $options['var_dir'] ?? static::getVarDir(),
             $options['test_case'],
             $options['root_config'] ?? 'config.yaml',
             $options['environment'] ?? 'test',

tests/Integration/App/ShutdownBundle.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Yceruto\FormFlowBundle\Tests\Integration\App;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class TestBundle extends Bundle implements CompilerPassInterface
+{
+    public function build(ContainerBuilder $container): void
+    {
+        $container->addCompilerPass($this);
+    }
+
+    public function shutdown(): void
+    {
+        restore_exception_handler();
+    }
+
+    public function process(ContainerBuilder $container): void
+    {
+        $container->getDefinition('form.resolved_type_factory')->setPublic(true);
+    }
+}

tests/Integration/App/TestBundle.php

@@ -2,12 +2,14 @@
 
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
 use Yceruto\FormFlowBundle\FormFlowBundle;
-use Yceruto\FormFlowBundle\Tests\Integration\App\ShutdownBundle;
+use Yceruto\FormFlowBundle\Tests\Integration\App\TestBundle;
 
 return [
     new FrameworkBundle(),
     new TwigBundle(),
+    new WebProfilerBundle(),
     new FormFlowBundle(),
-    new ShutdownBundle(),
+    new TestBundle(),
 ];

tests/Integration/App/bundles.php

@@ -16,6 +16,7 @@ framework:
         cookie_samesite: lax
     php_errors:
         log: true
+    profiler: false
 
 twig:
     default_path: '%kernel.project_dir%/Templates'

tests/Integration/App/config.yaml

@@ -0,0 +1,6 @@
+imports:
+    - './config.yaml'
+
+framework:
+    profiler:
+        enabled: true

tests/Integration/App/config_with_profiler.yaml

@@ -2,6 +2,9 @@
 
 namespace Yceruto\FormFlowBundle\Tests\Integration;
 
+use Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy;
+use Yceruto\FormFlowBundle\Form\ResolvedFormTypeFactory;
+
 class FormFlowBasicTest extends AbstractWebTestCase
 {
     public function testFormFlow(): void
@@ -198,6 +201,25 @@ public function testValidationError(): void
         self::assertSameFileContent('step2.html', $crawler->filter('body')->html());
     }
 
+    public function testResolvedTypeFactoryDataCollectorProxyWithProfiler(): void
+    {
+        $factory = self::getContainer()->get('form.resolved_type_factory');
+
+        self::assertInstanceOf(ResolvedFormTypeFactory::class, $factory);
+    }
+
+    public function testResolvedFormTypeFactoryWithProfiler(): void
+    {
+        self::bootKernel([
+            'var_dir' => 'formflow_with_profiler',
+            'root_config' => __DIR__.'/App/config_with_profiler.yaml',
+        ]);
+
+        $factory = self::getContainer()->get('form.resolved_type_factory');
+
+        self::assertInstanceOf(ResolvedTypeFactoryDataCollectorProxy::class, $factory);
+    }
+
     private static function assertSameFileContent(string $expectedFilename, string $actualContent, bool $save = false): void
     {
         $expectedContent = self::getOutputFileContent($expectedFilename, $actualContent, $save);