Merge branch '2.1'

coreshop · May 7, 2020 · e294c8c · e294c8c
2 parents d3878e8 + d997f86
commit e294c8c
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 30 deletions.
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/AddressBundle/Resources/config/services/data_hub.yml
@@ -6,7 +6,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.country.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopCountry }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopCountry }
 
     coreshop.datahub.graphql.querytypegenerator.resource.state:
         class: CoreShop\Component\Resource\DataHub\QueryType\Resource
@@ -15,7 +15,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.state.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopState }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopState }
 
     coreshop.datahub.graphql.querytypegenerator.resource.address_identifier:
         class: CoreShop\Component\Resource\DataHub\QueryType\Resource
@@ -24,7 +24,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.address_identifier.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopAddressIdentifier }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopAddressIdentifier }
 
     coreshop.datahub.graphql.querytypegenerator.resource.country.list:
         class: CoreShop\Component\Resource\DataHub\QueryType\ResourceList
@@ -33,4 +33,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.country.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopCountryMultiselect }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopCountryMultiselect }
diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/CoreBundle/Resources/config/services/data_hub.yml
@@ -6,7 +6,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.product_store_price.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopStorePrice }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopStorePrice }
 
 
     coreshop.datahub.graphql.querytypegenerator.resource.product_store_values:
@@ -16,4 +16,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.product_store_values.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopStoreValues }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopStoreValues }
diff --git a/src/CoreShop/Bundle/CurrencyBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/CurrencyBundle/Resources/config/services/data_hub.yml
@@ -6,7 +6,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.currency.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopCurrency }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopCurrency }
 
     coreshop.datahub.graphql.querytypegenerator.resource.currency.list:
         class: CoreShop\Component\Resource\DataHub\QueryType\ResourceList
@@ -15,7 +15,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.currency.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopCurrencyMultiselect }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopCurrencyMultiselect }
 
     coreshop.datahub.graphql.querytypegenerator.resource.money_currency:
         class: CoreShop\Bundle\CurrencyBundle\DataHub\QueryType\MoneyCurrency
@@ -24,4 +24,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.currency.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopMoneyCurrency }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopMoneyCurrency }
diff --git a/src/CoreShop/Bundle/IndexBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/IndexBundle/Resources/config/services/data_hub.yml
@@ -6,4 +6,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.filter.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopFilter }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopFilter }
diff --git a/src/CoreShop/Bundle/MoneyBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/MoneyBundle/Resources/config/services/data_hub.yml
@@ -4,4 +4,4 @@ services:
         arguments:
             - '@Pimcore\Bundle\DataHubBundle\GraphQL\Service'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopMoney }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopMoney }
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/OrderBundle/Resources/config/services/data_hub.yml
@@ -6,4 +6,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.cart_price_rule.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopCartPriceRule }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopCartPriceRule }
diff --git a/src/CoreShop/Bundle/PaymentBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/PaymentBundle/Resources/config/services/data_hub.yml
@@ -6,4 +6,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.payment_provider.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopPaymentProvider }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopPaymentProvider }
diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services/data_hub.yml
@@ -4,21 +4,39 @@ services:
         arguments:
             - '@Pimcore\Bundle\DataHubBundle\GraphQL\Service'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopDynamicDropdown }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopDynamicDropdown }
+
+    coreshop.datahub.graphql.dataobjectmutationtypegenerator.resource.dynamic_dropdown:
+        class: Pimcore\Bundle\DataHubBundle\GraphQL\DataObjectMutationFieldConfigGenerator\ManyToOneRelation
+        arguments:
+            - '@Pimcore\Bundle\DataHubBundle\GraphQL\Service'
+        tags:
+            - { name: pimcore.datahub.graphql.dataobjectmutationtypegenerator, id: typegenerator_dataobjectmutationdatatype_coreShopDynamicDropdown }
 
     coreshop.datahub.graphql.querytypegenerator.resource.dynamic_dropdown_multiple:
         class: Pimcore\Bundle\DataHubBundle\GraphQL\DataObjectQueryFieldConfigGenerator\Multihref
         arguments:
             - '@Pimcore\Bundle\DataHubBundle\GraphQL\Service'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopDynamicDropdownMultiple }
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopItemSelector }
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopSuperBoxSelect }
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopEmbeddedClass }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopDynamicDropdownMultiple }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopItemSelector }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopSuperBoxSelect }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopEmbeddedClass }
+
+    coreshop.datahub.graphql.dataobjectmutationtypegenerator.redsource.dynamic_dropdown_multiple:
+        class: Pimcore\Bundle\DataHubBundle\GraphQL\DataObjectMutationFieldConfigGenerator\ManyToManyRelation
+        arguments:
+            - '@Pimcore\Bundle\DataHubBundle\GraphQL\Service'
+            - '@Pimcore\Bundle\DataHubBundle\GraphQL\DataObjectType\ElementDescriptorInputType'
+        tags:
+            - { name: pimcore.datahub.graphql.dataobjectmutationtypegenerator, id: typegenerator_dataobjectmutationdatatype_coreShopDynamicDropdownMultiple }
+            - { name: pimcore.datahub.graphql.dataobjectmutationtypegenerator, id: typegenerator_dataobjectmutationdatatype_coreShopItemSelector }
+            - { name: pimcore.datahub.graphql.dataobjectmutationtypegenerator, id: typegenerator_dataobjectmutationdatatype_coreShopSuperBoxSelect }
+            - { name: pimcore.datahub.graphql.dataobjectmutationtypegenerator, id: typegenerator_dataobjectmutationdatatype_coreShopEmbeddedClass }
 
     coreshop.datahub.graphql.querytypegenerator.resource.serialized_data:
         class: CoreShop\Bundle\PimcoreBundle\DataHub\QueryType\SerializedData
         arguments:
             - '@Pimcore\Bundle\DataHubBundle\GraphQL\Service'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopSerializedData }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopSerializedData }
