Merge pull request #44 from magento-commerce/develop

MCLOUD-8200: Release cloud tools

Author: BaDos

composer.json

@@ -2,27 +2,33 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "license": "OSL-3.0",
+    "repositories": {
+        "repo.magento.com": {
+            "type": "composer",
+            "url": "https://repo.magento.com/"
+        }
+    },
     "require": {
         "php": "^7.0",
         "ext-json": "*",
         "composer/composer": "@stable",
-        "composer/semver": "^1.5||^2.0||^3.0",
+        "composer/semver": "@stable",
         "symfony/config": "^3.3||^4.4||^5.1",
         "symfony/console": "^2.6||^4.0||^5.1",
         "symfony/dependency-injection": "^3.3||^4.3||^5.1",
         "symfony/process": "^2.1||^4.1||^5.1",
         "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.1",
         "symfony/yaml": "^3.3||^4.0||^5.1",
-        "monolog/monolog": "^1.16",
+        "monolog/monolog": "^1.25||^2.3",
         "magento/quality-patches": "^1.1.0"
     },
     "require-dev": {
         "codeception/codeception": "^2.5.3",
         "consolidation/robo": "^1.2",
         "phpmd/phpmd": "@stable",
-        "phpunit/phpunit": "^6.2",
+        "phpunit/phpunit": "^7.2",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "bin": [

patches.json

@@ -256,6 +256,10 @@
       ">=2.3.4 <2.3.5": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.4.patch",
       ">=2.3.5 <2.3.6": "MCLOUD-6211__redis_improvement_patches__2.3.5.patch",
       ">=2.4.0 <2.4.1": "MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch"
+    },
+    "Incompatible PHP Method Fix": {
+      "2.3.7-p1": "AC-384__Fix_Incompatible_PHP_Method__2.3.7-p1_ce.patch",
+      "2.4.3": "AC-384__Fix_Incompatible_PHP_Method__2.4.3_ce.patch"
     }
   },
   "magento/module-paypal": {

patches/AC-384__Fix_Incompatible_PHP_Method__2.3.7-p1_ce.patch

@@ -0,0 +1,12 @@
+diff -Nuar a/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php b/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php
+--- a/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php	(revision d40e8cbfd24ac841900166877e9910f9d549fdf5)
++++ b/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php	(revision 7d6a3eeb669d4a11978bf639dc2536ef23d56d09)
+@@ -71,7 +71,7 @@
+ 
+         foreach ($this->fileDenyList as $file) {
+             $baseName = pathinfo($actualPath, PATHINFO_BASENAME);
+-            if (str_contains($baseName, $file) || preg_match('#' . "\." . $file . '#', $fullPath)) {
++            if (strpos($baseName, $file) !== false || preg_match('#' . "\." . $file . '#', $fullPath)) {
+                 throw new ValidatorException(
+                     new Phrase('"%1" is not a valid file path', [$path])
+                 );

patches/AC-384__Fix_Incompatible_PHP_Method__2.4.3_ce.patch

@@ -0,0 +1,12 @@
+diff -Nuar a/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php b/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php
+--- a/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php	(revision d40e8cbfd24ac841900166877e9910f9d549fdf5)
++++ b/vendor/magento/framework/Filesystem/Directory/DenyListPathValidator.php	(revision 7d6a3eeb669d4a11978bf639dc2536ef23d56d09)
+@@ -71,7 +71,7 @@
+ 
+         foreach ($this->fileDenyList as $file) {
+             $baseName = pathinfo($actualPath, PATHINFO_BASENAME);
+-            if (str_contains($baseName, $file) || preg_match('#' . "\." . $file . '#', $fullPath)) {
++            if (strpos($baseName, $file) !== false || preg_match('#' . "\." . $file . '#', $fullPath)) {
+                 throw new ValidatorException(
+                     new Phrase('"%1" is not a valid file path', [$path])
+                 );

src/App/Logger.php

@@ -52,7 +52,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function info($message, array $context = [])
+    public function info($message, array $context = []): void
     {
         $message = strip_tags($message);
 

src/Patch/Conflict/Analyzer.php

@@ -88,6 +88,7 @@ public function analyze(PatchInterface $failedPatch, array $patchFilter = []): s
      */
     private function analyzeOptional(string $failedPatchId, array $patchFilter = []): string
     {
+        $errorMessage = '';
         $optionalPatchIds = $patchFilter ?: $this->optionalPool->getIdsByType(PatchInterface::TYPE_OPTIONAL);
         $ids = $this->getIncompatiblePatches($optionalPatchIds, $failedPatchId);
         if ($ids) {

src/Test/Unit/Patch/Conflict/AnalyzerTest.php

@@ -143,6 +143,14 @@ public function analyzeDataProvider(): array
                 ],
                 'expectedMessage' => 'Patch MC-1 can\'t be applied to clean Magento instance'
             ],
+            [
+                'checkApplyMap' => [
+                    [['REQUIRED-1', 'REQUIRED-2', 'MC-1'], true],
+                    [['OPTIONAL-1', 'MC-1'], true],
+                    [['OPTIONAL-2', 'MC-1'], true],
+                ],
+                'expectedMessage' => ''
+            ],
         ];
     }