Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit c94b4f457c30 · 2023-02-07T10:58:05.000+01:00
* 6.2:
  Fix merge
diff --git a/Tests/Descriptor/ReStructuredTextDescriptorTest.php b/Tests/Descriptor/ReStructuredTextDescriptorTest.php
@@ -17,15 +17,15 @@
 
 class ReStructuredTextDescriptorTest extends AbstractDescriptorTestCase
 {
-    public function getDescribeCommandTestData()
+    public static function getDescribeCommandTestData()
     {
         return $this->getDescriptionTestData(array_merge(
             ObjectsProvider::getCommands(),
             ['command_mbstring' => new DescriptorCommandMbString()]
         ));
     }
 
-    public function getDescribeApplicationTestData()
+    public static function getDescribeApplicationTestData()
     {
         return $this->getDescriptionTestData(array_merge(
             ObjectsProvider::getApplications(),

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@`
`17`	`17`
`18`	`18`	`class ReStructuredTextDescriptorTest extends AbstractDescriptorTestCase`
`19`	`19`	`{`
`20`		`- public function getDescribeCommandTestData()`
	`20`	`+ public static function getDescribeCommandTestData()`
`21`	`21`	`{`
`22`	`22`	`return $this->getDescriptionTestData(array_merge(`
`23`	`23`	`ObjectsProvider::getCommands(),`
`24`	`24`	`['command_mbstring' => new DescriptorCommandMbString()]`
`25`	`25`	`));`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function getDescribeApplicationTestData()`
	`28`	`+ public static function getDescribeApplicationTestData()`
`29`	`29`	`{`
`30`	`30`	`return $this->getDescriptionTestData(array_merge(`
`31`	`31`	`ObjectsProvider::getApplications(),`