Make compatible with PHP 7.0 - 7.3

xp-framework · Mar 29, 2024 · 6c781c4 · 6c781c4
1 parent 49ac1ea
commit 6c781c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
   "require" : {
     "xp-framework/core": "^12.0 | ^11.0 | ^10.0",
     "xp-framework/collections": "^10.0 | ^9.0 | ^8.0",
-    "xp-framework/reflection": "^3.1",
+    "xp-framework/reflection": "^3.0 | ^2.0",
     "php" : ">=7.0.0"
   },
   "require-dev" : {

diff --git a/src/main/php/xml/meta/Marshaller.class.php b/src/main/php/xml/meta/Marshaller.class.php
@@ -34,7 +34,7 @@ protected static function recurse($instance, $type, $node, $inject) {
       if (($factory= $type->annotation(Xmlfactory::class)) && ($element= $factory->argument('element'))) {
         $node->setName($element);
       } else {
-        $node->setName(strtolower($type->declaredName()));
+        $node->setName(strtolower($type->class()->getSimpleName()));
       }
     }
 
@@ -140,9 +140,9 @@ public static function marshal($instance, $qname= null) {
       $tree->root()->setName($prefix.':'.$qname->localpart);
       $tree->root()->setAttribute('xmlns:'.$prefix, $qname->namespace);
     } else if ($type->annotation(Xmlns::class)) {
-      $tree->root()->setName($type->declaredName());
+      $tree->root()->setName($type->class()->getSimpleName());
     } else {
-      $tree->root()->setName(strtolower($type->declaredName()));
+      $tree->root()->setName(strtolower($type->class()->getSimpleName()));
     }
 
     self::recurse($instance, $type, $tree->root(), []);