Merge remote-tracking branch 'upstream/2.4-develop' into B2B-319

Author: Joan He

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -2121,7 +2121,9 @@ private function getChildrenCategories(int $categoryId): array
                 if (in_array($category['parent_id'], $categoryIds)
                     && in_array($category['parent_id'], $anchorCategory)) {
                     $categoryIds[] = (int)$category[$linkField];
-                    if ($category['is_anchor'] == 1) {
+                    // Storefront approach is to treat non-anchor children of anchor category as anchors.
+                    // Adding their's IDs to $anchorCategory for consistency.
+                    if ($category['is_anchor'] == 1 || in_array($category['parent_id'], $anchorCategory)) {
                         $anchorCategory[] = (int)$category[$linkField];
                     }
                 }

dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

@@ -142,7 +142,7 @@ private static function getAddedFilesList($changedFilesBaseDir)
             function () {
                 // if no list files, probably, this is the dev environment
                 // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
-                @exec('git diff --cached --name-only', $addedFiles);
+                @exec('git diff --cached --name-only --diff-filter=A', $addedFiles);
                 return $addedFiles;
             }
         );