Merge remote-tracking branch 'origin/MC-33069-CE-3' into MC-33069

Author: zakdma

app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php

@@ -165,8 +165,8 @@ private function prepareDefaultAddress($address): array
             if (isset($addressData['street']) && !\is_array($address['street'])) {
                 $addressData['street'] = explode("\n", $addressData['street']);
             }
-            $addressData['country'] = $this->countryFactory->create()
-                ->loadByCode($addressData['country_id'])->getName();
+            $countryId = $addressData['country_id'] ?? null;
+            $addressData['country'] = $this->countryFactory->create()->loadByCode($countryId)->getName();
         }
 
         return $addressData;

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -766,7 +766,7 @@ public function getLinkField()
         if (!$this->linkIdField) {
             $indexList = $this->getConnection()->getIndexList($this->getEntityTable());
             $pkName = $this->getConnection()->getPrimaryKeyName($this->getEntityTable());
-            $this->linkIdField = $indexList[$pkName]['COLUMNS_LIST'][0];
+            $this->linkIdField = $indexList[$pkName]['COLUMNS_LIST'][0] ?? null;
             if (!$this->linkIdField) {
                 $this->linkIdField = $this->getEntityIdField();
             }

app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php

@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
                 $startTime = microtime(true);
                 $indexerConfig = $this->getConfig()->getIndexer($indexer->getId());
-                $sharedIndex = $indexerConfig['shared_index'];
+                $sharedIndex = $indexerConfig['shared_index'] ?? null;
 
                 // Skip indexers having shared index that was already complete
                 if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {

app/code/Magento/Indexer/Model/Processor.php

@@ -65,16 +65,17 @@ public function reindexAllInvalid()
             $indexerConfig = $this->config->getIndexer($indexerId);
             if ($indexer->isInvalid()) {
                 // Skip indexers having shared index that was already complete
-                if (!in_array($indexerConfig['shared_index'], $sharedIndexesComplete)) {
+                $sharedIndex = $indexerConfig['shared_index'] ?? null;
+                if (!in_array($sharedIndex, $sharedIndexesComplete)) {
                     $indexer->reindexAll();
                 } else {
                     /** @var \Magento\Indexer\Model\Indexer\State $state */
                     $state = $indexer->getState();
                     $state->setStatus(StateInterface::STATUS_VALID);
                     $state->save();
                 }
-                if ($indexerConfig['shared_index']) {
-                    $sharedIndexesComplete[] = $indexerConfig['shared_index'];
+                if ($sharedIndex) {
+                    $sharedIndexesComplete[] = $sharedIndex;
                 }
             }
         }

app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php

@@ -58,6 +58,7 @@ public function resolve(
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
+        $args['public_hash'] = $args['public_hash'] ?? '';
         $token = $this->paymentTokenManagement->getByPublicHash($args['public_hash'], $context->getUserId());
         if (!$token) {
             throw new GraphQlNoSuchEntityException(

lib/internal/Magento/Framework/App/Route/Config.php

@@ -90,7 +90,7 @@ protected function _getRoutes($scope = null)
         }
 
         $routers = $this->_reader->read($scope);
-        $routes = $routers[$this->_areaList->getDefaultRouter($scope)]['routes'];
+        $routes = $routers[$this->_areaList->getDefaultRouter($scope)]['routes'] ?? null;
         $routesData = $this->getSerializer()->serialize($routes);
         $this->_cache->save($routesData, $cacheId);
         $this->_routes[$scope] = $routes;
@@ -101,7 +101,7 @@ protected function _getRoutes($scope = null)
      * Retrieve route front name
      *
      * @param string $routeId
-     * @param null $scope
+     * @param null|string $scope
      * @return string
      */
     public function getRouteFrontName($routeId, $scope = null)
@@ -111,6 +111,8 @@ public function getRouteFrontName($routeId, $scope = null)
     }
 
     /**
+     * @inheritdoc
+     *
      * @param string $frontName
      * @param string $scope
      * @return bool|int|string
@@ -127,6 +129,8 @@ public function getRouteByFrontName($frontName, $scope = null)
     }
 
     /**
+     * @inheritdoc
+     *
      * @param string $frontName
      * @param string $scope
      * @return string[]

lib/internal/Magento/Framework/DB/FieldDataConverter.php

@@ -21,9 +21,6 @@ class FieldDataConverter
      */
     const BATCH_SIZE_VARIABLE_NAME = 'DATA_CONVERTER_BATCH_SIZE';
 
-    /**
-     * Default batch size
-     */
     const DEFAULT_BATCH_SIZE = 50000;
 
     /**
@@ -131,7 +128,7 @@ private function getBatchSize()
     {
         if (null !== $this->envBatchSize) {
             $batchSize = (int) $this->envBatchSize;
-            if (bccomp($this->envBatchSize, PHP_INT_MAX, 0) === 1 || $batchSize < 1) {
+            if (bccomp($batchSize, PHP_INT_MAX, 0) >= 0 || $batchSize < 1) {
                 throw new \InvalidArgumentException(
                     'Invalid value for environment variable ' . self::BATCH_SIZE_VARIABLE_NAME . '. '
                     . 'Should be integer, >= 1 and < value of PHP_INT_MAX'

lib/internal/Magento/Framework/Phrase.php

@@ -101,6 +101,8 @@ public function render()
     {
         try {
             return self::getRenderer()->render([$this->text], $this->getArguments());
+        } catch (\Error $e) {
+            return $this->getText();
         } catch (\Exception $e) {
             return $this->getText();
         }