move template related code to separate package

diff --git a/composer.json b/composer.json
index 1e28aad8fbcfac4f5418396133376492b6e1bc78..4c04aeb07d4717e7b1be49718d5c39b133dd327f 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
     "andy128k/migrations": "dev-master",
     "andy128k/pegp": "0.1.*@dev",
     "andy128k/routeexpression": "dev-master",
-    "andy128k/ipf-template": "dev-master",
+    "andy128k/ipf-legacy-template": "dev-master",
     "bower-asset/jquery": "~2",
     "bower-asset/jquery-ui": "~1",
     "bower-asset/TableDnD": "dev-master",

diff --git a/composer.lock b/composer.lock
index e4e885aeafdd82fd92af21960691b1ff462395f9..9cbfbedc939afb0a3e9dd9a3d6d1f5110f37d3d0 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,11 +4,39 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "05fba443a8e7433d2563977f76a3fb9b",
+    "hash": "05aba1a30a0ee3fe49ff3da14f26ac15",
     "packages": [
         {
-            "name": "andy128k/ipf-template",
+            "name": "andy128k/ipf-legacy-template",
             "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "git://git.andy128k.net/ipf-legacy-template.git",
+                "reference": "0011a9adaa5ff903e2fb1be6f606870108fde97b"
+            },
+            "require": {
+                "andy128k/ipf-template": "0.1.*@dev"
+            },
+            "suggest": {
+                "andy128k/ipf": "Web Framework"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src"
+                ]
+            },
+            "authors": [
+                {
+                    "name": "Andrey Kutejko",
+                    "email": "andy128k@gmail.com"
+                }
+            ],
+            "time": "2015-02-08 11:24:04"
+        },
+        {
+            "name": "andy128k/ipf-template",
+            "version": "0.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "git://git.andy128k.net/ipf-template.git",
@@ -1371,7 +1399,7 @@
         "andy128k/migrations": 20,
         "andy128k/pegp": 20,
         "andy128k/routeexpression": 20,
-        "andy128k/ipf-template": 20,
+        "andy128k/ipf-legacy-template": 20,
         "bower-asset/tablednd": 20,
         "bower-asset/jqueryui-timepicker-addon": 20
     },

diff --git a/ipf/shortcuts.php b/ipf/shortcuts.php
deleted file mode 100644 (file)
index b5449e3..0000000
--- a/ipf/shortcuts.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-final class IPF_Shortcuts
-{
-    public static function RenderToResponse($tplfile, $params=array(), $request=null)
-    {
-        return new IPF_HTTP_Response(self::RenderToString($tplfile, $params, $request));
-    }
-
-    public static function RenderToString($tplfile, $params=array(), $request=null)
-    {
-        $context = IPF_Project_Template::context($params, $request);
-        $tmpl = new IPF_Template_File($tplfile, self::getDefaultTemplateEnvironment());
-        return $tmpl->render(new IPF_Template_Context($context));
-    }
-
-    private static $defaultEnvironment = null;
-
-    public static function getDefaultTemplateEnvironment()
-    {
-        if (!self::$defaultEnvironment)
-            self::$defaultEnvironment = self::createEnvironment();
-        return self::$defaultEnvironment;
-    }
-
-    private static function createEnvironment()
-    {
-        $e = new IPF_Template_Environment_FileSystem;
-
-        $e->cache = IPF::get('tmp');
-        $e->debug = IPF::get('debug');
-
-        $e->folders = IPF_Project_Template::templateDirs();
-
-        $e->tags['url'] = 'IPF_Template_Tag_Url';
-        $e->tags['params'] = 'IPF_Template_Tag_Params';
-        // extra tags
-        $e->tags = array_merge(IPF::get('template_tags', array()), $e->tags);
-
-        // extra modifiers
-        $e->modifiers = array_merge(IPF::get('template_modifiers', array()), $e->modifiers);
-
-        return $e;
-    }
-}
-
-class IPF_Template_Tag_Url extends IPF_Template_Tag
-{
-    function start()
-    {
-        echo IPF_Project_Template::urlTag(func_get_args());
-    }
-}
-
-class IPF_Template_Tag_Params extends IPF_Template_Tag
-{
-    function start()
-    {
-        echo IPF_Project_Template::paramsTag(func_get_args());
-    }
-}
-