Skip to content

Commit

Permalink
Merge pull request #58 from bluem-development/update-validation
Browse files Browse the repository at this point in the history
Updated XSD validation files
  • Loading branch information
daanrijpkemacb authored Jun 12, 2024
2 parents a541d1f + 54c718d commit 324b99a
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 166 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ jobs:
with:
version: 9.5
php_version: 8.1
bootstrap: vendor/autoload.php
bootstrap: ./vendor/autoload.php
configuration: ./.github/workflows/phpunit.xml
7 changes: 6 additions & 1 deletion .github/workflows/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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"
>
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">../../tests</directory>
Expand Down
55 changes: 20 additions & 35 deletions validation/EIdentity.xsd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.4.0">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.5.0">
<!--=====================================================================-->
<!-- Schema Management -->
<!--=====================================================================-->
Expand All @@ -9,8 +9,8 @@
<xsd:documentation xml:lang="en"/>
<xsd:documentation>
<name>Identity Interface</name>
<revision version="1.4.0">
<date>2020-MAY-20</date>
<revision version="1.5.0">
<date>2023-NOVEMBER-03</date>
</revision>
</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -44,21 +44,23 @@
<xsd:pattern value="[0-9a-zA-Z]{1,32}"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="LanguageCodeSimpleType">
<!-- two small letters -->
<xsd:restriction base="xsd:token">
<xsd:minLength value="2"/>
<xsd:maxLength value="2"/>
<xsd:pattern value="[a-z]{2}"/>
</xsd:restriction>
</xsd:simpleType>


<xsd:simpleType name="VersionSimpleType">
<xsd:restriction base="xsd:token">
<xsd:pattern value="[0-9].[0-9]"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="LineNumberSimpleType">
<xsd:restriction base="xsd:token">
<xsd:minLength value="1"/>
<xsd:maxLength value="2"/>
<xsd:pattern value="[0-9]{1,2}"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="AgeSimpleType">
<xsd:restriction base="xsd:token">
<xsd:minLength value="1"/>
Expand Down Expand Up @@ -105,7 +107,7 @@
<xsd:simpleType name="MessageCountSimpleType">
<xsd:restriction base="xsd:nonNegativeInteger">
<xsd:minInclusive value="0"/>
<xsd:maxInclusive value="1000"/>
<xsd:maxInclusive value="3000"/>
</xsd:restriction>
</xsd:simpleType>

Expand Down Expand Up @@ -169,7 +171,7 @@
</xsd:simpleType>
</xsd:union>
</xsd:simpleType>

<xsd:simpleType name="TokenLength70SimpleType">
<xsd:restriction base="xsd:token">
<xsd:maxLength value="70"/>
Expand All @@ -182,13 +184,6 @@
</xsd:restriction>
</xsd:simpleType>


<xsd:simpleType name="DescriptionSimpleType">
<xsd:restriction base="xsd:token">
<xsd:pattern value="[-0-9a-zA-ZéèëïôóöüúÉÈËÏÔÓÖÜÚ€ ()+,.@&amp;=%&quot;&apos;/:;?$]{0,128}"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="TokenLength256SimpleType">
<xsd:restriction base="xsd:token">
<xsd:maxLength value="256"/>
Expand Down Expand Up @@ -337,7 +332,7 @@
<xsd:enumeration value="GENERATED"/>
<xsd:enumeration value="CANCELED"/>
<xsd:enumeration value="FAILED"/>
<!-- $$$ what are the other options -->
<!-- $$$ other options -->
</xsd:restriction>
</xsd:simpleType>

Expand All @@ -346,7 +341,7 @@
<xsd:complexType name="IdentityTransactionRequestType">
<xsd:sequence>
<xsd:element name="RequestCategory" type="RequestCategoryComplexType"/>
<xsd:element name="Description" type="DescriptionSimpleType"/>
<xsd:element name="Description" type="TokenLength128SimpleType"/>
<xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
<xsd:element name="SkinID" type="RelaxedIdentifierSimpleType" minOccurs="0"/>
<xsd:element name="DueDateTime" type="DateTimeSimpleType" minOccurs="0"/>
Expand Down Expand Up @@ -375,7 +370,6 @@
</xsd:complexType>



