Skip to content

Commit 324b99a

Browse files
daanrijpkemacbdaanrijpkemacb
authored
Merge pull request #58 from bluem-development/update-validation
Updated XSD validation files
2 parents a541d1f + 54c718d commit 324b99a

6 files changed

Lines changed: 108 additions & 166 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ jobs:
2626
with:
2727
version: 9.5
2828
php_version: 8.1
29-
bootstrap: vendor/autoload.php
29+
bootstrap: ./vendor/autoload.php
3030
configuration: ./.github/workflows/phpunit.xml

‎.github/workflows/phpunit.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
bootstrap="vendor/autoload.php" colors="true"
5+
stopOnFailure="false"
6+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
7+
>
38
<testsuites>
49
<testsuite name="Unit">
510
<directory suffix="Test.php">../../tests</directory>

‎validation/EIdentity.xsd‎

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.4.0">
2+
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.5.0">
33
<!--=====================================================================-->
44
<!-- Schema Management -->
55
<!--=====================================================================-->
@@ -9,8 +9,8 @@
99
<xsd:documentation xml:lang="en"/>
1010
<xsd:documentation>
1111
<name>Identity Interface</name>
12-
<revision version="1.4.0">
13-
<date>2020-MAY-20</date>
12+
<revision version="1.5.0">
13+
<date>2023-NOVEMBER-03</date>
1414
</revision>
1515
</xsd:documentation>
1616
</xsd:annotation>
@@ -44,21 +44,23 @@
4444
<xsd:pattern value="[0-9a-zA-Z]{1,32}"/>
4545
</xsd:restriction>
4646
</xsd:simpleType>
47+
48+
<xsd:simpleType name="LanguageCodeSimpleType">
49+
<!-- two small letters -->
50+
<xsd:restriction base="xsd:token">
51+
<xsd:minLength value="2"/>
52+
<xsd:maxLength value="2"/>
53+
<xsd:pattern value="[a-z]{2}"/>
54+
</xsd:restriction>
55+
</xsd:simpleType>
56+
4757

4858
<xsd:simpleType name="VersionSimpleType">
4959
<xsd:restriction base="xsd:token">
5060
<xsd:pattern value="[0-9].[0-9]"/>
5161
</xsd:restriction>
5262
</xsd:simpleType>
5363

54-
<xsd:simpleType name="LineNumberSimpleType">
55-
<xsd:restriction base="xsd:token">
56-
<xsd:minLength value="1"/>
57-
<xsd:maxLength value="2"/>
58-
<xsd:pattern value="[0-9]{1,2}"/>
59-
</xsd:restriction>
60-
</xsd:simpleType>
61-
6264
<xsd:simpleType name="AgeSimpleType">
6365
<xsd:restriction base="xsd:token">
6466
<xsd:minLength value="1"/>
@@ -105,7 +107,7 @@
105107
<xsd:simpleType name="MessageCountSimpleType">
106108
<xsd:restriction base="xsd:nonNegativeInteger">
107109
<xsd:minInclusive value="0"/>
108-
<xsd:maxInclusive value="1000"/>
110+
<xsd:maxInclusive value="3000"/>
109111
</xsd:restriction>
110112
</xsd:simpleType>
111113

@@ -169,7 +171,7 @@
169171
</xsd:simpleType>
170172
</xsd:union>
171173
</xsd:simpleType>
172-
174+
173175
<xsd:simpleType name="TokenLength70SimpleType">
174176
<xsd:restriction base="xsd:token">
175177
<xsd:maxLength value="70"/>
@@ -182,13 +184,6 @@
182184
</xsd:restriction>
183185
</xsd:simpleType>
184186

185-
186-
<xsd:simpleType name="DescriptionSimpleType">
187-
<xsd:restriction base="xsd:token">
188-
<xsd:pattern value="[-0-9a-zA-ZéèëïôóöüúÉÈËÏÔÓÖÜÚ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{0,128}"/>
189-
</xsd:restriction>
190-
</xsd:simpleType>
191-
192187
<xsd:simpleType name="TokenLength256SimpleType">
193188
<xsd:restriction base="xsd:token">
194189
<xsd:maxLength value="256"/>
@@ -337,7 +332,7 @@
337332
<xsd:enumeration value="GENERATED"/>
338333
<xsd:enumeration value="CANCELED"/>
339334
<xsd:enumeration value="FAILED"/>
340-
<!-- $$$ what are the other options -->
335+
<!-- $$$ other options -->
341336
</xsd:restriction>
342337
</xsd:simpleType>
343338

@@ -346,7 +341,7 @@
346341
<xsd:complexType name="IdentityTransactionRequestType">
347342
<xsd:sequence>
348343
<xsd:element name="RequestCategory" type="RequestCategoryComplexType"/>
349-
<xsd:element name="Description" type="DescriptionSimpleType"/>
344+
<xsd:element name="Description" type="TokenLength128SimpleType"/>
350345
<xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
351346
<xsd:element name="SkinID" type="RelaxedIdentifierSimpleType" minOccurs="0"/>
352347
<xsd:element name="DueDateTime" type="DateTimeSimpleType" minOccurs="0"/>
@@ -375,7 +370,6 @@
375370
</xsd:complexType>
376371

377372

