Drop support for XP < 9

See xp-framework/rfc#341

ChangeLog.md

@@ -3,6 +3,12 @@ XML APIs for the XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 11.0.0 / 2021-10-21
+
+* Made compatible with XP 11 - @thekid
+* Implemented xp-framework/rfc#341, dropping compatibility with XP 9
+  (@thekid)
+
 ## 10.0.0 / 2020-04-10
 
 * Implemented xp-framework/rfc#334: Drop PHP 5.6:

composer.json

@@ -6,12 +6,12 @@
   "description" : "XML APIs for the XP Framework",
   "keywords": ["module", "xp"],
   "require" : {
-    "xp-framework/core": "^10.0 | ^9.0 | ^8.0 | ^7.0",
-    "xp-framework/collections": "^9.0 | ^8.0 | ^7.0",
+    "xp-framework/core": "^11.0 | ^10.0",
+    "xp-framework/collections": "^10.0 | ^9.0 | ^8.0",
     "php" : ">=7.0.0"
   },
   "require-dev" : {
-    "xp-framework/unittest": "^11.0 | ^10.0 | ^9.0 | ^8.0 | ^7.0"
+    "xp-framework/unittest": "^11.0 | ^10.0"
   },
   "autoload" : {
     "files" : ["src/main/php/autoload.php"]

src/main/php/xml/Node.class.php

@@ -300,7 +300,7 @@ public function getSource($indent= INDENT_WRAPPED, $encoding= \xp::ENCODING, $in
       }
 
       // No content and no children => close tag
-      if (0 == strlen($content)) {
+      if (null === $content || 0 === strlen($content)) {
         if (!$this->children) return $xml."/>\n";
         $xml.= '>';
       } else {

src/main/php/xml/xslt/XSLDateCallback.class.php

@@ -2,6 +2,7 @@
 
 use lang\{Enum, XPClass};
 use util\{Date, DateMath, TimeInterval, TimeZone};
+use xml\Xslmethod;
 
 /**
  * XSL callbacks for Date operations
@@ -22,7 +23,7 @@ class XSLDateCallback {
    * @param   string timezone default NULL
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function format($date, $format, $timezone= null) {
     $timezone= empty($timezone) ? null : $timezone;
     return (new Date($date))->toString($format, new TimeZone($timezone));
@@ -36,7 +37,7 @@ public function format($date, $format, $timezone= null) {
    * @param   string strdate2
    * @return  int
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function diff($type, $strdate1, $strdate2) {
     return DateMath::diff(
       Enum::valueOf(XPClass::forName('util.TimeInterval'), strtoupper($type)),

src/main/php/xml/xslt/XSLStringCallback.class.php

@@ -1,5 +1,7 @@
 <?php namespace xml\xslt;
 
+use xml\Xslmethod;
+
 /**
  * XSL callbacks for string operations
  *
@@ -14,7 +16,7 @@ class XSLStringCallback {
    * @param   string string
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function urlencode($string) {
     return urlencode($string);
   }
@@ -25,7 +27,7 @@ public function urlencode($string) {
    * @param   string string
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function urldecode($string) {
     return urldecode($string);
   }
@@ -36,7 +38,7 @@ public function urldecode($string) {
    * @param   string string
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function strtolower($string) {
     return strtolower($string);
   }    
@@ -47,7 +49,7 @@ public function strtolower($string) {
    * @param   string string
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function strtoupper($string) {
     return strtoupper($string);
   }
@@ -60,7 +62,7 @@ public function strtoupper($string) {
    * @param   string replace
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function replace($str, $search, $replace) {
     return str_replace($search, $replace, $str);
   }
@@ -71,7 +73,7 @@ public function replace($str, $search, $replace) {
    * @param   string string
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function nl2br($string) {
     return nl2br($string);
   }
@@ -85,7 +87,7 @@ public function nl2br($string) {
    * @param   bool cut Do word wrapping within words (defaults to TRUE)
    * @return  string
    */
-  #[@xslmethod]
+  #[Xslmethod]
   public function wordwrap($string, $width, $break= "\n", $cut= true) {
     return wordwrap($string, $width, $break, $cut);
   }

src/test/php/xml/unittest/DomXslProcessorTest.class.php

@@ -4,7 +4,6 @@
 use lang\{ElementNotFoundException, IllegalArgumentException};
 use unittest\{Expect, Test, Xslmethod};
 use xml\{DomXSLProcessor, TransformerException};
-new import('lang.ResourceProvider');
 
 /**
  * ProcessorTest implementation that tests the DomXSL processor
@@ -257,14 +256,4 @@ public function processDocuments() {
     $this->processor->run();
     $this->assertEquals('document', $this->processor->output());
   }
-
-  #[Test]
-  public function loadXSLFromStreamWrapper() {
-    $this->processor->setXSLFile('res://xml/unittest/include.xsl');
-  }
-
-  #[Test, Expect(FileNotFoundException::class)]
-  public function loadNonexistantXSLFromStreamWrapper() {
-    $this->processor->setXSLFile('res://nonexistant.xsl');
-  }
 }

src/test/php/xml/unittest/XslCallbackTest.class.php

@@ -164,7 +164,7 @@ public function dateFormatCallbackWithTZ() {
     $this->assertEquals($date->toString('Y-m-d H:i:s T', $tz), $this->runTransformation(
       Node::fromObject($date, 'date')->getSource(),
       'xp.date::format',
-      ['string(/date/value)', "'Y-m-d H:i:s T'", "'".$tz->getName()."'"]
+      ['string(/date/value)', "'Y-m-d H:i:s T'", "'".$tz->name()."'"]
     ));
   }