Adding twig support for templating

composer.json

@@ -1,35 +1,36 @@
 {
-    "name": "umbrella/simpletablereport",
-    "description": "PHP Simple Table Report. Export data as tables to PDF, CSV, Excel, etc...",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "kelsoncm",
-            "email": "[email protected]"
-        },
-        {
-            "name": "Ítalo Lelis",
-            "email": "[email protected]"
-        },
-        {
-            "name": "Ayrton Ricardo",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "easyframework/collections": "~3.1"
+  "name": "umbrella/simpletablereport",
+  "description": "PHP Simple Table Report. Export data as tables to PDF, CSV, Excel, etc...",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "kelsoncm",
+      "email": "[email protected]"
     },
-    "require-dev": {
-        "phpunit/phpunit": "~4.2"
+    {
+      "name": "Ítalo Lelis",
+      "email": "[email protected]"
     },
-    "autoload": {
-        "psr-4": {
-            "Umbrella\\SimpleReport\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Umbrella\\Tests\\SimpleReport\\": "tests/"
-        }
+    {
+      "name": "Ayrton Ricardo",
+      "email": "[email protected]"
+    }
+  ],
+  "require": {
+    "twig/twig": "~1.17",
+    "easyframework/collections": "~3.1"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.2"
+  },
+  "autoload": {
+    "psr-4": {
+      "Umbrella\\SimpleReport\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Umbrella\\Tests\\SimpleReport\\": "tests/"
     }
+  }
 }

src/BaseRenderer.php

@@ -17,10 +17,11 @@
  */
 namespace Umbrella\SimpleReport;
 
+use Easy\Collections\Dictionary;
 use Umbrella\SimpleReport\Api\FieldDefinition;
 use Umbrella\SimpleReport\Api\DatasourceInterface;
+use Umbrella\SimpleReport\Api\FieldSet;
 use Umbrella\SimpleReport\Api\RendererInterface;
-use Umbrella\SimpleReport\Api\TemplateInterface;
 
 /**
  * Description of BaseRenderer
@@ -33,19 +34,29 @@ abstract class BaseRenderer implements RendererInterface
     protected $configuration;
 
     /**
-     * @var DatasourceInterface 
+     * @var DatasourceInterface
      */
     protected $datasource;
 
     /**
-     * @var TemplateInterface 
+     * @var FieldSet
      */
-    protected $template;
+    protected $fieldset;
 
-    public function __construct(DatasourceInterface $datasource, TemplateInterface $template)
+    /**
+     * @var Dictionary
+     */
+    protected $options;
+
+    public function __construct(DatasourceInterface $datasource, FieldSet $fieldset, Dictionary $options = null)
     {
         $this->datasource = $datasource;
-        $this->template = $template;
+        $this->fieldset = $fieldset;
+        $this->options = new Dictionary();
+        if ($options) {
+            $this->options->concat($options);
+        }
+
         $configurationLoader = ConfigurationLoader::getInstance();
         $this->configuration = $configurationLoader->getConfiguration();
     }

src/ConfigurationLoader.php

@@ -30,7 +30,7 @@ class ConfigurationLoader
     private $configuration;
 
     /**
-     * 
+     *
      * @return ConfigurationLoader
      */
     public static function getInstance()
@@ -43,7 +43,7 @@ public static function getInstance()
     }
 
     /**
-     * 
+     *
      * @return ConfigurationInterface
      */
     public function getConfiguration()
@@ -53,12 +53,12 @@ public function getConfiguration()
 
     public function getRootDir()
     {
-        return filter_input(INPUT_SERVER, 'DOCUMENT_ROOT') ? : getcwd();
+        return filter_input(INPUT_SERVER, 'DOCUMENT_ROOT') ?: getcwd();
     }
 
     protected function load()
     {
-        $configFile = __DIR__ . "/../config.ini";
+        $configFile = __DIR__ . "/Resources/config/config.ini";
         $ini_array = parse_ini_file($configFile);
         $configurationClassName = $ini_array['simpletablereport.configurationClassName'];
         $this->configuration = new $configurationClassName($ini_array);