PhpGenerator: added Helpers::isIdentifier() and Method::setBody()

Author: dg

src/PhpGenerator/Helpers.php

@@ -175,13 +175,23 @@ public static function formatArgs($statement, array $args)
 	 */
 	public static function formatMember($name)
 	{
-		return $name instanceof PhpLiteral || !preg_match('#^' . self::PHP_IDENT . '$#', $name)
+		return $name instanceof PhpLiteral || !self::isIdentifier($name)
 			? '{' . self::_dump($name) . '}'
 			: $name ;
 	}
 
 
 
+	/**
+	 * @return bool
+	 */
+	public static function isIdentifier($value)
+	{
+		return is_string($value) && preg_match('#^' . self::PHP_IDENT . '$#', $value);
+	}
+
+
+
 	public static function createObject($class, array $props)
 	{
 		return unserialize('O' . substr(serialize((string) $class), 1, -1) . substr(serialize($props), 1));

src/PhpGenerator/Method.php

@@ -83,6 +83,15 @@ public function addUse($name)
 
 
 
+	/** @return Method */
+	public function setBody($statement, array $args = NULL)
+	{
+		$this->body = func_num_args() > 1 ? Helpers::formatArgs($statement, $args) : $statement;
+		return $this;
+	}
+
+
+
 	/** @return Method */
 	public function addBody($statement, array $args = NULL)
 	{

tests/PhpGenerator/PhpGenerator.class.phpt

@@ -46,7 +46,7 @@ $class->addMethod('getHandle')
 	->addDocument('Returns file handle.')
 	->addDocument('@return resource')
 	->setFinal(TRUE)
-	->setBody('return $this->handle;');
+	->setBody('return $this->?;', array('handle'));
 
 $class->addMethod('getSections')
 	->setStatic(TRUE)

tests/PhpGenerator/PhpGenerator.format.phpt

@@ -38,3 +38,6 @@ Assert::same( '$obj->{\' \'} = 2', Helpers::formatArgs('$obj->? = ?', array(' ',
 
 Assert::same( "Item", Helpers::formatMember('Item') );
 Assert::same( "{'0Item'}", Helpers::formatMember('0Item') );
+
+Assert::true( Helpers::isIdentifier('Item') );
+Assert::false( Helpers::isIdentifier('0Item') );