[Tests] Fix static calls and Mock var annotation

alexandre-daubois · alexandre-daubois · commit 5b40b983cb9a · 2023-02-10T14:51:15.000+01:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -446,7 +446,7 @@ public function testDumpPanel()
     }
 
     /**
-     * @return MockObject<DumpDataCollector>
+     * @return MockObject&DumpDataCollector
      */
     private function createDumpDataCollector(): MockObject
     {
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTestCase.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTestCase.php
@@ -53,27 +53,27 @@ public function testDescribeApplication(Application $application, $expectedDescr
 
     public static function getDescribeInputArgumentTestData()
     {
-        return self::getDescriptionTestData(ObjectsProvider::getInputArguments());
+        return static::getDescriptionTestData(ObjectsProvider::getInputArguments());
     }
 
     public static function getDescribeInputOptionTestData()
     {
-        return self::getDescriptionTestData(ObjectsProvider::getInputOptions());
+        return static::getDescriptionTestData(ObjectsProvider::getInputOptions());
     }
 
     public static function getDescribeInputDefinitionTestData()
     {
-        return self::getDescriptionTestData(ObjectsProvider::getInputDefinitions());
+        return static::getDescriptionTestData(ObjectsProvider::getInputDefinitions());
     }
 
     public static function getDescribeCommandTestData()
     {
-        return self::getDescriptionTestData(ObjectsProvider::getCommands());
+        return static::getDescriptionTestData(ObjectsProvider::getCommands());
     }
 
     public static function getDescribeApplicationTestData()
     {
-        return self::getDescriptionTestData(ObjectsProvider::getApplications());
+        return static::getDescriptionTestData(ObjectsProvider::getApplications());
     }
 
     abstract protected function getDescriptor();

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ public function testDumpPanel()`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`/**`
`449`		`- * @return MockObject<DumpDataCollector>`
	`449`	`+ * @return MockObject&DumpDataCollector`
`450`	`450`	`*/`
`451`	`451`	`private function createDumpDataCollector(): MockObject`
`452`	`452`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,27 +53,27 @@ public function testDescribeApplication(Application $application, $expectedDescr`
`53`	`53`
`54`	`54`	`public static function getDescribeInputArgumentTestData()`
`55`	`55`	`{`
`56`		`- return self::getDescriptionTestData(ObjectsProvider::getInputArguments());`
	`56`	`+ return static::getDescriptionTestData(ObjectsProvider::getInputArguments());`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public static function getDescribeInputOptionTestData()`
`60`	`60`	`{`
`61`		`- return self::getDescriptionTestData(ObjectsProvider::getInputOptions());`
	`61`	`+ return static::getDescriptionTestData(ObjectsProvider::getInputOptions());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public static function getDescribeInputDefinitionTestData()`
`65`	`65`	`{`
`66`		`- return self::getDescriptionTestData(ObjectsProvider::getInputDefinitions());`
	`66`	`+ return static::getDescriptionTestData(ObjectsProvider::getInputDefinitions());`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public static function getDescribeCommandTestData()`
`70`	`70`	`{`
`71`		`- return self::getDescriptionTestData(ObjectsProvider::getCommands());`
	`71`	`+ return static::getDescriptionTestData(ObjectsProvider::getCommands());`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public static function getDescribeApplicationTestData()`
`75`	`75`	`{`
`76`		`- return self::getDescriptionTestData(ObjectsProvider::getApplications());`
	`76`	`+ return static::getDescriptionTestData(ObjectsProvider::getApplications());`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`abstract protected function getDescriptor();`