Skip to content

Commit f0e14a2

Browse files
Merge pull request #2913 from coreshop/upmerge/4.1_5.0
[UPMERGE] 4.1 -> 5.0
2 parents fe59828 + c61a92f commit f0e14a2

6 files changed

Lines changed: 40 additions & 0 deletions

File tree

src/CoreShop/Bundle/CoreBundle/CoreExtension/StoreValues.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,10 @@ public function getDataFromEditmode($data, $object = null, $params = []): mixed
702702

703703
public function getVersionPreview($data, $object = null, $params = []): string
704704
{
705+
if (null === $data) {
706+
return '';
707+
}
708+
705709
if (!is_array($data)) {
706710
return $data;
707711
}

src/CoreShop/Bundle/OrderBundle/DependencyInjection/Configuration.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,12 @@ private function addModelsSection(ArrayNodeDefinition $node): void
136136
->addDefaultsIfNotSet()
137137
->children()
138138
->variableNode('options')->end()
139+
->arrayNode('graphql')
140+
->addDefaultsIfNotSet()
141+
->children()
142+
->booleanNode('enabled')->defaultTrue()->end()
143+
->end()
144+
->end()
139145
->arrayNode('classes')
140146
->addDefaultsIfNotSet()
141147
->children()

src/CoreShop/Bundle/PaymentBundle/DependencyInjection/Configuration.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ private function addModelsSection(ArrayNodeDefinition $node): void
155155
->addDefaultsIfNotSet()
156156
->children()
157157
->variableNode('options')->end()
158+
->arrayNode('graphql')
159+
->addDefaultsIfNotSet()
160+
->children()
161+
->booleanNode('enabled')->defaultTrue()->end()
162+
->end()
163+
->end()
158164
->arrayNode('classes')
159165
->addDefaultsIfNotSet()
160166
->children()

src/CoreShop/Bundle/ProductBundle/DependencyInjection/Configuration.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ private function addModelsSection(ArrayNodeDefinition $node): void
124124
->addDefaultsIfNotSet()
125125
->children()
126126
->variableNode('options')->end()
127+
->arrayNode('graphql')
128+
->addDefaultsIfNotSet()
129+
->children()
130+
->booleanNode('enabled')->defaultTrue()->end()
131+
->end()
132+
->end()
127133
->arrayNode('classes')
128134
->addDefaultsIfNotSet()
129135
->children()
@@ -157,6 +163,12 @@ private function addModelsSection(ArrayNodeDefinition $node): void
157163
->addDefaultsIfNotSet()
158164
->children()
159165
->variableNode('options')->end()
166+
->arrayNode('graphql')
167+
->addDefaultsIfNotSet()
168+
->children()
169+
->booleanNode('enabled')->defaultTrue()->end()
170+
->end()
171+
->end()
160172
->arrayNode('classes')
161173
->addDefaultsIfNotSet()
162174
->children()

src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Configuration.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
8282
->arrayNode('translation')
8383
->children()
8484
->variableNode('options')->end()
85+
->arrayNode('graphql')
86+
->addDefaultsIfNotSet()
87+
->children()
88+
->booleanNode('enabled')->defaultTrue()->end()
89+
->end()
90+
->end()
8591
->arrayNode('classes')
8692
->isRequired()
8793
->addDefaultsIfNotSet()

src/CoreShop/Bundle/TaxationBundle/DependencyInjection/Configuration.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ private function addModelsSection(ArrayNodeDefinition $node): void
8383
->addDefaultsIfNotSet()
8484
->children()
8585
->variableNode('options')->end()
86+
->arrayNode('graphql')
87+
->addDefaultsIfNotSet()
88+
->children()
89+
->booleanNode('enabled')->defaultTrue()->end()
90+
->end()
91+
->end()
8692
->arrayNode('classes')
8793
->addDefaultsIfNotSet()
8894
->children()

0 commit comments

Comments
 (0)