378-
379373
<xsd:complexType name="IdentityTransactionResponseType">
380374
<xsd:sequence>
381375
<xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
@@ -496,9 +490,7 @@
496490
</xsd:complexType>
497491
</xsd:element>
498492
<xsd:element name="DocumentSignatureRequest" type="DocumentSignatureRequestComplexType" minOccurs="0"/>
499-
<!-- $$$ -->
500-
<!-- $$$ -->
501-
<!-- $$$ -->
493+
502494
<!-- $$$ -->
503495
</xsd:sequence>
504496
</xsd:complexType>
@@ -531,7 +523,7 @@
531523

532524
<xsd:complexType name="TelephoneResponseComplexType" mixed="true">
533525
<xsd:simpleContent>
534-
<xsd:extension base="PhoneNumberSimpleType">
526+
<xsd:extension base="TokenLength70SimpleType">
535527
<xsd:attributeGroup ref="ResponseCategoryAttributeGroup"/>
536528
<xsd:attribute name="type" type="TelephoneTypeSimpleType"/>
537529
</xsd:extension>
@@ -748,14 +740,7 @@
748740
</xsd:restriction>
749741
</xsd:simpleType>
750742
</xsd:attribute>
751-
<xsd:attribute name="language" default = "nl">
752-
<xsd:simpleType>
753-
<xsd:restriction base="xsd:token">
754-
<xsd:enumeration value="en"/>
755-
<xsd:enumeration value="nl"/>
756-
</xsd:restriction>
757-
</xsd:simpleType>
758-
</xsd:attribute>
743+
<xsd:attribute name="language" type="LanguageCodeSimpleType" default="nl"/>
759744
</xsd:attributeGroup>
760745

761746
<xsd:attributeGroup name="RequestCategoryAttributeGroup">

‎validation/EMandate.xsd‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.4.0">
2+
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.5.0">
33
<!--=====================================================================-->
44
<!-- Schema Management -->
55
<!--=====================================================================-->
@@ -9,8 +9,8 @@
99
<xsd:documentation xml:lang="en"/>
1010
<xsd:documentation>
1111
<name>EMandate Interface</name>
12-
<revision version="1.4.0">
13-
<date>2020-MAY-20</date>
12+
<revision version="1.5.0">
13+
<date>2022-DECEMBER-12</date>
1414
</revision>
1515
</xsd:documentation>
1616
</xsd:annotation>
@@ -48,6 +48,16 @@
4848
<xsd:pattern value="[0-9a-zA-Z_\-]{1,32}"/>
4949
</xsd:restriction>
5050
</xsd:simpleType>
51+
52+
<xsd:simpleType name="LanguageCodeSimpleType">
53+
<!-- two small letters -->
54+
<xsd:restriction base="xsd:token">
55+
<xsd:minLength value="2"/>
56+
<xsd:maxLength value="2"/>
57+
<xsd:pattern value="[a-z]{2}"/>
58+
</xsd:restriction>
59+
</xsd:simpleType>
60+
5161

5262
<xsd:simpleType name="VersionSimpleType">
5363
<xsd:restriction base="xsd:token">
@@ -86,7 +96,7 @@
8696
<xsd:simpleType name="MessageCountSimpleType">
8797
<xsd:restriction base="xsd:nonNegativeInteger">
8898
<xsd:minInclusive value="0"/>
89-
<xsd:maxInclusive value="1000"/>
99+
<xsd:maxInclusive value="3000"/>
90100
</xsd:restriction>
91101
</xsd:simpleType>
92102
<xsd:simpleType name="StatusCodeSimpleType">
@@ -161,9 +171,6 @@
161171
</xsd:restriction>
162172
</xsd:simpleType>
163173

164-
165-
166-
167174
<xsd:simpleType name="SkinIDSimpleType">
168175
<xsd:restriction base="xsd:token">
169176
<xsd:pattern value="[0-9a-zA-Z_\-]{0,32}"/>
@@ -184,8 +191,9 @@
184191

185192
<xsd:simpleType name="ReasonSimpleType">
186193
<xsd:restriction base="xsd:token">
187-
<xsd:pattern value="[-0-9a-zA-ZéèëïôóöüúÉÈËÏÔÓÖÜÚ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{1,70}"/>
188-
</xsd:restriction>
194+
<xsd:pattern value="[-0-9a-zA-ZàáâäæãåāçćčèéêëēėęîïíīįìłñńôöòóœøōõßśšûüùúūÿžźżÀÁÂÄÆÃÅĀÇĆČÈÉÊËĒĖĘÎÏÍĪĮÌŁÑŃÔÖÒÓŒØŌÕŚŠÛÜÙÚŪŸŽŹŻ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{1,70}"/>
195+
196+
</xsd:restriction>
189197
</xsd:simpleType>
190198

191199
<xsd:simpleType name="DebtorReferenceSimpleType">
@@ -561,17 +569,9 @@
561569
</xsd:simpleType>
562570
</xsd:attribute>
563571

564-
<xsd:attribute name="language" default = "nl">
565-
<xsd:simpleType>
566-
<xsd:restriction base="xsd:token">
567-
<xsd:enumeration value="en"/>
568-
<xsd:enumeration value="nl"/>
569-
</xsd:restriction>
570-
</xsd:simpleType>
571-
</xsd:attribute>
572+
<xsd:attribute name="language" type="LanguageCodeSimpleType" default="nl"/>
573+
572574
</xsd:attributeGroup>
573-
<!-- ATTRIBUTES -->
574-
<!-- GROUPS -->
575-
<!-- ELEMENTS -->
575+
576576
<xsd:element name="EMandateInterface" type="EMandateInterfaceType"/>
577577
</xsd:schema>

0 commit comments

Comments
 (0)