Resolved conflicts

Author: glo80326

app/code/Magento/AwsS3/composer.json

@@ -7,9 +7,7 @@
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
-        "magento/module-remote-storage": "*",
-        "league/flysystem": "^2.0",
-        "league/flysystem-aws-s3-v3": "^2.0"
+        "magento/module-remote-storage": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Email/Model/Template.php

@@ -247,7 +247,7 @@ public function getProcessedTemplateSubject(array $variables)
         $storeId = $this->getDesignConfig()->getStore();
 
         try {
-            $processedResult = $processor->setStoreId($storeId)->filter(__($this->getTemplateSubject())->render());
+            $processedResult = $processor->setStoreId($storeId)->filter($this->getTemplateSubject());
         } catch (\Exception $e) {
             $this->cancelDesignConfig();
             throw new \Magento\Framework\Exception\MailException(__($e->getMessage()), $e);

app/code/Magento/Email/Model/Template/Filter.php

@@ -23,6 +23,7 @@
 use Magento\Framework\Filter\Template\Tokenizer\Parameter;
 use Magento\Framework\Filter\VariableResolverInterface;
 use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\Translate\Inline\StateInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
@@ -53,12 +54,12 @@ class Filter extends Template
     /**
      * The name used in the {{trans}} directive
      */
-    const TRANS_DIRECTIVE_NAME = 'trans';
+    public const TRANS_DIRECTIVE_NAME = 'trans';
 
     /**
      * The regex to match interior portion of a {{trans "foo"}} translation directive
      */
-    const TRANS_DIRECTIVE_REGEX = '/^\s*([\'"])([^\1]*?)(?<!\\\)\1(\s.*)?$/si';
+    public const TRANS_DIRECTIVE_REGEX = '/^\s*([\'"])([^\1]*?)(?<!\\\)\1(\s.*)?$/si';
 
     /**
      * @var bool
@@ -119,8 +120,6 @@ class Filter extends Template
 
     /**
      * Core store config
-     * Variable factory
-     *
      * @var VariableFactory
      */
     protected $_variableFactory;
@@ -190,6 +189,11 @@ class Filter extends Template
      */
     private $storeInformation;
 
+    /**
+     * @var StateInterface
+     */
+    private $inlineTranslationState;
+
     /**
      * Filter constructor.
      * @param StringUtils $string
@@ -211,6 +215,7 @@ class Filter extends Template
      * @param array $variables
      * @param array $directiveProcessors
      * @param StoreInformation|null $storeInformation
+     * @param StateInterface|null $inlineTranslationState
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -232,7 +237,8 @@ public function __construct(
         CssInliner $cssInliner,
         $variables = [],
         array $directiveProcessors = [],
-        ?StoreInformation $storeInformation = null
+        ?StoreInformation $storeInformation = null,
+        StateInterface $inlineTranslationState = null
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -251,6 +257,8 @@ public function __construct(
         $this->configVariables = $configVariables;
         $this->storeInformation = $storeInformation ?:
             ObjectManager::getInstance()->get(StoreInformation::class);
+        $this->inlineTranslationState = $inlineTranslationState ?:
+            ObjectManager::getInstance()->get(StateInterface::class);
         parent::__construct($string, $variables, $directiveProcessors, $variableResolver);
     }
 
@@ -616,8 +624,9 @@ public function transDirective($construction)
         if (empty($text)) {
             return '';
         }
-
+        $this->inlineTranslationState->disable();
         $text = __($text, $params)->render();
+        $this->inlineTranslationState->enable();
         return $this->applyModifiers($text, $modifiers);
     }
 

app/code/Magento/RemoteStorage/composer.json

@@ -3,7 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.4.0||~8.1.0",
-        "magento/framework": "*"
+        "magento/framework": "*",
+        "league/flysystem": "~2.4.3",
+        "league/flysystem-aws-s3-v3": "^2.4.3"
     },
     "suggest": {
         "magento/module-backend": "*",

composer.json

@@ -41,11 +41,11 @@
         "lib-libxml": "*",
         "colinmollenhour/cache-backend-file": "~1.4.1",
         "colinmollenhour/cache-backend-redis": "1.14.2",
-        "colinmollenhour/credis": "1.12.1",
+        "colinmollenhour/credis": "1.12.2",
         "colinmollenhour/php-redis-session-abstract": "~1.4.5",
         "composer/composer": "^1.9 || ^2.0",
         "elasticsearch/elasticsearch": "~7.17.0",
-        "guzzlehttp/guzzle": "^7.3.0",
+        "guzzlehttp/guzzle": "^7.4.2",
         "laminas/laminas-captcha": "^2.11",
         "laminas/laminas-code": "~4.5.0",
         "laminas/laminas-db": "^2.13.4",
@@ -67,9 +67,9 @@
         "laminas/laminas-stdlib": "^3.7.1",
         "laminas/laminas-uri": "^2.9.1",
         "laminas/laminas-validator": "^2.17.0",
-        "league/flysystem": "~2.3.2",
-        "league/flysystem-aws-s3-v3": "^2.0",
-        "magento/composer": "~1.8.0",
+        "league/flysystem": "~2.4.3",
+        "league/flysystem-aws-s3-v3": "^2.4.3",
+        "magento/composer": "1.8.x-dev as 1.8.0",
         "magento/composer-dependency-version-audit-plugin": "~0.1",
         "magento/magento-composer-installer": ">=0.3.0",
         "magento/zendframework1": "~1.15.0",
@@ -98,7 +98,7 @@
         "pdepend/pdepend": "~2.10.0",
         "phpmd/phpmd": "^2.9.1",
         "phpstan/phpstan": "~1.4.9",
-        "phpunit/phpunit": "~9.5.18",
+        "phpunit/phpunit": "~9.5.20",
         "sebastian/phpcpd": "^6.0.3",
         "squizlabs/php_codesniffer": "~3.6.0",
         "symfony/finder": "^5.2"