Merge branch 'pr-35299' into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php

@@ -11,9 +11,9 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface as OptionRepository;
 use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Relation;
 use Magento\Framework\Exception\CouldNotSaveException;
 
 /**
@@ -26,12 +26,12 @@ class SaveHandler implements ExtensionInterface
     /**
      * @var string[]
      */
-    private $compositeProductTypes = ['grouped', 'configurable', 'bundle'];
+    private array $compositeProductTypes = ['grouped', 'configurable', 'bundle'];
 
     /**
      * @var OptionRepository
      */
-    protected $optionRepository;
+    protected OptionRepository $optionRepository;
 
     /**
      * @var Relation
@@ -44,7 +44,7 @@ class SaveHandler implements ExtensionInterface
      */
     public function __construct(
         OptionRepository $optionRepository,
-        ?Relation $relation = null
+        ?Relation        $relation = null
     ) {
         $this->optionRepository = $optionRepository;
         $this->relation = $relation ?: ObjectManager::getInstance()->get(Relation::class);
@@ -57,6 +57,7 @@ public function __construct(
      * @param array $arguments
      * @return ProductInterface|object
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws CouldNotSaveException
      */
     public function execute($entity, $arguments = [])
     {
@@ -122,12 +123,11 @@ private function processOptionsSaving(array $options, bool $hasChangedSku, Produ
     private function isProductHasRelations(ProductInterface $product): bool
     {
         $result = true;
-        if (!in_array($product->getId(), $this->compositeProductTypes)
+        if (!in_array($product->getTypeId(), $this->compositeProductTypes)
             && $this->relation->getRelationsByChildren([$product->getId()])
         ) {
             $result = false;
         }
-
         return $result;
     }
 }