minor #42216 Fix intersection types on tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 29277c9dc4a6 · 2021-07-21T13:52:46.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- Fix intersection types on tests | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 8c11c16 Fix intersection types on tests
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
@@ -167,7 +167,7 @@ public function testWarmupRemoveCacheMisses()
     }
 
     /**
-     * @return MockObject|Reader
+     * @return MockObject&Reader
      */
     private function getReadOnlyReader()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePoolDeleteCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePoolDeleteCommandTest.php
@@ -84,7 +84,7 @@ public function testCommandDeleteFailed()
     }
 
     /**
-     * @return MockObject|KernelInterface
+     * @return MockObject&KernelInterface
      */
     private function getKernel()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
@@ -51,7 +51,7 @@ private function getEmptyRewindableGenerator(): RewindableGenerator
     }
 
     /**
-     * @return MockObject|KernelInterface
+     * @return MockObject&KernelInterface
      */
     private function getKernel()
     {
@@ -72,7 +72,7 @@ private function getKernel()
     }
 
     /**
-     * @return MockObject|PruneableInterface
+     * @return MockObject&PruneableInterface
      */
     private function getPruneableInterfaceMock()
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -217,7 +217,7 @@ public function testLog()
     }
 
     /**
-     * @return MockObject|PruneableCacheInterface
+     * @return MockObject&PruneableCacheInterface
      */
     private function getPruneableMock(): AdapterInterface
     {
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -931,7 +931,7 @@ private function createXmlEncoderWithDateTimeNormalizer(): XmlEncoder
     }
 
     /**
-     * @return MockObject|NormalizerInterface
+     * @return MockObject&NormalizerInterface
      */
     private function createMockDateTimeNormalizer()
     {

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()`
`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()`
`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()`
`57`	`57`	`{`
`@@ -72,7 +72,7 @@ private function getKernel()`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * @return MockObject\|PruneableInterface`
	`75`	`+ * @return MockObject&PruneableInterface`
`76`	`76`	`*/`
`77`	`77`	`private function getPruneableInterfaceMock()`
`78`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public function testLog()`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`/**`
`220`		`- * @return MockObject\|PruneableCacheInterface`
	`220`	`+ * @return MockObject&PruneableCacheInterface`
`221`	`221`	`*/`
`222`	`222`	`private function getPruneableMock(): AdapterInterface`
`223`	`223`	`{`
Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ private function createXmlEncoderWithDateTimeNormalizer(): XmlEncoder`
`931`	`931`	`}`
`932`	`932`
`933`	`933`	`/**`
`934`		`- * @return MockObject\|NormalizerInterface`
	`934`	`+ * @return MockObject&NormalizerInterface`
`935`	`935`	`*/`
`936`	`936`	`private function createMockDateTimeNormalizer()`
`937`	`937`	`{`