Merge remote-tracking branch '38886/patch-11' into novcommpr-3

Author: engcom-Dash

app/code/Magento/Csp/Model/Mode/ConfigManager.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -11,7 +11,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Csp\Api\Data\ModeConfiguredInterface;
 use Magento\Csp\Api\ModeConfigManagerInterface;
-use Magento\Csp\Model\Mode\Data\ModeConfigured;
+use Magento\Csp\Model\Mode\Data\ModeConfiguredFactory;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\State;
@@ -43,24 +43,33 @@ class ConfigManager implements ModeConfigManagerInterface
      */
     private Http $request;
 
+    /**
+     * @var ModeConfiguredFactory
+     */
+    private $modeConfiguredFactory;
+
     /**
      * @param ScopeConfigInterface $config
      * @param Store $store
      * @param State $state
      * @param Http|null $request
+     * @param ModeConfiguredFactory|null $modeConfiguredFactory
      */
     public function __construct(
         ScopeConfigInterface $config,
         Store $store,
         State $state,
-        ?Http $request = null
+        ?Http $request = null,
+        ?ModeConfiguredFactory $modeConfiguredFactory = null
     ) {
         $this->config = $config;
         $this->storeModel = $store;
         $this->state = $state;
 
         $this->request = $request
             ?? ObjectManager::getInstance()->get(Http::class);
+        $this->modeConfiguredFactory = $modeConfiguredFactory
+            ?? ObjectManager::getInstance()->get(ModeConfiguredFactory::class);
     }
 
     /**
@@ -118,9 +127,9 @@ public function getConfigured(): ModeConfiguredInterface
             );
         }
 
-        return new ModeConfigured(
-            (bool) $reportOnly,
-            !empty($reportUri) ? $reportUri : null
-        );
+        return $this->modeConfiguredFactory->create([
+            'reportOnly' => (bool) $reportOnly,
+            'reportUri' => !empty($reportUri) ? (string)$reportUri : null
+        ]);
     }
 }

app/code/Magento/Csp/Test/Unit/Model/Mode/ConfigManagerTest.php

@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Csp\Test\Unit\Model\Mode;
 
+use Magento\Csp\Api\Data\ModeConfiguredInterface;
 use Magento\Csp\Model\Mode\ConfigManager;
-use Magento\Csp\Model\Mode\Data\ModeConfigured;
+use Magento\Csp\Model\Mode\Data\ModeConfiguredFactory;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Request\Http;
@@ -51,6 +51,16 @@ class ConfigManagerTest extends TestCase
      */
     private $requestMock;
 
+    /**
+     * @var ModeConfiguredFactory
+     */
+    private $modeConfiguredFactoryMock;
+
+    /**
+     * @var ModeConfiguredInterface
+     */
+    private $modeConfiguredInterfaceMock;
+
     /**
      * Set Up
      */
@@ -62,6 +72,8 @@ protected function setUp(): void
         $this->storeMock = $this->createMock(Store::class);
         $this->stateMock = $this->createMock(State::class);
         $this->requestMock = $this->createMock(Http::class);
+        $this->modeConfiguredFactoryMock = $this->createPartialMock(ModeConfiguredFactory::class, ['create']);
+        $this->modeConfiguredInterfaceMock = $this->createMock(ModeConfiguredInterface::class);
 
         $this->model = $objectManager->getObject(
             ConfigManager::class,
@@ -70,6 +82,7 @@ protected function setUp(): void
                 'storeModel' => $this->storeMock,
                 'state' => $this->stateMock,
                 'request' => $this->requestMock,
+                'modeConfiguredFactory' => $this->modeConfiguredFactoryMock
             ]
         );
     }
@@ -107,9 +120,14 @@ public function testConfiguredCSPForAdminArea()
         $this->scopeConfigMock->expects($this->any())
             ->method('getValue')
             ->willReturn('testReportUri');
+        $this->modeConfiguredFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(['reportOnly' => true, 'reportUri' => 'testReportUri'])
+            ->willReturn($this->modeConfiguredInterfaceMock);
+
         $result = $this->model->getConfigured();
 
-        $this->assertInstanceOf(ModeConfigured::class, $result);
+        $this->assertInstanceOf(ModeConfiguredInterface::class, $result);
     }
 
     /**
@@ -139,11 +157,14 @@ public function testCheckoutPageReportOnly(): void
             })
             ->willReturnOnConsecutiveCalls(true, 'testReportUri');
 
+        $this->modeConfiguredFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(['reportOnly' => true, 'reportUri' => 'testReportUri'])
+            ->willReturn($this->modeConfiguredInterfaceMock);
+
         $result = $this->model->getConfigured();
 
-        $this->assertInstanceOf(ModeConfigured::class, $result);
-        $this->assertTrue($result->isReportOnly());
-        $this->assertEquals($result->getReportUri(), 'testReportUri');
+        $this->assertInstanceOf(ModeConfiguredInterface::class, $result);
     }
 
     /**
@@ -174,10 +195,13 @@ public function testNonCheckoutPageReportOnly(): void
             })
             ->willReturnOnConsecutiveCalls(null, true, null, 'testPageReportUri');
 
+        $this->modeConfiguredFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(['reportOnly' => true, 'reportUri' => 'testPageReportUri'])
+            ->willReturn($this->modeConfiguredInterfaceMock);
+
         $result = $this->model->getConfigured();
 
-        $this->assertInstanceOf(ModeConfigured::class, $result);
-        $this->assertTrue($result->isReportOnly());
-        $this->assertEquals($result->getReportUri(), 'testPageReportUri');
+        $this->assertInstanceOf(ModeConfiguredInterface::class, $result);
     }
 }