Skip to content

Commit 3d0e5c8

Browse files
committed
fix merge config files
1 parent db1e00e commit 3d0e5c8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Model/Config/DocumentType/Converter/FileAllowedExtensionsConverter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Opengento\Document\Model\Config\DocumentType\Converter;
99

1010
use DOMNode;
11+
use function array_filter;
1112
use function implode;
1213
use function trim;
1314

@@ -21,6 +22,6 @@ public function convert(DOMNode $node): string
2122
$allowedExtensions[] = trim($childNode->nodeValue);
2223
}
2324

24-
return implode(',', $allowedExtensions);
25+
return implode(',', array_filter($allowedExtensions));
2526
}
2627
}

etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
<argument name="nodeConverters" xsi:type="array">
210210
<item name="default" xsi:type="object">Opengento\Document\Model\Config\DocumentType\Converter\NodeConverter</item>
211211
<item name="scheduledImport" xsi:type="object">Opengento\Document\Model\Config\DocumentType\Converter\ScheduledImportConverter</item>
212-
<item name="fileAllowedExtensionsComplex" xsi:type="object">Opengento\Document\Model\Config\DocumentType\Converter\FileAllowedExtensionsConverter</item>
212+
<item name="fileAllowedExtensions" xsi:type="object">Opengento\Document\Model\Config\DocumentType\Converter\FileAllowedExtensionsConverter</item>
213213
</argument>
214214
</arguments>
215215
</type>
@@ -226,7 +226,7 @@
226226
<argument name="schemaLocator" xsi:type="object">Opengento\Document\Config\DocumentType\SchemaLocator</argument>
227227
<argument name="fileName" xsi:type="string">resource_document_types.xml</argument>
228228
<argument name="idAttributes" xsi:type="array">
229-
<item name="config/documentType" xsi:type="string">code</item>
229+
<item name="/config/documentType" xsi:type="string">code</item>
230230
</argument>
231231
</arguments>
232232
</virtualType>

etc/resource_document_types.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</xs:complexType>
3737
<xs:complexType name="fileAllowedExtensionsComplex">
3838
<xs:sequence>
39-
<xs:element type="xs:string" name="extension" minOccurs="1" maxOccurs="unbounded"/>
39+
<xs:element type="xs:string" name="extension" maxOccurs="unbounded"/>
4040
</xs:sequence>
4141
</xs:complexType>
4242
</xs:schema>

0 commit comments

Comments
 (0)