Merge pull request #22 from magento/develop

Back-port develop into 1.0

Author: shiftedreality

composer.json

@@ -8,6 +8,7 @@
         "php": "^7.0",
         "ext-json": "*",
         "composer/composer": "@stable",
+        "composer/semver": "^1.5",
         "symfony/config": "^3.3||^4.4",
         "symfony/console": "^2.8||^4.0",
         "symfony/dependency-injection": "^3.3||^4.3",

config/services.xml

@@ -13,5 +13,6 @@
         <service id="Magento\CloudPatches\Command\Patch\ManagerException" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\ApplierException" autowire="false"/>
         <service id="Magento\CloudPatches\Filesystem\FileNotFoundException" autowire="false"/>
+        <service id="Magento\CloudPatches\Shell\PackageNotFoundException" autowire="false"/>
     </services>
 </container>

patches.json

@@ -238,6 +238,9 @@
     },
     "Fix for multi-site configuration issue": {
       "2.2.4": "MAGETWO-92926__fix_for_multi-site_configuration_issue__2.2.4.patch"
+    },
+    "Fix PayPal issue with region": {
+      "2.3.4": "MC-31387__fix_paypal_issue_with_region__2.3.4.patch"
     }
   },
   "monolog/monolog": {

patches/MC-31387__fix_paypal_issue_with_region__2.3.4.patch

@@ -0,0 +1,67 @@
+diff -Nuar a/vendor/magento/module-paypal/Model/Api/Nvp.php b/vendor/magento/module-paypal/Model/Api/Nvp.php
+--- a/vendor/magento/module-paypal/Model/Api/Nvp.php
++++ b/vendor/magento/module-paypal/Model/Api/Nvp.php
+@@ -1512,17 +1512,17 @@
+         }
+         // attempt to fetch region_id from directory
+         if ($address->getCountryId() && $address->getRegion()) {
+-            $regions = $this->_countryFactory->create()->loadByCode(
+-                $address->getCountryId()
+-            )->getRegionCollection()->addRegionCodeOrNameFilter(
+-                $address->getRegion()
+-            )->setPageSize(
+-                1
+-            );
++            $regions = $this->_countryFactory->create()
++                ->getRegionCollection()
++                ->addCountryFilter($address->getCountryId())
++                ->addRegionCodeOrNameFilter($address->getRegion())
++                ->setPageSize(1);
+             $regionItems = $regions->getItems();
+-            $region = array_shift($regionItems);
+-            $address->setRegionId($region->getId());
+-            $address->setExportedKeys(array_merge($address->getExportedKeys(), ['region_id']));
++            if (count($regionItems)) {
++                $region = array_shift($regionItems);
++                $address->setRegionId($region->getId());
++                $address->setExportedKeys(array_merge($address->getExportedKeys(), ['region_id']));
++            }
+         }
+     }
+ 
+@@ -1624,7 +1624,7 @@
+             case 'year':
+                 return 'Year';
+             default:
+-                break;
++                return '';
+         }
+     }
+ 
+@@ -1653,7 +1653,7 @@
+             case 'active':
+                 return 'Active';
+             default:
+-                break;
++                return '';
+         }
+     }
+ 
+@@ -1694,7 +1694,7 @@
+             case 'Voided':
+                 return \Magento\Paypal\Model\Info::PAYMENTSTATUS_VOIDED;
+             default:
+-                break;
++                return null;
+         }
+     }
+ 
+@@ -1712,7 +1712,7 @@
+             case \Magento\Paypal\Model\Pro::PAYMENT_REVIEW_DENY:
+                 return 'Deny';
+             default:
+-                break;
++                return null;
+         }
+     }
+ 

src/Shell/PackageNotFoundException.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudPatches\Shell;
+
+use Magento\CloudPatches\App\GenericException;
+
+/**
+ * Exception if a Composer package could not be found for some reason (e.g., symfony/process).
+ */
+class PackageNotFoundException extends GenericException
+{
+}

src/Shell/ProcessFactory.php

@@ -7,6 +7,9 @@
 
 namespace Magento\CloudPatches\Shell;
 
+use Composer\Composer;
+use Composer\Repository\RepositoryInterface;
+use Composer\Semver\Comparator;
 use Magento\CloudPatches\Filesystem\DirectoryList;
 use Symfony\Component\Process\Process;
 
@@ -17,17 +20,25 @@
  */
 class ProcessFactory
 {
+    const ARRAY_PARAM_MIN_VERSION = '3.3.0';
+
     /**
      * @var DirectoryList
      */
     private $directoryList;
 
+    /**
+     * @var RepositoryInterface
+     */
+    private $repository;
+
     /**
      * @param DirectoryList $directoryList
      */
-    public function __construct(DirectoryList $directoryList)
+    public function __construct(DirectoryList $directoryList, Composer $composer)
     {
         $this->directoryList = $directoryList;
+        $this->repository = $composer->getLocker()->getLockedRepository();
     }
 
     /**
@@ -37,8 +48,22 @@ public function __construct(DirectoryList $directoryList)
     public function create(array $cmd): Process
     {
         return new Process(
-            implode(' ', $cmd),
+            $this->processSupportsArrayParam() ? $cmd : implode(' ', $cmd),
             $this->directoryList->getMagentoRoot()
         );
     }
+
+    /**
+     * Test if symfony/process is current enough to support an array for its first parameter.
+     */
+    private function processSupportsArrayParam(): bool
+    {
+        $package = $this->repository->findPackage('symfony/process', '*');
+
+        if ($package === null) {
+            throw new PackageNotFoundException('Could not find symfony/process package.');
+        }
+
+        return Comparator::greaterThanOrEqualTo($package->getVersion(), self::ARRAY_PARAM_MIN_VERSION);
+    }
 }