Use one format in all places for array_merge

Fix failing static tests

Author: ihor-sviziev

app/code/Magento/Catalog/Model/Product.php

@@ -1030,7 +1030,7 @@ public function priceReindexCallback()
      */
     public function eavReindexCallback()
     {
-        if ($this->isObjectNew() || $this->isDataChanged($this)) {
+        if ($this->isObjectNew() || $this->isDataChanged()) {
             $this->_productEavIndexerProcessor->reindexRow($this->getEntityId());
         }
     }
@@ -1176,7 +1176,7 @@ public function getTierPrice($qty = null)
     /**
      * Get formatted by currency product price
      *
-     * @return  array|double
+     * @return array|double
      * @since 102.0.6
      */
     public function getFormattedPrice()

app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php

@@ -12,9 +12,6 @@
 use Magento\Catalog\Model\Product\Price\Validation\TierPriceValidator;
 use Magento\Catalog\Model\ProductIdLocatorInterface;
 
-/**
- * Tier price storage.
- */
 class TierPriceStorage implements TierPriceStorageInterface
 {
     /**

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -37,8 +37,6 @@
 use RuntimeException;
 
 /**
- * Class AfterImportDataObserver
- *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

app/code/Magento/Deploy/Package/Package.php

@@ -535,7 +535,7 @@ private function collectParentPaths(
         $area,
         $theme,
         $locale,
-        array & $result = [],
+        array &$result = [],
         ThemeInterface $themeModel = null
     ) {
         if (($package->getArea() != $area) || ($package->getTheme() != $theme) || ($package->getLocale() != $locale)) {

app/code/Magento/Eav/Model/ResourceModel/Helper.php

@@ -19,6 +19,7 @@ class Helper extends \Magento\Framework\DB\Helper
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
      * @codeCoverageIgnore
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource, $modulePrefix = 'Magento_Eav')
     {

app/code/Magento/Ups/Model/Carrier.php

@@ -1135,7 +1135,7 @@ protected function _getXmlTracking($trackings)
 </TrackRequest>
 XMLAuth;
 
-            $trackingResponses[] = $this->asyncHttpClient->request(
+            $trackingResponses[$tracking] = $this->asyncHttpClient->request(
                 new Request(
                     $url,
                     Request::METHOD_POST,
@@ -1144,13 +1144,9 @@ protected function _getXmlTracking($trackings)
                 )
             );
         }
-        foreach ($trackingResponses as $response) {
+        foreach ($trackingResponses as $tracking => $response) {
             $httpResponse = $response->get();
-            if ($httpResponse->getStatusCode() >= 400) {
-                $xmlResponse = '';
-            } else {
-                $xmlResponse = $httpResponse->getBody();
-            }
+            $xmlResponse = $httpResponse->getStatusCode() >= 400 ? '' : $httpResponse->getBody();
 
             $this->_parseXmlTrackingResponse($tracking, $xmlResponse);
         }
@@ -1529,24 +1525,18 @@ protected function _formShipmentRequest(DataObject $request)
             }
 
             if ($deliveryConfirmation && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_PACKAGE) {
-                    $serviceOptionsNode = $packagePart[$packageId]->addChild('PackageServiceOptions');
-                    $serviceOptionsNode->addChild(
-                        'DeliveryConfirmation'
-                    )->addChild(
-                        'DCISType',
-                        $deliveryConfirmation
-                    );
+                $serviceOptionsNode = $packagePart[$packageId]->addChild('PackageServiceOptions');
+                $serviceOptionsNode
+                    ->addChild('DeliveryConfirmation')
+                    ->addChild('DCISType', $deliveryConfirmation);
             }
         }
 
         if (isset($deliveryConfirmation) && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_SHIPMENT) {
             $serviceOptionsNode = $shipmentPart->addChild('ShipmentServiceOptions');
-            $serviceOptionsNode->addChild(
-                'DeliveryConfirmation'
-            )->addChild(
-                'DCISType',
-                $deliveryConfirmation
-            );
+            $serviceOptionsNode
+                ->addChild('DeliveryConfirmation')
+                ->addChild('DCISType', $deliveryConfirmation);
         }
 
         $shipmentPart->addChild('PaymentInformation')
@@ -1628,6 +1618,7 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
         } catch (Throwable $e) {
+            $response = $this->_xmlElFactory->create(['data' => '']);
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
         }
 
@@ -1801,6 +1792,7 @@ protected function _doShipmentRequest(DataObject $request)
         $this->setXMLAccessRequest();
         $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
+        $debugData = [];
 
         if ($xmlResponse === null) {
             $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;

app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php

@@ -33,10 +33,8 @@ class Generator extends AbstractSchemaGenerator
      */
     const ERROR_SCHEMA = '#/definitions/error-response';
 
-    /** Unauthorized description */
     const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized';
 
-    /** Array signifier */
     const ARRAY_SIGNIFIER = '[0]';
 
     /**

setup/src/Magento/Setup/Console/Style/MagentoStyle.php

@@ -565,6 +565,7 @@ private function createBlock(
     ) {
         $indentLength = 0;
         $prefixLength = Helper::strlenWithoutDecoration($this->getFormatter(), $prefix);
+        $lineIndentation = '';
         if (null !== $type) {
             $type = sprintf('[%s] ', $type);
             $indentLength = strlen($type);