|
15 | 15 | use Doctrine\Common\Annotations\Reader; |
16 | 16 | use Http\Client\HttpClient; |
17 | 17 | use phpDocumentor\Reflection\DocBlockFactoryInterface; |
| 18 | +use PHPStan\PhpDocParser\Parser\PhpDocParser; |
18 | 19 | use Psr\Cache\CacheItemPoolInterface; |
19 | 20 | use Psr\Container\ContainerInterface as PsrContainerInterface; |
20 | 21 | use Psr\EventDispatcher\EventDispatcherInterface as PsrEventDispatcherInterface; |
|
158 | 159 | use Symfony\Component\Notifier\Recipient\Recipient; |
159 | 160 | use Symfony\Component\Notifier\Transport\TransportFactoryInterface as NotifierTransportFactoryInterface; |
160 | 161 | use Symfony\Component\PropertyAccess\PropertyAccessor; |
| 162 | +use Symfony\Component\PropertyInfo\Extractor\PhpStanExtractor; |
161 | 163 | use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface; |
162 | 164 | use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface; |
163 | 165 | use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface; |
@@ -766,6 +768,9 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $ |
766 | 768 | $container->getDefinition('profiler') |
767 | 769 | ->addArgument($config['collect']) |
768 | 770 | ->addTag('kernel.reset', ['method' => 'reset']); |
| 771 | + |
| 772 | + $container->getDefinition('profiler_listener') |
| 773 | + ->addArgument($config['collect_parameter']); |
769 | 774 | } |
770 | 775 |
|
771 | 776 | private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader) |
@@ -1771,7 +1776,15 @@ private function registerPropertyInfoConfiguration(ContainerBuilder $container, |
1771 | 1776 |
|
1772 | 1777 | $loader->load('property_info.php'); |
1773 | 1778 |
|
1774 | | - if (ContainerBuilder::willBeAvailable('phpdocumentor/reflection-docblock', DocBlockFactoryInterface::class, ['symfony/framework-bundle', 'symfony/property-info'])) { |
| 1779 | + if ( |
| 1780 | + ContainerBuilder::willBeAvailable('phpstan/phpdoc-parser', PhpDocParser::class, ['symfony/framework-bundle', 'symfony/property-info']) |
| 1781 | + && ContainerBuilder::willBeAvailable('phpdocumentor/type-resolver', PhpDocParser::class, ['symfony/framework-bundle', 'symfony/property-info']) |
| 1782 | + ) { |
| 1783 | + $definition = $container->register('property_info.phpstan_extractor', PhpStanExtractor::class); |
| 1784 | + $definition->addTag('property_info.type_extractor', ['priority' => -1000]); |
| 1785 | + } |
| 1786 | + |
| 1787 | + if (ContainerBuilder::willBeAvailable('phpdocumentor/reflection-docblock', DocBlockFactoryInterface::class, ['symfony/framework-bundle', 'symfony/property-info'], true)) { |
1775 | 1788 | $definition = $container->register('property_info.php_doc_extractor', 'Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor'); |
1776 | 1789 | $definition->addTag('property_info.description_extractor', ['priority' => -1000]); |
1777 | 1790 | $definition->addTag('property_info.type_extractor', ['priority' => -1001]); |
|
0 commit comments