From e3619a7d2709477294dd1ab740a6fd591e9632c0 Mon Sep 17 00:00:00 2001
From: Andrii Beziazychnyi <a.beziazychnyi@atwix.com>
Date: Fri, 1 Jul 2022 11:09:47 +0200
Subject: [PATCH 1/2] AC-3550: Fixes for compatibility with Symfony 5.4

---
 Console/Command/CacheEvict.php                  | 9 ++++++---
 Console/Command/ConfigShowDefaultUrlCommand.php | 2 +-
 Console/Command/ConfigShowEntityUrlsCommand.php | 2 +-
 Console/Command/ConfigShowStoreUrlCommand.php   | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Console/Command/CacheEvict.php b/Console/Command/CacheEvict.php
index 882a232..8c6de2d 100644
--- a/Console/Command/CacheEvict.php
+++ b/Console/Command/CacheEvict.php
@@ -8,6 +8,7 @@
 namespace Magento\CloudComponents\Console\Command;
 
 use Magento\CloudComponents\Model\Cache\Evictor;
+use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -33,7 +34,7 @@ public function __construct(Evictor $evictor)
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -41,9 +42,9 @@ protected function configure()
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
-    public function execute(InputInterface $input, OutputInterface $output): void
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln('Begin scanning of cache keys');
 
@@ -53,5 +54,7 @@ public function execute(InputInterface $input, OutputInterface $output): void
             'Total scanned keys: %s',
             $count
         ));
+
+        return Cli::RETURN_SUCCESS;
     }
 }
diff --git a/Console/Command/ConfigShowDefaultUrlCommand.php b/Console/Command/ConfigShowDefaultUrlCommand.php
index ae528c1..38d65f2 100644
--- a/Console/Command/ConfigShowDefaultUrlCommand.php
+++ b/Console/Command/ConfigShowDefaultUrlCommand.php
@@ -56,7 +56,7 @@ protected function configure()
     /**
      * Returns base url for default store of default website
      *
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/Console/Command/ConfigShowEntityUrlsCommand.php b/Console/Command/ConfigShowEntityUrlsCommand.php
index 89b3815..7394d45 100644
--- a/Console/Command/ConfigShowEntityUrlsCommand.php
+++ b/Console/Command/ConfigShowEntityUrlsCommand.php
@@ -119,7 +119,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return int|null
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/Console/Command/ConfigShowStoreUrlCommand.php b/Console/Command/ConfigShowStoreUrlCommand.php
index 3b0c8d1..4163984 100644
--- a/Console/Command/ConfigShowStoreUrlCommand.php
+++ b/Console/Command/ConfigShowStoreUrlCommand.php
@@ -72,7 +72,7 @@ protected function configure()
     /**
      * Returns store url or all store urls if store id wasn't provided
      *
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

From e8fe7f68a62d3ff2f08b82cc7943c9b0cb7633be Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Thu, 28 Jul 2022 14:40:29 -0500
Subject: [PATCH 2/2] Bump MCC version - 1.0.11

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d638d0d..16be818 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/magento-cloud-components",
   "description": "Cloud Components Module for Magento 2.x",
   "type": "magento2-module",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "require": {
     "php": "^7.2 || ^8.0",
     "ext-json": "*",