Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit fa9f02fc3f20 · 2021-07-13T13:46:32.000+02:00
* 5.4:
  fix tests
diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
@@ -43,7 +43,7 @@ public function aParentService(): Service1
     }
 
     /**
-     * @return ContainerInterface
+     * @return ?ContainerInterface
      */
     public function setContainer(ContainerInterface $container)
     {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function aParentService(): Service1`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * @return ContainerInterface`
	`46`	`+ * @return ?ContainerInterface`
`47`	`47`	`*/`
`48`	`48`	`public function setContainer(ContainerInterface $container)`
`49`	`49`	`{`