CCENG-104: Public Pull Request Processing

ishakhsuvarov · ishakhsuvarov · commit 6766a8e36613 · 2022-04-20T10:04:41.000-05:00
- fixes based on static test reports
diff --git a/app/code/Magento/Catalog/Model/Product/Price/BasePriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/BasePriceStorage.php
@@ -26,7 +26,7 @@
 class BasePriceStorage implements BasePriceStorageInterface
 {
     /**
-     * Attribute code.
+     * Price attribute code.
      *
      * @var string
      */
@@ -78,14 +78,14 @@ class BasePriceStorage implements BasePriceStorageInterface
     private $productAttributeRepository;
 
     /**
-     * Price type allowed.
+     * Is price type allowed
      *
      * @var int
      */
     private $priceTypeAllowed = 1;
 
     /**
-     * Allowed product types.
+     * Array of allowed product types.
      *
      * @var array
      */
diff --git a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
@@ -29,7 +29,7 @@ class DeployMarker extends Command
      *
      * @param DeploymentsFactory $deploymentsFactory
      * @param ServiceShellUser $serviceShellUser
-     * @param null $name
+     * @param ?string $name
      */
     public function __construct(
         DeploymentsFactory $deploymentsFactory,
@@ -42,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -71,7 +71,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -82,5 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $input->getArgument('revision')
         );
         $output->writeln('<info>NewRelic deployment information sent</info>');
+
+        return 0;
     }
 }
diff --git a/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php b/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
@@ -15,7 +15,7 @@ class Deployments
     /**
      * API URL for New Relic deployments
      */
-    const API_URL = 'https://api.newrelic.com/v2/applications/%s/deployments.json';
+    private const API_URL = 'https://api.newrelic.com/v2/applications/%s/deployments.json';
 
     /**
      * @var \Magento\NewRelicReporting\Model\Config
@@ -55,6 +55,7 @@ public function __construct(
      * @param string $description
      * @param bool $change
      * @param bool $user
+     * @param ?string $revision
      *
      * @return bool|string
      */
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php
@@ -126,7 +126,14 @@ public function testSetDeploymentRequestOk()
             ->method('create')
             ->willReturn($this->zendClientMock);
 
-        $this->assertIsString($this->model->setDeployment($data['description'], $data['change'], $data['user'], $data['revision']));
+        $this->assertIsString(
+            $this->model->setDeployment(
+                $data['description'],
+                $data['change'],
+                $data['user'],
+                $data['revision']
+            )
+        );
     }
 
     /**
@@ -183,7 +190,14 @@ public function testSetDeploymentBadStatus()
             ->method('create')
             ->willReturn($this->zendClientMock);
 
-        $this->assertIsBool($this->model->setDeployment($data['description'], $data['change'], $data['user'], $data['revision']));
+        $this->assertIsBool(
+            $this->model->setDeployment(
+                $data['description'],
+                $data['change'],
+                $data['user'],
+                $data['revision']
+            )
+        );
     }
 
     /**
@@ -234,7 +248,14 @@ public function testSetDeploymentRequestFail()
             ->method('create')
             ->willReturn($this->zendClientMock);
 
-        $this->assertIsBool($this->model->setDeployment($data['description'], $data['change'], $data['user'], $data['revision']));
+        $this->assertIsBool(
+            $this->model->setDeployment(
+                $data['description'],
+                $data['change'],
+                $data['user'],
+                $data['revision']
+            )
+        );
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryPriceModeWebsiteChangePriceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryPriceModeWebsiteChangePriceTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Api;
 
@@ -12,13 +13,13 @@
 
 class ProductRepositoryPriceModeWebsiteChangePriceTest extends WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogProductRepositoryV1';
-    const PRICE_SERVICE_NAME = 'catalogBasePriceStorageV1';
-    const SERVICE_VERSION = 'V1';
-    const PRODUCTS_RESOURCE_PATH = '/V1/products';
-    const PRICES_RESOURCE_PATH = '/V1/products/base-prices';
-    const STORE1_CODE_FROM_FIXTURE = 'fixturestore';
-    const STORE2_CODE_FROM_FIXTURE = 'fixture_second_store';
+    private const SERVICE_NAME = 'catalogProductRepositoryV1';
+    private const PRICE_SERVICE_NAME = 'catalogBasePriceStorageV1';
+    private const SERVICE_VERSION = 'V1';
+    private const PRODUCTS_RESOURCE_PATH = '/V1/products';
+    private const PRICES_RESOURCE_PATH = '/V1/products/base-prices';
+    private const STORE1_CODE_FROM_FIXTURE = 'fixturestore';
+    private const STORE2_CODE_FROM_FIXTURE = 'fixture_second_store';
 
     /**
      * @magentoApiDataFixture Magento/Store/_files/core_fixturestore.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
@@ -14,9 +14,9 @@
  */
 class ProductTierPriceManagementTest extends WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogProductTierPriceManagementV1';
