Structure changes

- Rename ClassTemplate\ClassDeclare to ClassTemplate\ClassFile
- Rename CodeGen\ClassDeclare to CodeGen\UserClass (which corresponds to UserFunction)
- Move file related methods from UserClass to ClassFile
- Move other components into CodeGen namespace
- Update composer.json for CodeGen namespace

Author: c9s

README.md

@@ -7,7 +7,7 @@ SYNOPSIS
 -------------
 
 ```php
-$class1 = new ClassTemplate\ClassDeclare('Foo\\Bar22',array(
+$class1 = new ClassTemplate\ClassFile('Foo\\Bar22',array(
     'template' => 'Class.php.twig',
     'template_dirs' => array('src/ClassTemplate/Templates'),
 ));

composer.json

@@ -4,7 +4,7 @@
     "description": "Class template Utilities",
     "version": "2.0.0",
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "twig/twig": "*"
     },
     "require-dev": {
@@ -20,7 +20,8 @@
     ],
     "autoload": {
         "psr-4": {
-            "ClassTemplate\\": "src/ClassTemplate/"
+            "ClassTemplate\\": "src/ClassTemplate/",
+            "CodeGen\\": "src/CodeGen/"
         }
     }
-}
+}

phpunit.xml

@@ -13,7 +13,10 @@
   </php>
   <testsuites>
     <testsuite name="ClassTemplate">
-      <directory suffix="Test.php">tests</directory>
+        <directory suffix="Test.php">tests/ClassTemplate</directory>
+    </testsuite>
+    <testsuite name="CodeGen">
+        <directory suffix="Test.php">tests/CodeGen</directory>
     </testsuite>
   </testsuites>
 </phpunit>

src/ClassTemplate/ClassFile.php

@@ -0,0 +1,97 @@
+<?php
+namespace ClassTemplate;
+use Exception;
+use ReflectionClass;
+use ReflectionObject;
+use CodeGen\UserClass;
+use CodeGen\Renderable;
+
+class ClassFile extends UserClass
+{
+    public $class;
+
+    public $extends;
+
+    public $interfaces = array();
+
+    public $uses = array();
+
+    public $methods = array();
+
+    public $consts  = array();
+
+    public $properties = array();
+
+    public $staticVars = array();
+
+    /**
+     * Registered trait
+     */
+    public $traits = array();
+
+    public $templateFile;
+    public $templateDirs;
+    public $options = array();
+    public $msgIds = array();
+
+
+    public $usedClasses = array();
+
+    /**
+     * constructor create a new class template object
+     *
+     * @param string $className
+     * @param array $options 
+     *
+     * a sample options:
+     * 
+     * $t = new ClassTemplate('NewClassFoo',[
+     *   'template_dirs' => [ path1, path2 ],
+     *   'template' => 'Class.php.twig',
+     *   'template_args' => [ ... predefined template arguments ],
+     *   'twig' => [ 'cache' => false, ... ]
+     * ])
+     *
+     */
+    public function __construct($className, array $options = array())
+    {
+        parent::__construct($className);
+        $this->setOptions($options);
+    }
+
+    public function setOptions(array $options)
+    {
+        $this->options = $options;
+    }
+
+    public function setOption($key, $val) {
+        $this->options[$key] = $val;
+    }
+
+    public function render(array $args = array())
+    {
+        return "<?php\n" . parent::render($args);
+    }
+
+    public function writeTo($file)
+    {
+        return file_put_contents($file, $this->render());
+    }
+
+    public function load() {
+        $tmpname = tempnam('/tmp', str_replace('\\','_',$this->class->getFullName()) );
+        file_put_contents($tmpname, $this->render() );
+        return require $tmpname;
+    }
+
+    public function addMsgId($msgId)
+    {
+        $this->msgIds[] = $msgId;
+    }
+
+    public function setMsgIds($msgIds)
+    {
+        $this->msgIds = $msgIds;
+    }
+}
+

src/ClassTemplate/MethodCall.php

@@ -4,10 +4,10 @@
 use ReflectionClass;
 use ReflectionObject;
 use ClassTemplate\ClassTrait;
-use ClassTemplate\Renderable;
-use ClassTemplate\ClassDeclare;
+use CodeGen\Renderable;
+use ClassTemplate\ClassFile;
 
-class TemplateClassDeclare extends ClassDeclare implements Renderable
+class TemplateClassFile extends ClassFile implements Renderable
 {
     /**
      * @var TemplateView object.

src/ClassTemplate/TemplateClassDeclare.php src/ClassTemplate/TemplateClassFile.php

@@ -1,7 +1,7 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Comment;
-use ClassTemplate\CommentBlock;
+namespace CodeGen;
+use CodeGen\Comment;
+use CodeGen\CommentBlock;
 
 trait Annotator {  
     public $comment;

src/ClassTemplate/Annotator.php src/CodeGen/Annotator.php

@@ -1,6 +1,7 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Renderable;
+namespace CodeGen;
+use CodeGen\Renderable;
+use CodeGen\VariableDeflator;
 
 class Argument implements Renderable
 {
@@ -16,7 +17,7 @@ public function __construct($name, $default = NULL) {
     public function render(array $args = array()) {
         $code = $this->name;
         if ($this->default) {
-            $code .= var_export($this->default, true);
+            $code .= ' = ' .  VariableDeflator::deflate($this->default);
         }
         return $code;
     }

src/ClassTemplate/Argument.php src/CodeGen/Argument.php

@@ -1,9 +1,9 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Utils;
-use ClassTemplate\Renderable;
-use ClassTemplate\Indenter;
-use ClassTemplate\Exception\InvalidArgumentTypeException;
+namespace CodeGen;
+use CodeGen\Utils;
+use CodeGen\Renderable;
+use CodeGen\Indenter;
+use CodeGen\Exception\InvalidArgumentTypeException;
 use ArrayAccess;
 use IteratorAggregate;
 use ArrayIterator;

src/ClassTemplate/Block.php src/CodeGen/Block.php

@@ -1,7 +1,7 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Block;
-use ClassTemplate\Indenter;
+namespace CodeGen;
+use CodeGen\Block;
+use CodeGen\Indenter;
 
 /**
  * A BracketedBlock is a block that uses bracket to wrap the inner block.

src/ClassTemplate/BracketedBlock.php src/CodeGen/BracketedBlock.php

@@ -1,8 +1,8 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Utils;
-use ClassTemplate\Renderable;
-use ClassTemplate\Indenter;
+namespace CodeGen;
+use CodeGen\Utils;
+use CodeGen\Renderable;
+use CodeGen\Indenter;
 
 class ClassConst extends Statement implements Renderable
 {

src/ClassTemplate/ClassConst.php src/CodeGen/ClassConst.php

@@ -1,8 +1,8 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Utils;
-use ClassTemplate\Renderable;
-use ClassTemplate\Indenter;
+namespace CodeGen;
+use CodeGen\Utils;
+use CodeGen\Renderable;
+use CodeGen\Indenter;
 
 class ClassMethod extends UserFunction implements Renderable
 {

src/ClassTemplate/ClassMethod.php src/CodeGen/ClassMethod.php

@@ -1,6 +1,6 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Renderable;
+namespace CodeGen;
+use CodeGen\Renderable;
 
 class ClassName implements Renderable
 {

src/ClassTemplate/ClassName.php src/CodeGen/ClassName.php

@@ -1,6 +1,6 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Renderable;
+namespace CodeGen;
+use CodeGen\Renderable;
 
 class ClassProperty extends Statement implements Renderable
 {

src/ClassTemplate/ClassProperty.php src/CodeGen/ClassProperty.php

@@ -1,6 +1,6 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Renderable;
+namespace CodeGen;
+use CodeGen\Renderable;
 
 class ClassStaticVariable extends ClassProperty implements Renderable
 {

src/ClassTemplate/ClassStaticVariable.php src/CodeGen/ClassStaticVariable.php

@@ -1,7 +1,7 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Renderable;
-use ClassTemplate\Statement;
+namespace CodeGen;
+use CodeGen\Renderable;
+use CodeGen\Statement;
 
 /**
  * use HelloWorld { sayHello as private myPrivateHello; }

src/ClassTemplate/ClassTrait.php src/CodeGen/ClassTrait.php

@@ -1,9 +1,9 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Utils;
-use ClassTemplate\Renderable;
+namespace CodeGen;
+use CodeGen\Utils;
+use CodeGen\Renderable;
 use Exception;
-use ClassTemplate\Exception\InvalidArgumentTypeException;
+use CodeGen\Exception\InvalidArgumentTypeException;
 
 class Comment extends Line implements Renderable
 {

src/ClassTemplate/Comment.php src/CodeGen/Comment.php

@@ -1,7 +1,7 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Utils;
-use ClassTemplate\Renderable;
+namespace CodeGen;
+use CodeGen\Utils;
+use CodeGen\Renderable;
 use Exception;
 
 class CommentBlock extends Block implements Renderable

src/ClassTemplate/CommentBlock.php src/CodeGen/CommentBlock.php

@@ -1,5 +1,5 @@
 <?php
-namespace ClassTemplate\Exception;
+namespace CodeGEn\Exception;
 use InvalidArgumentException;
 
 class InvalidArgumentTypeException extends InvalidArgumentException

src/ClassTemplate/Exception/InvalidArgumentTypeException.php src/CodeGen/Exception/InvalidArgumentTypeException.php

@@ -1,5 +1,5 @@
 <?php
-namespace ClassTemplate;
+namespace CodeGen;
 
 class Indenter
 {

src/ClassTemplate/Exportable.php src/CodeGen/Exportable.php

@@ -1,6 +1,6 @@
 <?php
-namespace ClassTemplate;
-use ClassTemplate\Renderable;
+namespace CodeGen;
+use CodeGen\Renderable;
 
 abstract class Line implements Renderable {