BB-16898: Exception on inaccessible brand route (#28365)

Author: oro-panasiukr

src/Oro/Bundle/ProductBundle/Controller/Frontend/BrandController.php

@@ -2,11 +2,15 @@
 
 namespace Oro\Bundle\ProductBundle\Controller\Frontend;
 
-use Oro\Bundle\ProductBundle\Entity\Product;
+use Oro\Bundle\ProductBundle\Entity\Brand;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 
+/**
+ * Frontend product brand controller.
+ */
 class BrandController extends Controller
 {
     const GRID_NAME = 'frontend-brand-search-grid';
@@ -20,7 +24,7 @@ class BrandController extends Controller
      */
     public function indexAction()
     {
-        return [];
+        throw new NotFoundHttpException();
     }
 
     /**
@@ -35,6 +39,6 @@ public function indexAction()
      */
     public function viewAction(Request $request, Brand $brand)
     {
-        return [];
+        throw new NotFoundHttpException();
     }
 }

src/Oro/Bundle/ProductBundle/Resources/config/oro/routing.yml

@@ -20,6 +20,13 @@ oro_product_frontend_product:
     options:
         frontend: true
 
+oro_product_frontend_brand:
+    resource: "@OroProductBundle/Controller/Frontend/BrandController.php"
+    type: annotation
+    prefix: /brand
+    options:
+        frontend: true
+
 oro_product_frontend_product_ajax:
     resource: "@OroProductBundle/Controller/Frontend/AjaxProductController.php"
     type: annotation

src/Oro/Bundle/ProductBundle/Tests/Functional/Controller/Frontend/BrandController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Oro\Bundle\ProductBundle\Tests\Functional\Controller\Frontend;
+
+use Oro\Bundle\FrontendTestFrameworkBundle\Migrations\Data\ORM\LoadCustomerUserData;
+use Oro\Bundle\ProductBundle\Tests\Functional\DataFixtures\LoadBrandData;
+use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
+
+class BrandController extends WebTestCase
+{
+    protected function setUp(): void
+    {
+        $this->initClient(
+            [],
+            $this->generateBasicAuthHeader(LoadCustomerUserData::AUTH_USER, LoadCustomerUserData::AUTH_PW)
+        );
+        $this->loadFixtures([LoadBrandData::class]);
+    }
+
+    public function testIndexAction(): void
+    {
+        $this->client->request('GET', $this->getUrl('oro_product_frontend_brand_index'));
+        $result = $this->client->getResponse();
+        $this->assertHtmlResponseStatusCodeEquals($result, 404);
+    }
+
+    public function testViewAction(): void
+    {
+        $brandId = $this->getReference(LoadBrandData::BRAND_1)->getId();
+        $this->client->request('GET', $this->getUrl('oro_product_frontend_brand_view', ['id' => $brandId]));
+        $result = $this->client->getResponse();
+        $this->assertHtmlResponseStatusCodeEquals($result, 404);
+    }
+}