diff --git a/.github/workflows/.utils.sh b/.github/workflows/.utils.sh index fb0ae80a8f5..b909f4fafac 100644 --- a/.github/workflows/.utils.sh +++ b/.github/workflows/.utils.sh @@ -45,8 +45,8 @@ live_component_post_install() { return $? ;; 8.4) - # Install PropertyInfo 7.3 (deprecate PropertyTypeExtractorInterface::getTypes) and TypeInfo 7.3 (new features and deprecations) - composer require symfony/property-info:7.3.* symfony/type-info:7.3.* + # Install PropertyInfo 7.4 (deprecate PropertyTypeExtractorInterface::getTypes from 7.3) and TypeInfo 7.4, but for Symfony 8 compatibility + composer require symfony/property-info:7.4.* symfony/type-info:7.4.* return $? ;; esac diff --git a/src/Autocomplete/tests/Fixtures/Kernel.php b/src/Autocomplete/tests/Fixtures/Kernel.php index ece70fb1c43..969db8ac07a 100644 --- a/src/Autocomplete/tests/Fixtures/Kernel.php +++ b/src/Autocomplete/tests/Fixtures/Kernel.php @@ -124,9 +124,6 @@ protected function configureContainer(ContainerConfigurator $c): void 'alias' => 'Test', ], ], - 'controller_resolver' => [ - 'auto_mapping' => false, - ], ], ]; @@ -134,6 +131,12 @@ protected function configureContainer(ContainerConfigurator $c): void if (version_compare($doctrineBundleVersion, '3.0.0', '<')) { $doctrineConfig['orm']['auto_generate_proxy_classes'] = true; + // https://github.com/doctrine/DoctrineBundle/pull/1661 + // https://github.com/doctrine/DoctrineBundle/pull/1962 + if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) { + $doctrineConfig['orm']['report_fields_where_declared'] = true; + } + if (version_compare($doctrineBundleVersion, '2.12.0', '>=')) { $doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true; } diff --git a/src/LiveComponent/tests/Fixtures/Kernel.php b/src/LiveComponent/tests/Fixtures/Kernel.php index ef94232d121..fab8e133e0c 100644 --- a/src/LiveComponent/tests/Fixtures/Kernel.php +++ b/src/LiveComponent/tests/Fixtures/Kernel.php @@ -180,9 +180,6 @@ protected function configureContainer(ContainerConfigurator $c): void 'alias' => 'XML', ], ], - 'controller_resolver' => [ - 'auto_mapping' => false, - ], ], ]; @@ -201,12 +198,6 @@ protected function configureContainer(ContainerConfigurator $c): void } } - // https://github.com/doctrine/DoctrineBundle/pull/1661 - if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) { - $doctrineConfig['orm']['validate_xml_mapping'] = true; - $doctrineConfig['dbal']['schema_manager_factory'] = 'doctrine.dbal.default_schema_manager_factory'; - } - if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=') && version_compare($doctrineBundleVersion, '4.0.0', '<')) { $doctrineConfig['orm']['enable_native_lazy_objects'] = true; }