-    const SERVICE_VERSION = 'V1';
-    const RESOURCE_PATH = '/V1/products/';
+    private const SERVICE_NAME = 'catalogProductTierPriceManagementV1';
+    private const SERVICE_VERSION = 'V1';
+    private const RESOURCE_PATH = '/V1/products/';
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php
@@ -23,10 +23,10 @@
  */
 class SpecialPriceStorageTest extends WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogSpecialPriceStorageV1';
-    const SERVICE_VERSION = 'V1';
-    const SIMPLE_PRODUCT_SKU = 'simple';
-    const VIRTUAL_PRODUCT_SKU = 'virtual-product';
+    private const SERVICE_NAME = 'catalogSpecialPriceStorageV1';
+    private const SERVICE_VERSION = 'V1';
+    private const SIMPLE_PRODUCT_SKU = 'simple';
+    private const VIRTUAL_PRODUCT_SKU = 'virtual-product';
     private const PRODUCT_SKU_TWO_WEBSITES = 'simple-on-two-websites';
 
     /**
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
@@ -52,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function doOperation()
     {
@@ -86,6 +86,8 @@ public function getName()
     }
 
     /**
+     * Get list if files.
+     *
      * @param string[] $paths
      * @return array
      * @throws FileSystemException
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Interception.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Interception.php
@@ -63,7 +63,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function doOperation()
     {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`class BasePriceStorage implements BasePriceStorageInterface`
`27`	`27`	`{`
`28`	`28`	`/**`
`29`		`- * Attribute code.`
	`29`	`+ * Price attribute code.`
`30`	`30`	`*`
`31`	`31`	`* @var string`
`32`	`32`	`*/`
`@@ -78,14 +78,14 @@ class BasePriceStorage implements BasePriceStorageInterface`
`78`	`78`	`private $productAttributeRepository;`
`79`	`79`
`80`	`80`	`/**`
`81`		`- * Price type allowed.`
	`81`	`+ * Is price type allowed`
`82`	`82`	`*`
`83`	`83`	`* @var int`
`84`	`84`	`*/`
`85`	`85`	`private $priceTypeAllowed = 1;`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * Allowed product types.`
	`88`	`+ * Array of allowed product types.`
`89`	`89`	`*`
`90`	`90`	`* @var array`
`91`	`91`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class DeployMarker extends Command`
`29`	`29`	`*`
`30`	`30`	`* @param DeploymentsFactory $deploymentsFactory`
`31`	`31`	`* @param ServiceShellUser $serviceShellUser`
`32`		`- * @param null $name`
	`32`	`+ * @param ?string $name`
`33`	`33`	`*/`
`34`	`34`	`public function __construct(`
`35`	`35`	`DeploymentsFactory $deploymentsFactory,`
`@@ -42,7 +42,7 @@ public function __construct(`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * {@inheritdoc}`
	`45`	`+ * @inheritdoc`
`46`	`46`	`*/`
`47`	`47`	`protected function configure()`
`48`	`48`	`{`
`@@ -71,7 +71,7 @@ protected function configure()`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`74`		`- * {@inheritdoc}`
	`74`	`+ * @inheritdoc`
`75`	`75`	`*/`
`76`	`76`	`protected function execute(InputInterface $input, OutputInterface $output)`
`77`	`77`	`{`
`@@ -82,5 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`82`	`82`	`$input->getArgument('revision')`
`83`	`83`	`);`
`84`	`84`	`$output->writeln('<info>NewRelic deployment information sent</info>');`
	`85`	`+`
	`86`	`+ return 0;`
`85`	`87`	`}`
`86`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function __construct(`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`		`- * {@inheritdoc}`
	`55`	`+ * @inheritdoc`
`56`	`56`	`*/`
`57`	`57`	`public function doOperation()`
`58`	`58`	`{`
`@@ -86,6 +86,8 @@ public function getName()`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`
	`89`	`+ * Get list if files.`
	`90`	`+ *`
`89`	`91`	`* @param string[] $paths`
`90`	`92`	`* @return array`
`91`	`93`	`* @throws FileSystemException`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function __construct(`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * {@inheritdoc}`
	`66`	`+ * @inheritdoc`
`67`	`67`	`*/`
`68`	`68`	`public function doOperation()`
`69`	`69`	`{`