<xsd:complexType name="IdentityTransactionResponseType">
<xsd:sequence>
<xsd:element name="DebtorReference" type="DebtorReferenceSimpleType" minOccurs="0"/>
Expand Down Expand Up @@ -496,9 +490,7 @@
</xsd:complexType>
</xsd:element>
<xsd:element name="DocumentSignatureRequest" type="DocumentSignatureRequestComplexType" minOccurs="0"/>
<!-- $$$ -->
<!-- $$$ -->
<!-- $$$ -->

<!-- $$$ -->
</xsd:sequence>
</xsd:complexType>
Expand Down Expand Up @@ -531,7 +523,7 @@

<xsd:complexType name="TelephoneResponseComplexType" mixed="true">
<xsd:simpleContent>
<xsd:extension base="PhoneNumberSimpleType">
<xsd:extension base="TokenLength70SimpleType">
<xsd:attributeGroup ref="ResponseCategoryAttributeGroup"/>
<xsd:attribute name="type" type="TelephoneTypeSimpleType"/>
</xsd:extension>
Expand Down Expand Up @@ -748,14 +740,7 @@
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="language" default = "nl">
<xsd:simpleType>
<xsd:restriction base="xsd:token">
<xsd:enumeration value="en"/>
<xsd:enumeration value="nl"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="language" type="LanguageCodeSimpleType" default="nl"/>
</xsd:attributeGroup>

<xsd:attributeGroup name="RequestCategoryAttributeGroup">
Expand Down
40 changes: 20 additions & 20 deletions validation/EMandate.xsd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.4.0">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.5.0">
<!--=====================================================================-->
<!-- Schema Management -->
<!--=====================================================================-->
Expand All @@ -9,8 +9,8 @@
<xsd:documentation xml:lang="en"/>
<xsd:documentation>
<name>EMandate Interface</name>
<revision version="1.4.0">
<date>2020-MAY-20</date>
<revision version="1.5.0">
<date>2022-DECEMBER-12</date>
</revision>
</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -48,6 +48,16 @@
<xsd:pattern value="[0-9a-zA-Z_\-]{1,32}"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="LanguageCodeSimpleType">
<!-- two small letters -->
<xsd:restriction base="xsd:token">
<xsd:minLength value="2"/>
<xsd:maxLength value="2"/>
<xsd:pattern value="[a-z]{2}"/>
</xsd:restriction>
</xsd:simpleType>


<xsd:simpleType name="VersionSimpleType">
<xsd:restriction base="xsd:token">
Expand Down Expand Up @@ -86,7 +96,7 @@
<xsd:simpleType name="MessageCountSimpleType">
<xsd:restriction base="xsd:nonNegativeInteger">
<xsd:minInclusive value="0"/>
<xsd:maxInclusive value="1000"/>
<xsd:maxInclusive value="3000"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="StatusCodeSimpleType">
Expand Down Expand Up @@ -161,9 +171,6 @@
</xsd:restriction>
</xsd:simpleType>




<xsd:simpleType name="SkinIDSimpleType">
<xsd:restriction base="xsd:token">
<xsd:pattern value="[0-9a-zA-Z_\-]{0,32}"/>
Expand All @@ -184,8 +191,9 @@

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

</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="DebtorReferenceSimpleType">
Expand Down Expand Up @@ -561,17 +569,9 @@
</xsd:simpleType>
</xsd:attribute>

<xsd:attribute name="language" default = "nl">
<xsd:simpleType>
<xsd:restriction base="xsd:token">
<xsd:enumeration value="en"/>
<xsd:enumeration value="nl"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="language" type="LanguageCodeSimpleType" default="nl"/>

</xsd:attributeGroup>
<!-- ATTRIBUTES -->
<!-- GROUPS -->
<!-- ELEMENTS -->

<xsd:element name="EMandateInterface" type="EMandateInterfaceType"/>
</xsd:schema>
Loading

0 comments on commit 324b99a

Please sign in to comment.