diff --git a/src/CoreShop/Bundle/ProductBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/ProductBundle/Resources/config/services/data_hub.yml
@@ -6,7 +6,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.product_specific_price_rule.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopProductSpecificPriceRules }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopProductSpecificPriceRules }
 
     coreshop.datahub.graphql.querytypegenerator.resource.product_unit:
         class: CoreShop\Component\Resource\DataHub\QueryType\Resource
@@ -15,7 +15,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.product_unit.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopProductUnit }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopProductUnit }
 
     coreshop.datahub.graphql.querytypegenerator.resource.product_unit_definition:
         class: CoreShop\Component\Resource\DataHub\QueryType\Resource
@@ -24,7 +24,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.product_unit_definition.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopProductUnitDefinition }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopProductUnitDefinition }
 
     coreshop.datahub.graphql.querytypegenerator.resource.product_unit_definitions:
         class: CoreShop\Component\Resource\DataHub\QueryType\Resource
@@ -33,4 +33,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.product_unit_definitions.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopProductUnitDefinitions }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopProductUnitDefinitions }
diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Resources/config/services/data_hub.yml
@@ -6,4 +6,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.product_quantity_price_rule.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopProductQuantityPriceRules }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopProductQuantityPriceRules }
diff --git a/src/CoreShop/Bundle/ResourceBundle/Validator/Constraints/UniqueEntityValidator.php b/src/CoreShop/Bundle/ResourceBundle/Validator/Constraints/UniqueEntityValidator.php
@@ -150,7 +150,7 @@ public function validate($entity, Constraint $constraint)
              */
             $foundElement = $elements[0];
 
-            if ($constraint->allowSameEntity && count($elements) === 1 && $entity->getId() === $foundElement) {
+            if ($constraint->allowSameEntity && count($elements) === 1 && $entity->getId() === $foundElement->getId()) {
                 return;
             }
 

diff --git a/src/CoreShop/Bundle/ShippingBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/ShippingBundle/Resources/config/services/data_hub.yml
@@ -6,7 +6,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.carrier.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopCarrier }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopCarrier }
 
     coreshop.datahub.graphql.querytypegenerator.resource.carrier.list:
         class: CoreShop\Component\Resource\DataHub\QueryType\ResourceList
@@ -15,4 +15,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.carrier.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopCarrierMultiselect }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopCarrierMultiselect }
diff --git a/src/CoreShop/Bundle/StoreBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/StoreBundle/Resources/config/services/data_hub.yml
@@ -6,7 +6,7 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.store.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopStore }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopStore }
 
     coreshop.datahub.graphql.querytypegenerator.resource.multi.store_types:
         class: CoreShop\Component\Resource\DataHub\QueryType\ResourceList
@@ -15,4 +15,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.store.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopStoreMultiselect }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopStoreMultiselect }
diff --git a/src/CoreShop/Bundle/TaxationBundle/Resources/config/services/data_hub.yml b/src/CoreShop/Bundle/TaxationBundle/Resources/config/services/data_hub.yml
@@ -6,4 +6,4 @@ services:
             - '@coreshop.data_hub.doctrine_provider'
             - '%coreshop.model.tax_rule_group.class%'
         tags:
-            - { name: pimcore.datahub.graphql.querytypegenerator, id: typegenerator_querydatatype_coreShopTaxRuleGroup }
+            - { name: pimcore.datahub.graphql.dataobjectquerytypegenerator, id: typegenerator_dataobjectquerydatatype_coreShopTaxRuleGroup }
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ public function validate($entity, Constraint $constraint) @@
                  */
                 $foundElement = $elements[0];
-                if ($constraint->allowSameEntity && count($elements) === 1 && $entity->getId() === $foundElement) {
+                if ($constraint->allowSameEntity && count($elements) === 1 && $entity->getId() === $foundElement->getId()) {
                     return;
                 }
@@ Expand Down @@