Merge remote-tracking branch 'origin/MC-31663' into 2.4-develop-pr32

zakdma · zakdma · commit c57bfd25f353 · 2020-05-12T12:32:08.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Controller/AjaxTest.php b/dev/tests/integration/testsuite/Magento/Translation/Controller/AjaxTest.php
@@ -67,9 +67,9 @@ public function indexActionDataProvider(): array
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         try {
             Bootstrap::getObjectManager()->get(StringUtils::class)->deleteTranslate('phrase with &');

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ public function indexActionDataProvider(): array`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
`70`		`- * @inheritdoc`
	`70`	`+ * @inheritDoc`
`71`	`71`	`*/`
`72`		`- public static function tearDownAfterClass()`
	`72`	`+ public static function tearDownAfterClass(): void`
`73`	`73`	`{`
`74`	`74`	`try {`
`75`	`75`	`Bootstrap::getObjectManager()->get(StringUtils::class)->deleteTranslate('phrase with &');`