Merge remote-tracking branch 'origin/MC-34425' into 2.4.0-develop-pr56

zakdma · zakdma · commit 222b3f34cbc8 · 2020-06-12T12:39:32.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -205,10 +205,9 @@ protected function _initCategory()
     /**
      * Category view action
      *
-     * @return ResultInterface
      * @throws NoSuchEntityException
      */
-    public function execute(): ?ResultInterface
+    public function execute()
     {
         $result = null;
 

Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,9 @@ protected function _initCategory()`
`205`	`205`	`/**`
`206`	`206`	`* Category view action`
`207`	`207`	`*`
`208`		`- * @return ResultInterface`
`209`	`208`	`* @throws NoSuchEntityException`
`210`	`209`	`*/`
`211`		`- public function execute(): ?ResultInterface`
	`210`	`+ public function execute()`
`212`	`211`	`{`
`213`	`212`	`$result = null;`
`214`	`213`