Fix merge

nicolas-grekas · nicolas-grekas · commit a8a68f1cdb41 · 2023-02-07T11:19:03.000+01:00
diff --git a/Tests/Descriptor/ReStructuredTextDescriptorTest.php b/Tests/Descriptor/ReStructuredTextDescriptorTest.php
@@ -19,15 +19,15 @@ class ReStructuredTextDescriptorTest extends AbstractDescriptorTestCase
 {
     public static function getDescribeCommandTestData()
     {
-        return $this->getDescriptionTestData(array_merge(
+        return self::getDescriptionTestData(array_merge(
             ObjectsProvider::getCommands(),
             ['command_mbstring' => new DescriptorCommandMbString()]
         ));
     }
 
     public static function getDescribeApplicationTestData()
     {
-        return $this->getDescriptionTestData(array_merge(
+        return self::getDescriptionTestData(array_merge(
             ObjectsProvider::getApplications(),
             ['application_mbstring' => new DescriptorApplicationMbString()]
         ));

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