Merge branch '2.4-develop' into AC-8714_Varnish

Author: magento-devops-queue-mgr-svc

app/code/Magento/AdminAnalytics/Test/Mftf/class-file-naming-allowlist

@@ -0,0 +1,2 @@
+CloseAllDialogBoxes
+SelectAdminUsageSetting

app/code/Magento/AdminNotification/Test/Mftf/ActionGroup/AdminSystemMessagesActionGroup.xml renamed to app/code/Magento/AdminNotification/Test/Mftf/ActionGroup/AdminSystemMessagesWarningActionGroup.xml

@@ -1,18 +1,7 @@
 <?php
-/************************************************************************
- *
+/**
  * Copyright 2023 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
- * ***********************************************************************
  */
 declare(strict_types=1);
 

app/code/Magento/AdvancedSearch/Model/DataProvider/AutocompleteSuggestions.php

@@ -1,18 +1,7 @@
 <?php
-/************************************************************************
- *
+/**
  * Copyright 2023 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
- * ***********************************************************************
  */
 declare(strict_types=1);
 

app/code/Magento/AdvancedSearch/Test/Unit/Model/DataProvider/AutocompleteSuggestionsTest.php

@@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln(
             '<info>Status: maintenance mode is ' .
-            ($this->maintenanceMode->isOn() ? 'active' : 'not active') . '</info>'
+            ($this->maintenanceMode->isOn() ? 'enabled' : 'disabled') . '</info>'
         );
         $addressInfo = $this->maintenanceMode->getAddressInfo();
         $addresses = implode(' ', $addressInfo);

app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml renamed to app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigGeneralAnalyticsPage.xml

@@ -1,10 +1,14 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Model\Validator;
 
+use Magento\Framework\App\Utility\IPAddress;
+
 /**
  * Class to validate list of IPs for maintenance commands
  */
@@ -25,12 +29,22 @@ class IpValidator
      */
     private $invalidIps;
 
+    /**
+     * @param IPAddress $ipAddress
+     */
+    public function __construct(
+        private readonly IPAddress $ipAddress,
+    ) {
+    }
+
     /**
      * Validates list of ips
      *
      * @param string[] $ips
      * @param bool $noneAllowed
+     *
      * @return string[]
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function validateIps(array $ips, $noneAllowed)
@@ -55,22 +69,26 @@ public function validateIps(array $ips, $noneAllowed)
                 $messages[] = "Invalid IP $invalidIp";
             }
         }
+
         return $messages;
     }
 
     /**
      * Filter ips into 'none', valid and invalid ips
      *
      * @param string[] $ips
+     *
      * @return void
      */
     private function filterIps(array $ips)
     {
         foreach ($ips as $ip) {
-            if (filter_var($ip, FILTER_VALIDATE_IP)) {
-                $this->validIps[] = $ip;
-            } elseif ($ip == 'none') {
+            if ($ip === 'none') {
                 $this->none[] = $ip;
+            } elseif ($this->ipAddress->isValidAddress($ip)) {
+                $this->validIps[] = $ip;
+            } elseif ($this->ipAddress->isValidRange($ip)) {
+                $this->validIps[] = $ip;
             } else {
                 $this->invalidIps[] = $ip;
             }

app/code/Magento/Backend/Console/Command/MaintenanceStatusCommand.php

@@ -20,6 +20,7 @@
         </arguments>
 
         <!-- search for the name -->
+        <waitForElementClickable selector="{{AdminSecondaryGridSection.resetFilters}}" stepKey="waitForFiltersReset"/>
         <click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
         <fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/>
         <click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/>

app/code/Magento/Backend/Model/Validator/IpValidator.php

@@ -53,20 +53,20 @@ public function executeDataProvider()
         return [
             [
                 [true, ['127.0.0.1', '127.0.0.2']],
-                'Status: maintenance mode is active' . PHP_EOL .
+                'Status: maintenance mode is enabled' . PHP_EOL .
                 'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
             ],
             [
                 [true, []],
-                'Status: maintenance mode is active' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
+                'Status: maintenance mode is enabled' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
             ],
             [
                 [false, []],
-                'Status: maintenance mode is not active' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
+                'Status: maintenance mode is disabled' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
             ],
             [
                 [false, ['127.0.0.1', '127.0.0.2']],
-                'Status: maintenance mode is not active' . PHP_EOL .
+                'Status: maintenance mode is disabled' . PHP_EOL .
                 'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
             ],
         ];