[Variants] introduce Variant Bundle

src/CoreShop/Behat/Context/Transform/VariantContext.php

@@ -61,7 +61,7 @@ public function getAttributeGroup($name): AttributeGroupInterface
     public function getAttributeColor($name): AttributeColorInterface
     {
         /**
-         * @var AttributeColorInterface[] $attributeColor
+         * @var AttributeColorInterface[] $attributes
          */
         $attributes = $this->attributeColorRepository->findBy(['name' => $name]);
 
@@ -80,7 +80,7 @@ public function getAttributeColor($name): AttributeColorInterface
     public function getAttributeValue($name): AttributeValueInterface
     {
         /**
-         * @var AttributeColorInterface[] $attributeColor
+         * @var AttributeValueInterface[] $attributes
          */
         $attributes = $this->attributeValueRepository->findBy(['name' => $name]);
 

src/CoreShop/Bundle/CoreBundle/Resources/install/pimcore/classes/CoreShopProductBundle/CoreShopProduct.json

@@ -461,7 +461,7 @@
                         "bodyStyle": "",
                         "datatype": "layout",
                         "permissions": null,
-                        "children": [
+                        "childs": [
                             {
                                 "fieldtype": "coreShopRelation",
                                 "stack": "coreshop.purchasable",

src/CoreShop/Bundle/VariantBundle/EventListener/AttributeListener.php

@@ -43,7 +43,7 @@ public function preUpdate(DataObjectEvent $dataObjectEvent): void
         $object = $dataObjectEvent->getObject();
 
         /**
-         * @var AttributeInterface $object
+         * @var AttributeInterface|null $object
          */
         if (!$object instanceof AttributeInterface) {
             return;

src/CoreShop/Bundle/VariantBundle/EventListener/ProductListener.php

@@ -43,8 +43,8 @@ public static function getSubscribedEvents(): array
     public function preUpdate(DataObjectEvent $dataObjectEvent): void
     {
         /**
-         * @var ProductVariantAwareInterface $object
-         * @psalm-var ProductVariantAwareInterface $object
+         * @var ProductVariantAwareInterface|null $object
+         * @psalm-var ProductVariantAwareInterface|null $object
          */
         $object = $dataObjectEvent->getObject();
 

src/CoreShop/Bundle/VariantBundle/Validator/Constraints/ValidAttributesTypeValidator.php

@@ -40,7 +40,7 @@ public function validate($value, Constraint $constraint): void
         Assert::isInstanceOf($constraint, ValidAttributesType::class);
 
         /**
-         * @var null|Concrete&AttributeGroupInterface $parent
+         * @var null|AttributeGroupInterface $parent
          */
         $parent = $value->getAttributeGroup();
 

src/CoreShop/Component/Variant/AttributeCollector.php

@@ -86,7 +86,7 @@ public function getAttributes(array $products, bool $showInList = false): array
             }
         }
 
-        usort($resolvedGroups, fn($a, $b) => $a->getGroup()->getSorting() <=> $b->getGroup()->getSorting());
+        usort($resolvedGroups, static fn(ResolvedAttributeGroup $a, ResolvedAttributeGroup $b) => $a->getGroup()->getSorting() <=> $b->getGroup()->getSorting());
 
         return $resolvedGroups;
     }

src/CoreShop/Component/Variant/Model/AttributeGroupInterface.php

@@ -18,7 +18,9 @@
 
 interface AttributeGroupInterface extends PimcoreModelInterface
 {
-    public function getName(string $language): ?string;
+    public function getName(string $language = null): ?string;
+
+    public function setName(string $name, $language = null): ?string;
 
     public function getSorting(): ?float;
 

src/CoreShop/Component/Variant/Model/AttributeInterface.php

@@ -20,6 +20,8 @@ interface AttributeInterface extends PimcoreModelInterface
 {
     public function getName(string $language = null): ?string;
 
+    public function setName(string $name, $language = null): ?string;
+
     public function getAttributeGroup(): ?AttributeGroupInterface;
 
     public function setAttributeGroup(?AttributeGroupInterface $attributeGroup);

src/CoreShop/Component/Variant/Model/ProductVariantAwareInterface.php

@@ -21,7 +21,7 @@ interface ProductVariantAwareInterface extends PimcoreModelInterface
 {
     public function getName(string $language = null): ?string;
 
-    public function setName(string $name, string $language = null);
+    public function setName(string $name, $language = null);
 
     /**
      * @return AttributeInterface[]|null

src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttributeGroup.php

@@ -42,7 +42,7 @@ public function setGroup(AttributeGroupInterface $group): void
     public function getAttributes(): array
     {
         $attributes = $this->attributes->toArray();
-        usort($attributes, fn($a, $b) => $a->getAttribute()->getSorting() <=> $b->getAttribute()->getSorting());
+        usort($attributes, static fn(ResolvedAttribute $a, ResolvedAttribute $b) => $a->getAttribute()->getSorting() <=> $b->getAttribute()->getSorting());
 
         return $attributes;
     }

src/CoreShop/Component/Variant/composer.json

@@ -24,7 +24,7 @@
     }
   ],
   "require": {
-    "coreshop/resource": "^3.0
+    "coreshop/resource": "^3.0"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.5.4",