Merge pull request #1 from c9s/master

updating own fork

Author: faizanakram99

.travis.yml

@@ -3,21 +3,15 @@ php:
   - 5.4
   - 5.5
   - 5.6
-#   - hhvm
-before_script:
-  - phpenv rehash
-  - composer install --dev
+  - hhvm
+install:
+- phpenv rehash
+- travis_retry composer self-update
+- travis_retry composer require satooshi/php-coveralls "^1" --no-update --dev
+- travis_retry composer install
 script:
-  - phpunit
+- phpunit -c phpunit.xml.dist
 cache:
+  apt: true
+  directories:
   - vendor
-# matrix:
-#   fast_finish: true
-#   allow_failures:
-#     - php: hhvm
-#     - php: 5.6
-#   exclude:
-#     - php: hhvm
-#       env: DB=pgsql DB_USER=postgres DB_NAME=postgres  # driver currently unsupported by HHVM
-#     - php: hhvm
-#       env: DB=sqlite # some issues at the moment

CHANGELOG.md

@@ -0,0 +1,32 @@
+CHANGELOG
+==================
+
+Version 2.0.x
+-----------------
+
+MethodCallExpr
+
+- `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
+-----------------
+
+- `Block::indent()` and `Block::unindent()` is now deprecated. use
+  `increaseIndentLevel()` and `decreaseIndentLevel()` instead.
+- `AllowIndent` and `AutoIndent` is now removed from Block class, it's now depends
+   on the indent level.
+- Added `BracketedBlock` to support bracket wrapped block.
+- Improved indentation.
+- Added Argument class

README.md

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

composer.json

@@ -2,10 +2,10 @@
     "name": "corneltek/class-template",
     "homepage": "http://github.com/c9s/ClassTemplate",
     "description": "Class template Utilities",
-    "version": "1.4.4",
     "require": {
         "php": ">=5.3.0",
-        "twig/twig": "~1"
+        "corneltek/codegen": "^2",
+        "twig/twig": "^1"
     },
     "require-dev": {
         "corneltek/phpunit-testmore": "dev-master"
@@ -23,4 +23,4 @@
             "ClassTemplate\\": "src/ClassTemplate/"
         }
     }
-}
+}

phpunit.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true">
+
+  <filter>
+    <whitelist>
+        <directory suffix=".php">src/</directory>
+    </whitelist>
+  </filter>
+
+  <testsuites>
+    <testsuite name="ClassTemplate">
+      <directory suffix="Test.php">tests/ClassTemplate</directory>
+    </testsuite>
+  </testsuites>
+
+  <logging>
+
+    <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+
+    <log type="coverage-html" 
+        target="build/coverage" 
+        title="CodeGen"
+        charset="UTF-8" 
+        yui="true" 
+        highlight="true"
+        lowUpperBound="35" 
+        highLowerBound="70"/>
+
+    <log type="coverage-clover" 
+        target="build/logs/clover.xml"/>
+
+    <log type="junit" 
+        target="build/logs/junit.xml"
+        logIncompleteSkipped="false"/>
+
+  </logging>
+
+</phpunit>

phpunit.xml.dist

@@ -0,0 +1,69 @@
+<?php
+namespace ClassTemplate;
+use Exception;
+use ReflectionClass;
+use ReflectionObject;
+use CodeGen\UserClass;
+use CodeGen\Renderable;
+
+class ClassFile extends UserClass
+{
+    public $templateFile;
+    public $templateDirs;
+    public $options = 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 getSplFilePath()
+    {
+        return str_replace('\\', DIRECTORY_SEPARATOR, ltrim($this->class->getFullName(),'\\'));
+    }
+
+    public function load() {
+        $tmpname = tempnam('/tmp', $this->getSplFilePath());
+        if (file_put_contents($tmpname, $this->render()) != false) {
+            return require $tmpname;
+        }
+        throw new Exception("Can not load class file $tmpname");
+    }
+}
+