Merge remote-tracking branch 'origin/ACP2E-4160' into PR_2025_09_19_flowers

Author: thiaramus

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.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\ImportExport\Model\Export\Entity;
 
@@ -290,7 +290,7 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
                 $attrFilterType = \Magento\ImportExport\Model\Export::getAttributeFilterType($attribute);
 
                 if (\Magento\ImportExport\Model\Export::FILTER_TYPE_SELECT == $attrFilterType) {
-                    if (is_scalar($exportFilter[$attrCode]) && trim($exportFilter[$attrCode])) {
+                    if (is_scalar($exportFilter[$attrCode]) && strlen(trim($exportFilter[$attrCode]))) {
                         $collection->addAttributeToFilter($attrCode, ['eq' => $exportFilter[$attrCode]]);
                     }
                 } elseif (\Magento\ImportExport\Model\Export::FILTER_TYPE_MULTISELECT == $attrFilterType) {

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php

@@ -21,6 +21,7 @@
 use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
 use Magento\CatalogInventory\Model\Stock\Item;
 use Magento\Directory\Helper\Data as DirectoryData;
+use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -998,4 +999,22 @@ public function testExportProductWithDateAndDatetimeAttributes(): void
         $this->assertMatchesRegularExpression('#datetime_attr=7/19/15,\p{Zs}3:30\p{Zs}AM#u', $csv);
         $this->assertMatchesRegularExpression('#date_attr=2/7/17("|(,\w+=))#', $csv);
     }
+
+    #[
+        AppArea(Area::AREA_ADMINHTML),
+        DataFixture(
+            AttributeFixture::class,
+            ['frontend_input' => 'boolean', 'backend_type' => 'int', 'attribute_code' => 'yesno_attr']
+        ),
+        DataFixture(ProductFixture::class, ['sku' => 'prod1']),
+        DataFixture(ProductFixture::class, ['sku' => 'prod2', 'yesno_attr' => '0']),
+        DataFixture(ProductFixture::class, ['sku' => 'prod3', 'yesno_attr' => '1']),
+    ]
+    public function testExportProductWithYesNoAttribute(): void
+    {
+        $csv = $this->doExport(['yesno_attr' => '0']);
+        self::assertStringContainsString('prod2', $csv);
+        self::assertStringNotContainsString('prod1', $csv);
+        self::assertStringNotContainsString('prod3', $csv);
+    }
 }