Merge branch '2.4-develop' into PR-Tier4-OM-2025-01-24

Author: veloraven

dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -178,11 +178,10 @@ private function getRoutesWhitelist(): array
     private function caseClassesAndIdentifiers($currentModule, $file, &$contents)
     {
         $pattern = '~\b(?<class>(?<module>('
-            . implode(
-                '[_\\\\]|',
-                Files::init()->getNamespaces()
-            )
-            . '(?<delimiter>[_\\\\]))[a-zA-Z0-9]{2,})'
+            .'(?:'
+            . implode('|', Files::init()->getNamespaces())
+            . ')'
+            . '(?<delimiter>[_\\\\]))[A-Z]{1,}[a-zA-Z0-9]{1,})'
             . '(?<class_inside_module>\\4[a-zA-Z0-9_\\\\]{2,})?)\b'
             . '(?:::(?<module_scoped_key>[A-Za-z0-9_/.]+)[\'"])?~';
 

dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Test\Integrity;
 
@@ -967,7 +967,7 @@ protected static function _prepareMapLayoutBlocks()
                 $area = $matches['area'];
                 self::$_mapLayoutBlocks[$area] = self::$_mapLayoutBlocks[$area] ?? [];
             }
-            if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
+            if (preg_match('/(?<namespace>[A-Z][A-Za-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
                 $module = $matches['namespace'] . '\\' . $matches['module'];
                 $xml = simplexml_load_file($file);
                 foreach ((array)$xml->xpath('//container | //block') as $element) {