PhpGenerator\Helpers: added format() & formatArgs()

Author: dg

src/PhpGenerator/Helpers.php

@@ -36,17 +36,6 @@ public static function dump($var)
 
 
 
-	/**
-	 * Returns a PHP representation of a object member.
-	 * @return string
-	 */
-	public static function dumpMember($var)
-	{
-		return preg_match('#^' . self::PHP_IDENT . '$#', $var) ? $var : '{' . self::_dump($var) . '}';
-	}
-
-
-
 	private static function _dump(&$var, $level = 0)
 	{
 		if ($var instanceof PhpLiteral) {
@@ -138,26 +127,57 @@ private static function _dump(&$var, $level = 0)
 
 
 
-	/** @return string */
-	public static function generate($statement)
+	/**
+	 * Generates PHP statement.
+	 * @return string
+	 */
+	public static function format($statement)
 	{
 		$args = func_get_args();
-		unset($args[0]);
-		foreach ($args as $key => $arg) {
-			$args[$key] = self::_dump($arg);
-		}
-		if (strpos($statement, '?') === FALSE) {
-			return $statement .= '(' . implode(', ', $args) . ');';
-		}
+		return self::formatArgs(array_shift($args), $args);
+	}
+
 
+
+	/**
+	 * Generates PHP statement.
+	 * @return string
+	 */
+	public static function formatArgs($statement, array $args)
+	{
 		$a = strpos($statement, '?');
-		$i = 1;
 		while ($a !== FALSE) {
-			$statement = substr_replace($statement, $args[$i], $a, 1);
-			$a = strpos($statement, '?', $a + strlen($args[$i]));
-			$i++;
+			if (!$args) {
+				throw new Nette\InvalidArgumentException('Insufficient number of arguments.');
+			}
+			$arg = array_shift($args);
+			if (substr($statement, $a + 1, 1) === '*') { // ?*
+				if (!is_array($arg)) {
+					throw new Nette\InvalidArgumentException('Argument must be an array.');
+				}
+				$arg = implode(', ', array_map(array(__CLASS__, 'dump'), $arg));
+				$statement = substr_replace($statement, $arg, $a, 2);
+
+			} else {
+				$arg = substr($statement, $a - 1, 1) === '$' || substr($statement, $a - 2, 2) === '->' ? self::formatMember($arg) : self::_dump($arg);
+				$statement = substr_replace($statement, $arg, $a, 1);
+			}
+			$a = strpos($statement, '?', $a + strlen($arg));
 		}
-		return $statement . ';';
+		return $statement;
+	}
+
+
+
+	/**
+	 * Returns a PHP representation of a object member.
+	 * @return string
+	 */
+	public static function formatMember($name)
+	{
+		return $name instanceof PhpLiteral || !preg_match('#^' . self::PHP_IDENT . '$#', $name)
+			? '{' . self::_dump($name) . '}'
+			: $name ;
 	}
 
 }

tests/PhpGenerator/PhpGenerator.dump.phpt

@@ -45,6 +45,3 @@ Assert::same( "array(\n\t'a' => 1,\n\tarray(\n\t\t\"\\r\" => \"\\r\",\n\t\t2,\n\
 Assert::same( "(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) array('a' => 1, 'b' => 2)) );
 Assert::same( "(object) array(\n\t'a' => (object) array(\n\t\t'b' => 2,\n\t),\n)" , Helpers::dump((object) array('a' => (object) array('b' => 2))) );
 Assert::same( "Test::__set_state(array(\n\t'a' => 1,\n\t'b' => 2,\n\t'c' => 3,\n))", Helpers::dump(new Test) );
-
-Assert::same( "Item", Helpers::dumpMember('Item') );
-Assert::same( "{'0Item'}", Helpers::dumpMember('0Item') );

tests/PhpGenerator/PhpGenerator.format.phpt

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Test: Nette\Utils\PhpGenerator\Helpers::format() & formatArgs()
+ *
+ * @author     David Grudl
+ * @package    Nette\Utils
+ * @subpackage UnitTests
+ */
+
+use Nette\Utils\PhpGenerator\Helpers;
+
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+Assert::same( 'func', Helpers::format('func') );
+Assert::same( 'func(1)', Helpers::format('func(?)', 1, 2) );
+
+Assert::same( 'func', Helpers::formatArgs('func', array(1, 2)) );
+Assert::same( 'func(1)', Helpers::formatArgs('func(?)', array(1, 2)) );
+Assert::same( "func(array(\n\t1,\n\t2,\n))", Helpers::formatArgs('func(?)', array(array(1, 2))) );
+Assert::same( 'func(1, 2)', Helpers::formatArgs('func(?*)', array(array(1, 2))) );
+
+Assert::throws(function() {
+	Helpers::formatArgs('func(?*)', array(1, 2));
+}, 'Nette\InvalidArgumentException', 'Argument must be an array.');
+
+Assert::throws(function() {
+	Helpers::formatArgs('func(?, ?, ?)', array(1, 2));
+}, 'Nette\InvalidArgumentException', 'Insufficient number of arguments.');
+
+Assert::same( '$a = 2', Helpers::formatArgs('$? = ?', array('a', 2)) );
+Assert::same( '$obj->a = 2', Helpers::formatArgs('$obj->? = ?', array('a', 2)) );
+Assert::same( '$obj->{1} = 2', Helpers::formatArgs('$obj->? = ?', array(1, 2)) );
+Assert::same( '$obj->{\' \'} = 2', Helpers::formatArgs('$obj->? = ?', array(' ', 2)) );
+
+Assert::same( "Item", Helpers::formatMember('Item') );
+Assert::same( "{'0Item'}", Helpers::formatMember('0Item') );