diff --git a/src/Resolver/Location/FindParentStrategy.php b/src/Resolver/Location/FindParentStrategy.php index 58b78ea2..8d1f7d56 100644 --- a/src/Resolver/Location/FindParentStrategy.php +++ b/src/Resolver/Location/FindParentStrategy.php @@ -19,6 +19,7 @@ use Pimcore\Bundle\DataImporterBundle\Exception\InvalidInputException; use Pimcore\Bundle\DataImporterBundle\Tool\DataObjectLoader; use Pimcore\Model\DataObject; +use Pimcore\Model\DataObject\AbstractObject; use Pimcore\Model\DataObject\ClassDefinition; use Pimcore\Model\Element\ElementInterface; @@ -134,7 +135,7 @@ public function updateParent(ElementInterface $element, array $inputData): Eleme } if ($newParent) { - if ($newParent->getType() === DataObject::OBJECT_TYPE_VARIANT) { + if ($newParent->getType() === AbstractObject::OBJECT_TYPE_VARIANT) { throw new InvalidInputException( 'The elements desired parent is a variant which cannot have any child elements' ); @@ -148,8 +149,7 @@ public function updateParent(ElementInterface $element, array $inputData): Eleme && $element->getClass()->getAllowVariants() && !$element->hasChildren() ) { - /** @var DataObject\Concrete $element */ - $element->setType(DataObject::OBJECT_TYPE_VARIANT); + $element->setType(AbstractObject::OBJECT_TYPE_VARIANT); } return $element->setParent($newParent); diff --git a/src/Resolver/Resolver.php b/src/Resolver/Resolver.php index 17e9aee8..0e2f6b8f 100644 --- a/src/Resolver/Resolver.php +++ b/src/Resolver/Resolver.php @@ -20,7 +20,7 @@ use Pimcore\Bundle\DataImporterBundle\Resolver\Load\LoadStrategyInterface; use Pimcore\Bundle\DataImporterBundle\Resolver\Location\LocationStrategyInterface; use Pimcore\Bundle\DataImporterBundle\Resolver\Publish\PublishStrategyInterface; -use Pimcore\Model\DataObject; +use Pimcore\Model\DataObject\AbstractObject; use Pimcore\Model\Element\ElementInterface; class Resolver @@ -155,7 +155,7 @@ public function loadOrCreateAndPrepareElement(array $inputData, bool $createNew $this->getLocationUpdateStrategy()->updateParent($element, $inputData); // The parent of a variant cannot be changed anymore. - if ($oldParentId !== $element->getParentId() && $element->getType() === DataObject::OBJECT_TYPE_VARIANT) { + if ($oldParentId !== $element->getParentId() && $element->getType() === AbstractObject::OBJECT_TYPE_VARIANT) { throw new InvalidInputException( "Element with id `{$element->getId()}` is a variant and cannot change its parent anymore" );