Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit d1d9d54717d3 · 2022-01-27T11:11:24.000+01:00
* 5.4:
  [DoctrineBridge] fix tests
  [HttpKernel] Fix session test cases for symfony
  [FrameworkBundle] Fix missing arguments when a serialization default context is bound
diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -286,7 +286,7 @@ public function providerBundles()
 
         yield ['SrcXmlBundle', 'xml', '/Resources/config/doctrine'];
 
-        yield ['NewAnnotationsBundle', 'annotation', '/src/Entity'];
+        yield ['NewAnnotationsBundle', 'annotation', \DIRECTORY_SEPARATOR.'src/Entity'];
         yield ['NewXmlBundle', 'xml', '/config/doctrine'];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public function providerBundles()`
`286`	`286`
`287`	`287`	`yield ['SrcXmlBundle', 'xml', '/Resources/config/doctrine'];`
`288`	`288`
`289`		`- yield ['NewAnnotationsBundle', 'annotation', '/src/Entity'];`
	`289`	`+ yield ['NewAnnotationsBundle', 'annotation', \DIRECTORY_SEPARATOR.'src/Entity'];`
`290`	`290`	`yield ['NewXmlBundle', 'xml', '/config/doctrine'];`
`291`	`291`	`}`
`292`	`292`