make syntactically valid

diff --git a/php_http_request_method.c b/php_http_request_method.c
index 654ae8c0b13a31c2586f3acefc10007817d73464..118721f550ce5e55858f07aefa4817c4c5a157e0 100644 (file)
--- a/php_http_request_method.c
+++ b/php_http_request_method.c
@@ -32,7 +32,7 @@ static PHP_HTTP_STRLIST(php_http_request_methods) =
        PHP_HTTP_STRLIST_ITEM("LOCK")
        PHP_HTTP_STRLIST_ITEM("UNLOCK")
        /* WebDAV Versioning - RFC 3253 */
-       PHP_HTTP_STRLIST_ITEM("VERSION-CONTROL")
+       PHP_HTTP_STRLIST_ITEM("VERSION_CONTROL")
        PHP_HTTP_STRLIST_ITEM("REPORT")
        PHP_HTTP_STRLIST_ITEM("CHECKOUT")
        PHP_HTTP_STRLIST_ITEM("CHECKIN")
@@ -41,7 +41,7 @@ static PHP_HTTP_STRLIST(php_http_request_methods) =
        PHP_HTTP_STRLIST_ITEM("UPDATE")
        PHP_HTTP_STRLIST_ITEM("LABEL")
        PHP_HTTP_STRLIST_ITEM("MERGE")
-       PHP_HTTP_STRLIST_ITEM("BASELINE-CONTROL")
+       PHP_HTTP_STRLIST_ITEM("BASELINE_CONTROL")
        PHP_HTTP_STRLIST_ITEM("MKACTIVITY")
        /* WebDAV Access Control - RFC 3744 */
        PHP_HTTP_STRLIST_ITEM("ACL")

diff --git a/reflection2php.php b/reflection2php.php
index 7768eeb9a65a027979a497bf152408beae469f2d..c55eb65290bb0c2a19656ca967ff9abf8ba7d31b 100755 (executable)
--- a/reflection2php.php
+++ b/reflection2php.php
@@ -9,7 +9,7 @@ function m($m) {
        return $n;
 }
 function t($p) {
-       if ($c = $p->getClass()) return $c->getName() . " ";
+       if ($c = $p->getClass()) return "\\" . $c->getName() . " ";
        if ($p->isArray()) return "array ";
 }
 function c($n, $c) {
@@ -59,12 +59,15 @@ printf("\n");
 
 foreach ($ext->getClasses() as $class) {
 
-       printf("%s%s %s ", m($class->getModifiers()), $class->isInterface() ? "interface":"class" ,$class->getName());
+    if ($class->inNamespace()) {
+        printf("namespace %s {\n", $class->getNamespaceName());
+    }
+       printf("%s%s %s ", m($class->getModifiers()), $class->isInterface() ? "interface":"class" ,$class->getShortName());
        if ($p = $class->getParentClass()) {
-               printf("extends %s ", $p->getName());
+               printf("extends \\%s ", $p->getName());
        }
        if ($i = $class->getInterfaceNames()) {
-               printf("implements %s ", implode(", ", array_filter($i,function($v){return$v!="Traversable";})));
+               printf("implements \\%s ", implode(", \\", array_filter($i,function($v){return$v!="Traversable";})));
        }
        printf("\n{\n");
 
@@ -102,6 +105,10 @@ foreach ($ext->getClasses() as $class) {
                }
        }
 
-       printf("}\n\n");
+    printf("}\n");
+    if ($class->inNamespace()) {
+        printf("}\n");
+    }
+    printf("\n");
 }