Let Statement renders string with a comma at the end.

Author: c9s

CHANGELOG.md

@@ -4,10 +4,21 @@ CHANGELOG
 Version 2.0.x
 -----------------
 
-MethodCall
+MethodCallExpr
 
-- Changed `MethodCall` default object name from `this` to `$this`. be sure to create MethodClass with '$this'
+- `MethodCall` is now removed.
+- Changed `MethodCallExpr` default object name from `this` to `$this`. be sure to create MethodClass with '$this'
 - Improve argument exporting.
+- Renamed `MethodCallExpr` to `MethodCallExpr`
+
+Statement
+
+- `Statement` class now render the content with a comma at the end.
+
+Line
+
+- `Line` class was added to provide indentation operation.
+
 
 Version 1.4.5
 -----------------

src/ClassTemplate/MethodCallExpr.php

@@ -5,7 +5,7 @@
 use ClassTemplate\Raw;
 use LogicException;
 
-class MethodCall extends Statement implements Renderable
+class MethodCallExpr implements Renderable
 {
     public $objectName;
 

src/ClassTemplate/NewObjectExpr.php

@@ -5,7 +5,7 @@
 use ClassTemplate\Raw;
 use LogicException;
 
-class NewObjectExpr extends Statement implements Renderable
+class NewObjectExpr implements Renderable
 {
     public $className;
 

src/ClassTemplate/Statement.php

@@ -2,7 +2,17 @@
 namespace ClassTemplate;
 use ClassTemplate\Renderable;
 
-abstract class Statement extends Line {
+class Statement extends Line 
+{
+    public $expr;
+
+    public function __construct(Renderable $expr) {
+        $this->expr = $expr;
+    }
+
+    public function render() {
+        return $this->expr->render() . ';';
+    }
 
 }
 

tests/ClassTemplate/MethodCallTest.php tests/ClassTemplate/MethodCallExprTest.php

@@ -1,19 +1,19 @@
 <?php
 use ClassTemplate\Raw;
 
-class MethodCallTest extends PHPUnit_Framework_TestCase
+class MethodCallExprTest extends PHPUnit_Framework_TestCase
 {
-    function test()
+    public function test()
     {
-        $call = new ClassTemplate\MethodCall;
+        $call = new ClassTemplate\MethodCallExpr;
         $call->method('doSomething');
         $call->addArgument(123);
         $call->addArgument('foo');
         $call->addArgument(new Raw('new SplObjectStorage'));
         $call->addArgument(array( 'name' => 'hack' ));
         $str = $call->render();
         ok($str);
-        is("\$this->doSomething(123, 'foo', new SplObjectStorage, array (\n  'name' => 'hack',\n));",$str);
+        is("\$this->doSomething(123, 'foo', new SplObjectStorage, array (\n  'name' => 'hack',\n))",$str);
     }
 }