From 9a13ddb8a655828af6cd836b2fd1c5518f413455 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 24 May 2013 15:14:36 +0400 Subject: [PATCH] Moved Smarty and Twig renderers into extensions --- extensions/smarty/composer.json | 27 +++++++++++++++++++ .../smarty/yii/smarty/ViewRenderer.php | 6 ++--- extensions/twig/composer.json | 27 +++++++++++++++++++ .../twig/yii/twig/ViewRenderer.php | 4 +-- 4 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 extensions/smarty/composer.json rename framework/yii/renderers/SmartyViewRenderer.php => extensions/smarty/yii/smarty/ViewRenderer.php (95%) create mode 100644 extensions/twig/composer.json rename framework/yii/renderers/TwigViewRenderer.php => extensions/twig/yii/twig/ViewRenderer.php (95%) diff --git a/extensions/smarty/composer.json b/extensions/smarty/composer.json new file mode 100644 index 0000000000..3a74f41030 --- /dev/null +++ b/extensions/smarty/composer.json @@ -0,0 +1,27 @@ +{ + "name": "yiisoft/yii2-smarty", + "description": "The Smarty integration for the Yii framework", + "keywords": ["yii", "smarty", "renderer"], + "type": "library", + "license": "BSD-3-Clause", + "support": { + "issues": "https://github.com/yiisoft/yii2/issues?state=open", + "forum": "http://www.yiiframework.com/forum/", + "wiki": "http://www.yiiframework.com/wiki/", + "irc": "irc://irc.freenode.net/yii", + "source": "https://github.com/yiisoft/yii2" + }, + "authors": [ + { + "name": "Alenxader Makarov", + "email": "sam@rmcreative.ru" + } + ], + "minimum-stability": "dev", + "require": { + "yiisoft/yii2": "*" + }, + "autoload": { + "psr-0": { "yii\\smarty": "" } + } +} diff --git a/framework/yii/renderers/SmartyViewRenderer.php b/extensions/smarty/yii/smarty/ViewRenderer.php similarity index 95% rename from framework/yii/renderers/SmartyViewRenderer.php rename to extensions/smarty/yii/smarty/ViewRenderer.php index ac66e0d0be..d8c5d30fcc 100644 --- a/framework/yii/renderers/SmartyViewRenderer.php +++ b/extensions/smarty/yii/smarty/ViewRenderer.php @@ -7,13 +7,13 @@ * @license http://www.yiiframework.com/license/ */ -namespace yii\renderers; +namespace yii\smarty; use Yii; use Smarty; use yii\base\View; -use yii\base\ViewRenderer; use yii\helpers\Html; +use yii\base\ViewRenderer as BaseViewRenderer; /** * SmartyViewRenderer allows you to use Smarty templates in views. @@ -21,7 +21,7 @@ use yii\helpers\Html; * @author Alexander Makarov * @since 2.0 */ -class SmartyViewRenderer extends ViewRenderer +class ViewRenderer extends BaseViewRenderer { /** * @var string the directory or path alias pointing to where Smarty cache will be stored. diff --git a/extensions/twig/composer.json b/extensions/twig/composer.json new file mode 100644 index 0000000000..624f8bda1a --- /dev/null +++ b/extensions/twig/composer.json @@ -0,0 +1,27 @@ +{ + "name": "yiisoft/yii2-twig", + "description": "The Twig integration for the Yii framework", + "keywords": ["yii", "twig", "renderer"], + "type": "library", + "license": "BSD-3-Clause", + "support": { + "issues": "https://github.com/yiisoft/yii2/issues?state=open", + "forum": "http://www.yiiframework.com/forum/", + "wiki": "http://www.yiiframework.com/wiki/", + "irc": "irc://irc.freenode.net/yii", + "source": "https://github.com/yiisoft/yii2" + }, + "authors": [ + { + "name": "Alenxader Makarov", + "email": "sam@rmcreative.ru" + } + ], + "minimum-stability": "dev", + "require": { + "yiisoft/yii2": "*" + }, + "autoload": { + "psr-0": { "yii\\twig": "" } + } +} diff --git a/framework/yii/renderers/TwigViewRenderer.php b/extensions/twig/yii/twig/ViewRenderer.php similarity index 95% rename from framework/yii/renderers/TwigViewRenderer.php rename to extensions/twig/yii/twig/ViewRenderer.php index de561d348e..7498d86052 100644 --- a/framework/yii/renderers/TwigViewRenderer.php +++ b/extensions/twig/yii/twig/ViewRenderer.php @@ -11,7 +11,7 @@ namespace yii\renderers; use Yii; use yii\base\View; -use yii\base\ViewRenderer; +use yii\base\ViewRenderer as BaseViewRenderer; use yii\helpers\Html; /** @@ -20,7 +20,7 @@ use yii\helpers\Html; * @author Alexander Makarov * @since 2.0 */ -class TwigViewRenderer extends ViewRenderer +class ViewRenderer extends BaseViewRenderer { /** * @var string the directory or path alias pointing to where Twig cache will be stored.