Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit c0e98aeee630 · 2023-02-07T11:12:33.000+01:00
* 6.2:
  Fix merge
diff --git a/Tests/Descriptor/ReStructuredTextDescriptorTest.php b/Tests/Descriptor/ReStructuredTextDescriptorTest.php
@@ -38,7 +38,7 @@ protected function getDescriptor()
         return new ReStructuredTextDescriptor();
     }
 
-    protected function getFormat()
+    protected static function getFormat()
     {
         return 'rst';
     }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected function getDescriptor()`
`38`	`38`	`return new ReStructuredTextDescriptor();`
`39`	`39`	`}`
`40`	`40`
`41`		`- protected function getFormat()`
	`41`	`+ protected static function getFormat()`
`42`	`42`	`{`
`43`	`43`	`return 'rst';`
`44`	`44`	`}`