Static Fixes

Author: glo63652

app/code/Magento/PageCache/Model/App/Request/Http/Identifier.php

@@ -3,19 +3,21 @@
 
 namespace Magento\PageCache\Model\App\Request\Http;
 
+use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\PageCache\IdentifierInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Serialize\Serializer\Json;
 
 class Identifier implements IdentifierInterface
 {
     /**
-     * @var \Magento\Framework\App\Request\Http
+     * @var Http
      */
     protected $request;
 
     /**
-     * @var \Magento\Framework\App\Http\Context
+     * @var Context
      */
     protected $context;
 
@@ -25,15 +27,16 @@ class Identifier implements IdentifierInterface
     private $serializer;
 
     /**
-     * @param \Magento\Framework\App\Request\Http $request
-     * @param \Magento\Framework\App\Http\Context $context
+     * @param Http $request
+     * @param Context $context
+     * @param IdentifierStoreReader $identifierStoreReader
      * @param Json|null $serializer
      */
     public function __construct(
-        \Magento\Framework\App\Request\Http $request,
-        \Magento\Framework\App\Http\Context $context,
-        Json $serializer = null,
-        private IdentifierStoreReader $identifierStoreReader
+        Http $request,
+        Context $context,
+        private IdentifierStoreReader $identifierStoreReader,
+        Json $serializer = null
     ) {
         $this->request = $request;
         $this->context = $context;

app/code/Magento/PageCache/Model/App/Request/Http/IdentifierForSave.php

@@ -21,6 +21,7 @@ class IdentifierForSave implements IdentifierInterface
      * @param Http $request
      * @param Context $context
      * @param Json $serializer
+     * @param IdentifierStoreReader $identifierStoreReader
      */
     public function __construct(
         private Http                  $request,

app/code/Magento/PageCache/Model/App/Request/Http/IdentifierStoreReader.php

@@ -40,12 +40,11 @@ public function __construct(
     /**
      * Adds a theme key to identifier for a built-in cache if user-agent theme rule is actual
      *
-     * @param \Magento\Framework\App\PageCache\Identifier $identifier
-     * @param string $result
-     * @return array
+     * @param array $data
+     * @return array|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getPageTagsWithStoreCacheTags($data): ?array
+    public function getPageTagsWithStoreCacheTags(array $data): ?array
     {
         if ($this->config->getType() === \Magento\PageCache\Model\Config::BUILT_IN && $this->config->isEnabled()) {
             $ruleDesignException = $this->designExceptions->getThemeByRequest($this->request);

app/code/Magento/PageCache/Test/Unit/Model/App/Request/Http/IdentifierStoreReaderTest.php

@@ -1,39 +1,42 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 declare(strict_types=1);
 
 namespace Magento\PageCache\Test\Unit\Model\App\Request\Http;
 
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\DesignExceptions;
+use Magento\PageCache\Model\App\Request\Http\IdentifierStoreReader;
 use Magento\PageCache\Model\Config;
 use Magento\Store\Model\StoreManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class IdentifierStoreReaderTest extends TestCase
 {
     /**
-     * @var DesignExceptions|\PHPUnit\Framework\MockObject\MockObject
+     * @var DesignExceptions|MockObject
      */
     private $designExceptionsMock;
     /**
-     * @var RequestInterface|\PHPUnit\Framework\MockObject\MockObject
+     * @var RequestInterface|MockObject
      */
-    private \PHPUnit\Framework\MockObject\MockObject|RequestInterface $requestMock;
+    private MockObject|RequestInterface $requestMock;
     /**
-     * @var Config|\PHPUnit\Framework\MockObject\MockObject
+     * @var Config|MockObject
      */
     private $configMock;
     /**
-     * @var \Magento\PageCache\Model\App\Request\Http\IdentifierStoreReader
+     * @var IdentifierStoreReader
      */
     private $model;
 
     protected function setUp(): void
     {
-        $this->objectManager = new ObjectManager($this);
-
         $this->designExceptionsMock = $this->createPartialMock(
             DesignExceptions::class,
             ['getThemeByRequest']
@@ -47,7 +50,7 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->model = new \Magento\PageCache\Model\App\Request\Http\IdentifierStoreReader(
+        $this->model = new IdentifierStoreReader(
             $this->designExceptionsMock,
             $this->requestMock,
             $this->configMock
@@ -104,7 +107,7 @@ function ($param) {
 
         $data = ['anything'];
 
-        $this->model = new \Magento\PageCache\Model\App\Request\Http\IdentifierStoreReader(
+        $this->model = new IdentifierStoreReader(
             $this->designExceptionsMock,
             $defaultRequestMock,
             $this->configMock

app/code/Magento/PageCache/Test/Unit/Model/App/Request/Http/IdentifierTest.php

@@ -21,7 +21,7 @@ class IdentifierTest extends TestCase
     /**
      * Test value for cache vary string
      */
-    const VARY = '123';
+    private const VARY = '123';
 
     /**
      * @var ObjectManager
@@ -83,7 +83,6 @@ function ($value) {
             ->disableOriginalConstructor()
             ->getMock();
 
-
         $this->model = $this->objectManager->getObject(
             Identifier::class,
             [