Try our preferred DTD first, fall back to DOCTYPE

If there it fails our validation and has no DOCTYPE or fails its
DOCTYPE's, then we fail.

Author: vphantom

Changes

@@ -1,11 +1,14 @@
 Revision history for Business-cXML
 
+v0.6.8  2022-07-14
+        Enhancement: validate from default DTD for documents missing "DOCTYPE"
+
 v0.6.7  2018-03-27
         Enhancement: built-in logging removes line-breaking whitespace from XML
 
 v0.6.6  2018-02-15
         New: debug and trace logging levels
-		  New: POSR extrinsic "UserId"
+        New: POSR extrinsic "UserId"
         Enhancement: trap fatal errors occuring during callbacks
         Bugfix: transmissions lost input payloadID since v0.6.5
 

README

@@ -1,6 +1,6 @@
-# Business-cXML v0.6.7
+# Business-cXML v0.6.8
 
-[![Build Status](https://travis-ci.org/vphantom/Business-cXML.svg?branch=v0.6.7)](https://travis-ci.org/vphantom/Business-cXML) [![Coverage Status](https://coveralls.io/repos/github/vphantom/Business-cXML/badge.svg?branch=v0.6.7)](https://coveralls.io/github/vphantom/Business-cXML?branch=v0.6.7)
+[![Build Status](https://travis-ci.org/vphantom/Business-cXML.svg?branch=v0.6.8)](https://travis-ci.org/vphantom/Business-cXML) [![Coverage Status](https://coveralls.io/repos/github/vphantom/Business-cXML/badge.svg?branch=v0.6.8)](https://coveralls.io/github/vphantom/Business-cXML?branch=v0.6.8)
 
 Perl implementation of cXML messaging.
 
@@ -21,7 +21,7 @@ To install this module, run the following commands:
 After installing, you can find documentation for this module with the
 perldoc command.
 
-    perldoc Business::cXML
+	perldoc Business::cXML
 
 If you find any bugs, please report them at:
 	https://github.com/vphantom/Business-cXML/issues

lib/Business/cXML.pm

@@ -108,7 +108,7 @@ use Scalar::Util 'blessed';
 use Business::cXML::Transmission;
 
 BEGIN {
-	our $VERSION = 'v0.6.7';
+	our $VERSION = 'v0.6.8';
 	our $CXML_VERSION = '1.2.036';
 	our $USERAGENT = "Business::cXML.pm $VERSION";
 }
@@ -575,7 +575,7 @@ sub stringify {
 
 =head1 VERSION
 
-0.6.7 based on cXML DTD 1.2.036
+0.6.8 based on cXML DTD 1.2.036
 
 =head1 AUTHOR
 

lib/Business/cXML/Transmission.pm

@@ -112,11 +112,17 @@ sub new {
 		};
 		return [ 400, $@ ] if $@;
 		eval {
-			$doc->validate();
-			$self->{xml_root} = ($doc = $doc->documentElement);
+			my $dtd = XML::LibXML::Dtd->new(undef, "http://xml.cxml.org/schemas/cXML/" . $Business::cXML::CXML_VERSION . "/cXML.dtd");
+			$doc->validate($dtd);
+		};
+		if ($@) {
+			eval {
+				$doc->validate();
+			};
+			return [ 406, $@ ] if $@;
 		};
-		return [ 406, $@ ] if $@;
 
+		$self->{xml_root} = ($doc = $doc->documentElement);
 		$doc->ferry($self, {
 			version          => '__UNIMPLEMENTED',
 			payloadID        => '_id',

t/xml-assets/punchoutsetup2-request.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE cXML SYSTEM "http://xml.cxml.org/schemas/cXML/1.2.036/cXML.dtd">
 <cXML timestamp="2018-01-01T00:00:00-0500" payloadID="123456789.2222.55123123@localhost" xml:lang="en-US">
 	<Header>
 		<From>