From e0a5a8a9b3b1eae551677aa92d560c07cd157adf Mon Sep 17 00:00:00 2001 From: Vladimir Kolesnikov Date: Fri, 4 Oct 2013 06:41:48 +0300 Subject: [PATCH 1/2] Fix 'expected object implementing Phalcon\Mvc\View\EngineInterface' bug in the tests --- unit-tests/ViewEnginesTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unit-tests/ViewEnginesTest.php b/unit-tests/ViewEnginesTest.php index 6f08d2a0866..b3fb38dd1ad 100644 --- a/unit-tests/ViewEnginesTest.php +++ b/unit-tests/ViewEnginesTest.php @@ -21,14 +21,14 @@ /** * Adapter to use Mustache library as templating engine */ -class My_Mustache_Engine extends \Phalcon\Mvc\View\Engine +class My_Mustache_Engine extends \Phalcon\Mvc\View\Engine implements \Phalcon\Mvc\View\EngineInterface { protected $_mustache; protected $_params; - public function __construct(Phalcon\Mvc\View $view, Phalcon\DI $di) + public function __construct($view, $di = null) { $this->_mustache = new Mustache_Engine(); parent::__construct($view, $di); @@ -53,12 +53,12 @@ public function render($path, $params, $mustClean=false) /** * Adapter to use Twig library as templating engine */ -class My_Twig_Engine extends \Phalcon\Mvc\View\Engine +class My_Twig_Engine extends \Phalcon\Mvc\View\Engine implements \Phalcon\Mvc\View\EngineInterface { protected $_twig; - public function __construct(Phalcon\Mvc\View $view, Phalcon\DI $di) + public function __construct($view, $di = null) { $loader = new Twig_Loader_Filesystem($view->getViewsDir()); $this->_twig = new Twig_Environment($loader); From d2d22e2ae69d4ecf4cf9aab04e82ddff716c523e Mon Sep 17 00:00:00 2001 From: Vladimir Kolesnikov Date: Fri, 4 Oct 2013 06:45:59 +0300 Subject: [PATCH 2/2] Make sure unit-tests/engines always exists (cherry picked from commit c8c7476ee44a3f039678fc1b47579e00c810ca89) --- unit-tests/engines/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 unit-tests/engines/.gitignore diff --git a/unit-tests/engines/.gitignore b/unit-tests/engines/.gitignore new file mode 100644 index 00000000000..e69de29bb2d