ACP2E-3842: [Mainline]After applying ACP2E-3769_2.4.6-p9 - Deprecated Functionality: Implicit conversion from float

Author: soklymeach

app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php

@@ -208,10 +208,10 @@ private function validateSubSelectConditions(mixed $item): bool
      * @param mixed $item
      * @param mixed $attr
      * @param float $total
-     * @return float|mixed
+     * @return float
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function getBaseRowTotalForChildrenProduct(mixed $item, mixed $attr, float $total): mixed
+    private function getBaseRowTotalForChildrenProduct(mixed $item, mixed $attr, float $total): float
     {
         $hasValidChild = false;
         $useChildrenTotal = ($item->getProductType() == Type::TYPE_BUNDLE);

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/Product/SubselectTest.php

@@ -7,17 +7,22 @@
 
 namespace Magento\SalesRule\Model\Rule\Condition\Product;
 
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Quote\Test\Fixture\AddProductToCart;
+use Magento\Quote\Test\Fixture\CustomerCart;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\SalesRule\Model\Rule\Condition\Product as SalesRuleProduct;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Integration test for Subselect::validate() method returning true.
  *
  * @magentoAppArea frontend
- * @magentoDbIsolation enabled
  */
 class SubselectTest extends TestCase
 {
@@ -32,28 +37,31 @@ class SubselectTest extends TestCase
     private $subselectCondition;
 
     /**
-     * @var SalesRuleProduct
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
      */
-    private $productCondition;
+    protected $productRepository;
 
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->productCondition = $this->objectManager->create(SalesRuleProduct::class);
-        $this->subselectCondition = $this->objectManager->create(
-            Subselect::class,
-            [
-                'context' => $this->objectManager->get(\Magento\Rule\Model\Condition\Context::class),
-                'ruleConditionProduct' => $this->productCondition
-            ]
-        );
+        $this->subselectCondition = $this->objectManager->create(Subselect::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
      * Test validate() method returning true for total quantity >= 2 with single shipping.
      *
-     * @magentoDataFixture Magento/Catalog/_files/products.php
      */
+    #[
+        DataFixture(Customer::class, as: 'customer'),
+        DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'quote'),
+        DataFixture(ProductFixture::class, ['sku' => 'simple1', 'price' => 100.50], as: 'product'),
+        DataFixture(
+            AddProductToCart::class,
+            ['cart_id' => '$quote.id$', 'product_id' => '$product.id$', 'qty' => 2],
+            'item'
+        ),
+    ]
     public function testValidateReturnsTrueForSufficientQuantity()
     {
         $this->subselectCondition->setData([
@@ -66,20 +74,13 @@ public function testValidateReturnsTrueForSufficientQuantity()
         $productCondition->setData([
             'attribute' => 'sku',
             'operator' => '==',
-            'value' => 'simple',
+            'value' => 'simple1',
         ]);
         $this->subselectCondition->setConditions([$productCondition]);
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple');
-        $product->setPrice(100.50);
+        $product = $this->productRepository->get('simple1');
         $this->assertNotNull($product->getId());
-        $quote = $this->objectManager->create(Quote::class);
-        $quote->setStoreId(1)
-            ->setIsActive(true)
-            ->setIsMultiShipping(false)
-            ->setReservedOrderId('test_quote')
-            ->addProduct($product, 2);
-        $quote->collectTotals()->save();
+        $quote = DataFixtureStorageManager::getStorage()->get('quote');
+        $quote->setStoreId(1)->setIsActive(true)->setIsMultiShipping(false);
         $this->assertNotNull($quote->getId());
         $this->assertNotEmpty($quote->getAllVisibleItems());
         $quoteItem = $quote->getAllVisibleItems()[0];