From d54e3ee03c1cab06a7e9d5393943b23f8fb12744 Mon Sep 17 00:00:00 2001
From: andrevanzuydam <andrevanzuydam@gmail.com>
Date: Sun, 19 Jan 2020 13:59:11 +0200
Subject: [PATCH] Orm load order changed, added Caller for twig

---
 Tina4/Caller.php | 19 +++++++++++++++++++
 Tina4/ORM.php    |  2 +-
 Tina4Php.php     |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 Tina4/Caller.php

diff --git a/Tina4/Caller.php b/Tina4/Caller.php
new file mode 100644
index 00000000..55371bc1
--- /dev/null
+++ b/Tina4/Caller.php
@@ -0,0 +1,19 @@
+<?php
+namespace Tina4;
+class Caller {
+    /**
+     * Method to call classes using twig
+     * Example in twig {{ Tina4.call ("Class", "Method", "Params") }}
+     * @param $class
+     * @param string $method
+     * @param array $params
+     * @return string
+     */
+    function call ($class, $method="", $params=[]) {
+        eval ('$class = new '.$class.'();');
+        $object = [$class, $method];
+        $result = call_user_func_array($object, $params);
+
+        return $result."";
+    }
+}
\ No newline at end of file
diff --git a/Tina4/ORM.php b/Tina4/ORM.php
index 9ea3b97f..7d598df1 100644
--- a/Tina4/ORM.php
+++ b/Tina4/ORM.php
@@ -457,7 +457,7 @@ function save($tableName = "", $fieldMapping = [])
      * @throws \Exception Error on failure
      * @example examples\exampleORMLoadData.php for loading table row data
      */
-    function load($tableName = "", $fieldMapping = [], $filter = "")
+    function load($filter = "", $tableName = "", $fieldMapping = [])
     {
         $this->checkDBConnection();
 
diff --git a/Tina4Php.php b/Tina4Php.php
index 5a71b296..bbf6fd03 100644
--- a/Tina4Php.php
+++ b/Tina4Php.php
@@ -168,6 +168,7 @@ function __construct($config = null)
 
         $twig = new \Twig\Environment($twigLoader, ["debug" => true]);
         $twig->addExtension(new \Twig\Extension\DebugExtension());
+        $twig->addGlobal('Tina4', new \Tina4\Caller());
 
     }