Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit b2d7f7853063 · 2021-07-21T13:53:35.000+02:00
* 4.4:
  Fix intersection types on tests
  [Console] fix table setHeaderTitle without headers
diff --git a/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
@@ -167,7 +167,7 @@ public function testWarmupRemoveCacheMisses()
     }
 
     /**
-     * @return MockObject|Reader
+     * @return MockObject&Reader
      */
     private function getReadOnlyReader(): object
     {
diff --git a/Tests/Command/CachePoolDeleteCommandTest.php b/Tests/Command/CachePoolDeleteCommandTest.php
@@ -84,7 +84,7 @@ public function testCommandDeleteFailed()
     }
 
     /**
-     * @return MockObject|KernelInterface
+     * @return MockObject&KernelInterface
      */
     private function getKernel(): object
     {
diff --git a/Tests/Command/CachePruneCommandTest.php b/Tests/Command/CachePruneCommandTest.php
@@ -51,7 +51,7 @@ private function getEmptyRewindableGenerator(): RewindableGenerator
     }
 
     /**
-     * @return MockObject|KernelInterface
+     * @return MockObject&KernelInterface
      */
     private function getKernel(): object
     {
@@ -72,7 +72,7 @@ private function getKernel(): object
     }
 
     /**
-     * @return MockObject|PruneableInterface
+     * @return MockObject&PruneableInterface
      */
     private function getPruneableInterfaceMock(): object
     {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public function testWarmupRemoveCacheMisses()`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/**`
`170`		`- * @return MockObject\|Reader`
	`170`	`+ * @return MockObject&Reader`
`171`	`171`	`*/`
`172`	`172`	`private function getReadOnlyReader(): object`
`173`	`173`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function testCommandDeleteFailed()`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
`87`		`- * @return MockObject\|KernelInterface`
	`87`	`+ * @return MockObject&KernelInterface`
`88`	`88`	`*/`
`89`	`89`	`private function getKernel(): object`
`90`	`90`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private function getEmptyRewindableGenerator(): RewindableGenerator`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`54`		`- * @return MockObject\|KernelInterface`
	`54`	`+ * @return MockObject&KernelInterface`
`55`	`55`	`*/`
`56`	`56`	`private function getKernel(): object`
`57`	`57`	`{`
`@@ -72,7 +72,7 @@ private function getKernel(): object`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * @return MockObject\|PruneableInterface`
	`75`	`+ * @return MockObject&PruneableInterface`
`76`	`76`	`*/`
`77`	`77`	`private function getPruneableInterfaceMock(): object`
`78`	`78`	`{`