Merge branch 'hotfix/0.0.11'

Author: mikaelcom

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+0.0.11
+-----
+Issue : allow backslash within class name for namespace
+
 0.0.10
 -----
 allow to provide annotation max length to use

Element/AbstractElement.php

@@ -46,20 +46,26 @@ public function getName()
     }
     /**
      * @param string $name
+     * @param bool $allowBackslash
      * @return bool
      */
-    public static function nameIsValid($name)
+    public static function nameIsValid($name, $allowBackslash = false)
     {
-        return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/D', $name) === 1;
+        $pattern = '/^[a-zA-Z_][a-zA-Z0-9_]*$/D';
+        if ($allowBackslash === true) {
+            $pattern = '/^[a-zA-Z_\\\][a-zA-Z0-9_\\\]*$/D';
+        }
+        return preg_match($pattern, $name) === 1;
     }
     /**
      * @param mixed $string
      * @param bool $checkName
+     * @param bool $allowBackslash
      * @return bool
      */
-    public static function stringIsValid($string, $checkName = true)
+    public static function stringIsValid($string, $checkName = true, $allowBackslash = false)
     {
-        return (is_string($string) && !empty($string) && (!$checkName || self::nameIsValid($string)));
+        return (is_string($string) && !empty($string) && (!$checkName || self::nameIsValid($string, $allowBackslash)));
     }
     /**
      * @param mixed $object

Element/PhpClass.php

@@ -91,7 +91,7 @@ public function setExtends($extends)
      */
     public static function extendsIsValid($extends)
     {
-        return $extends === null || self::stringIsValid($extends) || $extends instanceof PhpClass;
+        return $extends === null || self::stringIsValid($extends, true, true) || $extends instanceof PhpClass;
     }
     /**
      * @return string|PhpClass

Tests/Element/PhpClassTest.php

@@ -254,4 +254,11 @@ public function testSimpleClassPublicMethodToString()
 
         $this->assertSame("class Foo\n{\n    private function bar(\$bar, \$foo, \$sample)\n    {\n        \$foo = 1;\n    }\n}", $class->toString());
     }
+
+    public function testExtendsFromNamespace()
+    {
+        $class = new PhpClass('Foo', false, '\\DOMDocument');
+
+        $this->assertSame("class Foo extends \\DOMDocument\n{\n}", $class->toString());
+    }
 }