merge magento/2.4.0-develop into magento-engcom/addressing-discriminatory-language

Author: magento-mts-svc

app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml

@@ -156,7 +156,7 @@ $scriptString .= <<<script
         setFormValues: function()
         {
             var a;
-            if ($(this.carriersUpsTypeId) == 'UPS') {
+            if (\$F(this.carriersUpsTypeId) == 'UPS') {
                 for (a = 0; a < this.checkingUpsXmlId.length; a++) {
                     $(this.checkingUpsXmlId[a]).removeClassName('required-entry');
                 }
@@ -184,13 +184,13 @@ $scriptString .= <<<script
         },
         changeOriginShipment: function(Event, key)
         {
-            this.originShipmentTitle = key ? key : $('carriers_ups_origin_shipment');
+            this.originShipmentTitle = key ? key : \$F('carriers_ups_origin_shipment');
             this.updateAllowedMethods(this.originShipmentTitle);
         },
         changeFieldsDisabledState: function (fields, key) {
-            $(fields[key]).disabled = $(this.carriersUpsActiveId) !== '1'
+            $(fields[key]).disabled = \$F(this.carriersUpsActiveId) !== '1'
                 || $(fields[key] + '_inherit') !== null
-                && $(fields[key] + '_inherit') === '1';
+                && \$F(fields[key] + '_inherit') === '1';
 
             if ($(fields[key]).next() !== undefined) {
                 $(fields[key]).removeClassName('mage-error').next().remove();

setup/src/Magento/Setup/Console/Command/UpgradeCommand.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
@@ -52,22 +53,30 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $searchConfigFactory;
 
+    /*
+     * @var CacheInterface
+     */
+    private $cache;
+
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
+     * @param CacheInterface|null $cache
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
-        AppState $appState = null
+        AppState $appState = null,
+        CacheInterface $cache = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
+        $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
         parent::__construct();
     }
 
@@ -129,6 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer = $this->installerFactory->create(new ConsoleLogger($output));
             $installer->updateModulesSequence($keepGenerated);
             $searchConfig = $this->searchConfigFactory->create();
+            $this->cache->clean();
             $searchConfig->validateSearchEngine();
             $installer->installSchema($request);
             $installer->installDataFixtures($request);