Merge pull request #33 from magento-commerce/develop

Merge develop into 1.0

Author: oshmyheliuk

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "license": "OSL-3.0",
     "require": {
         "php": "^7.0",

config/patch-categories.json

@@ -0,0 +1,68 @@
+[
+    {
+        "name": "Performance"
+    },
+    {
+        "name": "Web API"
+    },
+    {
+        "name": "GraphQL"
+    },
+    {
+        "name": "B2B"
+    },
+    {
+        "name": "Content"
+    },
+    {
+        "name": "Fastly/Varnish"
+    },
+    {
+        "name": "Redis/Memcache"
+    },
+    {
+        "name": "Cron"
+    },
+    {
+        "name": "Inventory"
+    },
+    {
+        "name": "Elasticsearch"
+    },
+    {
+        "name": "Import/Export"
+    },
+    {
+        "name": "Catalog/Product"
+    },
+    {
+        "name": "Catalog Search"
+    },
+    {
+        "name": "Payments"
+    },
+    {
+        "name": "Reports"
+    },
+    {
+        "name": "Customer"
+    },
+    {
+        "name": "Shipping"
+    },
+    {
+        "name": "Order"
+    },
+    {
+        "name": "Shopping Cart"
+    },
+    {
+        "name": "Emails"
+    },
+    {
+        "name": "Admin"
+    },
+    {
+        "name": "Other"
+    }
+]

config/services.xml

@@ -87,5 +87,29 @@
                 <argument type="service" id="Magento\CloudPatches\Shell\Command\PatchDriver"/>
             </argument>
         </service>
+        <service id="Magento\CloudPatches\Patch\Collector\SupportCollector">
+            <argument key="$getPatchesConfig" type="service" id="Magento\CloudPatches\Patch\Collector\GetSupportPatchesConfig"/>
+        </service>
+        <service id="Magento\CloudPatches\Patch\Collector\CommunityCollector">
+            <argument key="$getPatchesConfig" type="service" id="Magento\CloudPatches\Patch\Collector\GetCommunityPatchesConfig"/>
+        </service>
+        <service id="Magento\CloudPatches\Patch\GetCategoriesList">
+            <argument key="$providers" type="collection">
+                <argument type="service" id="Magento\CloudPatches\Patch\CategoriesList\GetLocalPatchCategories"/>
+                <argument type="service" id="Magento\CloudPatches\Patch\CategoriesList\GetSupportPatchCategories"/>
+            </argument>
+        </service>
+        <service id="Magento\CloudPatches\Patch\Pool\OptionalPool">
+            <argument key="$collectors" type="collection">
+                <argument type="service" id="Magento\CloudPatches\Patch\Collector\CloudCollector"/>
+                <argument type="service" id="Magento\CloudPatches\Patch\Collector\SupportCollector"/>
+                <argument type="service" id="Magento\CloudPatches\Patch\Collector\CommunityCollector"/>
+            </argument>
+        </service>
+        <service id="Magento\CloudPatches\Patch\Pool\RequiredPool">
+            <argument key="$collectors" type="collection">
+                <argument type="service" id="Magento\CloudPatches\Patch\Collector\CloudCollector"/>
+            </argument>
+        </service>
     </services>
 </container>

patches.json

@@ -235,7 +235,7 @@
     },
     "Pagination Not working - product_list_limit=all": {
       ">=2.3.2 <2.3.4": "MCLOUD-5684__pagination_not_working_product_list_limit_all__2.3.2.patch",
-      ">=2.3.4 <2.4.0": "MCLOUD-5684__pagination_not_working_product_list_limit_all__2.3.4.patch"
+      ">=2.3.4 <2.3.6": "MCLOUD-5684__pagination_not_working_product_list_limit_all__2.3.4.patch"
     },
     "Sitemap Generation Warnings": {
       ">=2.3.0 <2.3.2": "MCLOUD-3025__sitemap_generation_warnings__2.3.0.patch",

src/Command/Process/Action/ApplyOptionalAction.php

@@ -9,6 +9,7 @@
 
 use Magento\CloudPatches\App\RuntimeException;
 use Magento\CloudPatches\Command\Process\Renderer;
+use Magento\CloudPatches\Patch\Collector\SupportCollector;
 use Magento\CloudPatches\Patch\Conflict\Processor as ConflictProcessor;
 use Magento\CloudPatches\Patch\Pool\OptionalPool;
 use Magento\CloudPatches\Patch\Applier;
@@ -24,6 +25,7 @@
  * Applies optional patches.
  *
  * Patches are applying from top to bottom of config list.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ApplyOptionalAction implements ActionInterface
 {
@@ -139,7 +141,7 @@ private function getPatchList(array $patchFilter): array
     {
         if (empty($patchFilter)) {
             return array_filter(
-                $this->optionalPool->getOptionalAll(),
+                $this->optionalPool->getOptionalListByOrigin([SupportCollector::ORIGIN]),
                 function ($patch) {
                     return !$patch->isDeprecated();
                 }

src/Command/Process/Action/ReviewAppliedAction.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CloudPatches\Command\Process\Action;
 
+use Magento\CloudPatches\Patch\Collector\SupportCollector;
 use Magento\CloudPatches\Patch\Pool\OptionalPool;
 use Magento\CloudPatches\Patch\Status\StatusPool;
 use Psr\Log\LoggerInterface;
@@ -59,7 +60,7 @@ public function __construct(
     public function execute(InputInterface $input, OutputInterface $output, array $patchFilter)
     {
         $appliedOptionalPatches = array_filter(
-            $this->optionalPool->getOptionalAll(),
+            $this->optionalPool->getOptionalListByOrigin([SupportCollector::ORIGIN]),
             function ($patch) {
                 return $this->statusPool->isApplied($patch->getId());
             }

src/Command/Process/Renderer.php

@@ -9,6 +9,7 @@
 
 use Magento\CloudPatches\Console\ConfirmationQuestionFactory;
 use Magento\CloudPatches\Console\TableFactory;
+use Magento\CloudPatches\Patch\Collector\CommunityCollector;
 use Magento\CloudPatches\Patch\Data\AggregatedPatchInterface;
 use Magento\CloudPatches\Patch\Data\PatchInterface;
 use Magento\CloudPatches\Patch\Status\StatusPool;
@@ -26,6 +27,10 @@ class Renderer
 
     const TITLE = 'Title';
 
+    const CATEGORY = 'Category';
+
+    const ORIGIN = 'Origin';
+
     const TYPE = 'Type';
 
     const STATUS = 'Status';
@@ -80,7 +85,7 @@ public function __construct(
     public function printTable(OutputInterface $output, array $patchList)
     {
         $table = $this->tableFactory->create($output);
-        $table->setHeaders([self::ID, self::TITLE, self::TYPE, self::STATUS, self::DETAILS]);
+        $table->setHeaders([self::ID, self::TITLE, self::CATEGORY, self::ORIGIN, self::STATUS, self::DETAILS]);
         $table->setStyle('box-double');
 
         $rows = [];
@@ -89,6 +94,9 @@ public function printTable(OutputInterface $output, array $patchList)
         }
 
         usort($rows, function ($a, $b) {
+            if ($a[self::STATUS] === $b[self::STATUS]) {
+                return strcmp($a[self::ORIGIN], $b[self::ORIGIN]);
+            }
             return strcmp($a[self::STATUS], $b[self::STATUS]);
         });
 
@@ -165,7 +173,10 @@ public function printQuestion(InputInterface $input, OutputInterface $output, st
      */
     private function createRow(AggregatedPatchInterface $patch): array
     {
-        $details = '';
+        $details = 'Patch type: '
+            . ($patch->isDeprecated() ? '<error>DEPRECATED</error>' : $patch->getType())
+            . PHP_EOL;
+
         if ($patch->getReplacedWith()) {
             $details .= '<info>Recommended replacement: ' . $patch->getReplacedWith() . '</info>' . PHP_EOL;
         }
@@ -191,7 +202,8 @@ function ($item) {
         return [
             self::ID => '<comment>' . $id . '</comment>',
             self::TITLE => $title,
-            self::TYPE => $patch->isDeprecated() ? '<error>DEPRECATED</error>' : $patch->getType(),
+            self::CATEGORY =>  implode(PHP_EOL, $patch->getCategories()),
+            self::ORIGIN => $patch->getOrigin(),
             self::STATUS => $this->statusPool->get($patch->getId()),
             self::DETAILS => $details
         ];