Merge pull request #578 from magento-performance/ACPT-1688

ACPT-1688: Fix Static Tests failures on Application-Server branch CE

Author: andimov

app/code/Magento/ApplicationPerformanceMonitor/Profiler/Metric.php

@@ -8,53 +8,61 @@
 namespace Magento\ApplicationPerformanceMonitor\Profiler;
 
 /**
- * A single metric.  Type is currently either MEMORY or TIME.
+ * A single metric. Type is currently either MEMORY or TIME.
  * This class is an immutable data object.
  */
 class Metric
 {
     /**
-     * @param string $type
+     * @param MetricType $type
      * @param string $name
      * @param mixed $value
      * @param bool $verbose
      */
     public function __construct(
-        private readonly string $type,
+        private readonly MetricType $type,
         private readonly string $name,
         private readonly mixed $value,
         private readonly bool $verbose,
     ) {
     }
 
     /**
-     * @return string
+     * Gets type of metric
+     *
+     * @return int|MetricType
      */
-    public function getType()
+    public function getType(): MetricType|int
     {
         return $this->type;
     }
 
     /**
+     * Gets a name
+     *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
     /**
+     * Gets a value
+     *
      * @return mixed
      */
-    public function getValue()
+    public function getValue(): mixed
     {
         return $this->value;
     }
 
     /**
+     * Checks if verbose
+     *
      * @return bool
      */
-    public function isVerbose()
+    public function isVerbose(): bool
     {
         return $this->verbose;
     }

app/code/Magento/ApplicationPerformanceMonitor/Profiler/Metrics.php

@@ -8,10 +8,16 @@
 namespace Magento\ApplicationPerformanceMonitor\Profiler;
 
 /**
- * Gathers and stores metrics.  Compares against another one to get the deltas.
+ * Gathers and stores metrics. Compares against another one to get the deltas.
  */
 class Metrics
 {
+    /**
+     * @param int $peakMemoryUsage
+     * @param int $memoryUsage
+     * @param array $rusage
+     * @param float $microtime
+     */
     public function __construct(
         private readonly int $peakMemoryUsage,
         private readonly int $memoryUsage,
@@ -20,21 +26,41 @@ public function __construct(
     ) {
     }
 
+    /**
+     * Gets peak memory usage
+     *
+     * @return int
+     */
     public function getPeakMemoryUsage() : int
     {
         return $this->peakMemoryUsage;
     }
 
+    /**
+     * Gets memory usage
+     *
+     * @return int
+     */
     public function getMemoryUsage() : int
     {
         return $this->memoryUsage;
     }
 
+    /**
+     * Gets fusage
+     *
+     * @return array
+     */
     public function getRusage() : array
     {
         return $this->rusage;
     }
 
+    /**
+     * Gets microtime
+     *
+     * @return float
+     */
     public function getMicrotime() : float
     {
         return $this->microtime;

app/code/Magento/ApplicationPerformanceMonitorNewRelic/Profiler/Output/NewRelicOutput.php

@@ -20,6 +20,10 @@ class NewRelicOutput implements OutputInterface
     public const CONFIG_ENABLE_KEY = 'application/performance_monitor/newrelic_output_enable';
     public const CONFIG_VERBOSE_KEY = 'application/performance_monitor/newrelic_output_verbose';
 
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     * @param NewRelicWrapper $newRelicWrapper
+     */
     public function __construct(
         private readonly DeploymentConfig $deploymentConfig,
         private readonly NewRelicWrapper $newRelicWrapper

app/code/Magento/CatalogGraphQl/DataProvider/Product/RequestDataBuilder.php

@@ -12,22 +12,41 @@
  */
 class RequestDataBuilder implements ResetAfterRequestInterface
 {
+    /**
+     * @var array
+     */
     private array $data;
 
+    /**
+     * Constructor
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->_resetState();
     }
 
-    public function setData($data)
+    /**
+     * Sets request data
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data): void
     {
         $this->data = $data;
     }
 
-    public function getData(string $key)
+    /**
+     * Gets request data
+     *
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getData(string $key): mixed
     {
         return $this->data[$key] ?? null;
-
     }
 
     /**

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -69,6 +69,9 @@ class SearchCriteriaBuilder
      */
     private SearchConfig $searchConfig;
 
+    /**
+     * @var RequestDataBuilder|mixed
+     */
     private RequestDataBuilder $localData;
 
     /**
@@ -80,6 +83,7 @@ class SearchCriteriaBuilder
      * @param SortOrderBuilder|null $sortOrderBuilder
      * @param Config|null $eavConfig
      * @param SearchConfig|null $searchConfig
+     * @param RequestDataBuilder|null $localData
      */
     public function __construct(
         Builder $builder,

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Provider.php

@@ -34,9 +34,23 @@ class Provider implements ProviderInterface, ResetAfterRequestInterface
         RegularPrice::PRICE_CODE => []
     ];
 
+    /**
+     * @var array|array[]
+     *
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
+     */
     private readonly array $minimalPriceConstructed;
+
+    /**
+     * @var array|array[]
+     *
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
+     */
     private readonly array $maximalPriceConstructed;
 
+    /**
+     * Constructor
+     */
     public function __construct()
     {
         $this->minimalPriceConstructed = $this->minimalPrice;

app/code/Magento/CatalogGraphQl/Plugin/Search/RequestBuilderPlugin.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Plugin\Search;
+
+use Magento\CatalogGraphQl\DataProvider\Product\RequestDataBuilder;
+use Magento\Framework\Search\Request\Config;
+
+class RequestBuilderPlugin
+{
+    /**
+     * Constructor
+     *
+     * @param RequestDataBuilder $localData
+     * @phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     */
+    public function __construct(private RequestDataBuilder $localData)
+    {
+    }
+
+    /**
+     * Get around
+     *
+     * @param Config $subject
+     * @param callable $proceed
+     * @param string $requestName
+     * @return array
+     */
+    public function aroundGet(Config $subject, callable $proceed, string $requestName)
+    {
+        if ($this->localData->getData($requestName)) {
+            return $this->localData->getData($requestName);
+        } else {
+            return $proceed($requestName);
+        }
+    }
+}

app/code/Magento/CatalogGraphQl/etc/di.xml

@@ -101,7 +101,6 @@
             </argument>
         </arguments>
     </type>
-
     <type name="Magento\Framework\Search\Request\Config\FilesystemReader">
         <plugin name="productAttributesDynamicFields"  type="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader" />
     </type>
@@ -112,6 +111,7 @@
                 <item name="EAV" xsi:type="string">EAV</item>
             </argument>
         </arguments>
+        <plugin name="localRequestDataPlugin"  type="Magento\CatalogGraphQl\Plugin\Search\RequestBuilderPlugin" />
     </type>
 
     <preference type="Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>

app/code/Magento/Config/App/Config/ReloadConfig.php

@@ -8,20 +8,22 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Framework\App\State\ReloadProcessorInterface;
-use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Config module specific reset state
  */
 class ReloadConfig implements ReloadProcessorInterface
 {
+    /**
+     * @param System $system
+     */
     public function __construct(private readonly System $system)
-    {}
+    {
+    }
 
     /**
      * Tells the system state to reload itself.
      *
-     * @param ObjectManagerInterface $objectManager
      * @return void
      */
     public function reloadState(): void

app/code/Magento/Customer/Helper/Address.php

@@ -86,7 +86,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper implements Re
      * @var CustomerMetadataInterface
      *
      * @deprecated 101.0.0
-     * phpcs:disable Magento2.Annotation.ClassPropertyPHPDocFormatting
+     * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
     protected $_customerMetadataService;