Skip to content

Commit ac60cf1

Browse files
authored
Merge branch '2.14.x' into exclude-entities
2 parents d5297d7 + d9ea81d commit ac60cf1

File tree

3 files changed

+0
-8
lines changed

3 files changed

+0
-8
lines changed

tests/DependencyInjection/AbstractDoctrineExtensionTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ public function testDependencyInjectionImportsOverrideDefaults(): void
531531
$this->assertDICDefinitionMethodCallOnce($configDefinition, 'setMetadataCache', [new Reference('doctrine.orm.default_metadata_cache')]);
532532
}
533533

534-
/** @requires PHP 8 */
535534
public function testSingleEntityManagerMultipleMappingBundleDefinitions(): void
536535
{
537536
if (! interface_exists(EntityManagerInterface::class)) {
@@ -578,7 +577,6 @@ public function testSingleEntityManagerMultipleMappingBundleDefinitions(): void
578577
]);
579578
}
580579

581-
/** @requires PHP 8 */
582580
public function testMultipleEntityManagersMappingBundleDefinitions(): void
583581
{
584582
if (! interface_exists(EntityManagerInterface::class)) {
@@ -938,7 +936,6 @@ public function testAddCustomHydrationMode(): void
938936
$this->assertDICDefinitionMethodCallOnce($definition, 'addCustomHydrationMode', ['test_hydrator', TestHydrator::class]);
939937
}
940938

941-
/** @requires PHP 8.1 */
942939
public function testAddFilter(): void
943940
{
944941
if (! interface_exists(EntityManagerInterface::class)) {

tests/DependencyInjection/Compiler/MiddlewarePassTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public function provideAddMiddlewareWithAttributeForAutoconfiguration(): array
109109
* @param class-string $className
110110
*
111111
* @dataProvider provideAddMiddlewareWithAttributeForAutoconfiguration
112-
* @requires PHP 8
113112
*/
114113
public function testAddMiddlewareWithAttributeForAutoconfiguration(string $className, bool $registeredOnConn1): void
115114
{
@@ -327,7 +326,6 @@ public function testInjectedMiddlewaresPreserveParentDefinition(): void
327326
$this->assertSame($middlewares[0], $definition);
328327
}
329328

330-
/** @requires PHP 8 */
331329
public function testAddMiddlewareOrderingWithAttributeForAutoconfiguration(): void
332330
{
333331
$container = $this->createContainer(static function (ContainerBuilder $container) {

tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,6 @@ public function testXmlBundleMappingDetection(): void
827827
]);
828828
}
829829

830-
/** @requires PHP 8 */
831830
public function testAttributesBundleMappingDetection(): void
832831
{
833832
if (! interface_exists(EntityManagerInterface::class)) {
@@ -1197,7 +1196,6 @@ public function testEntityAttributeExcludesFromContainer()
11971196
$this->assertTrue($definition->isAbstract());
11981197
}
11991198

1200-
/** @requires PHP 8 */
12011199
public function testAsEntityListenerAttribute()
12021200
{
12031201
if (! interface_exists(EntityManagerInterface::class)) {
@@ -1234,7 +1232,6 @@ public function testAsEntityListenerAttribute()
12341232
$this->assertSame([$expected], $definition->getTag('doctrine.orm.entity_listener'));
12351233
}
12361234

1237-
/** @requires PHP 8 */
12381235
public function testAsDoctrineListenerAttribute()
12391236
{
12401237
if (! interface_exists(EntityManagerInterface::class)) {

0 commit comments

Comments
 (0)