Skip to content

Commit

Permalink
release version 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
samdark committed Nov 7, 2017
1 parent a7df978 commit f91a99d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
@@ -1,12 +1,13 @@
Yii Framework 2 twig extension Change Log
=========================================

2.2.0 under development
-----------------------
2.2.0 November 7, 2017
----------------------

- Enh #84 Upgrade to Twig 2 (koxu1996)
- Enh #90 Added `yii\twig\Profile`. Extension for render profiling (amarox)


2.1.1 October 11, 2017
----------------------

Expand Down
7 changes: 6 additions & 1 deletion Profile.php
@@ -1,4 +1,9 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/

namespace yii\twig;

Expand All @@ -8,9 +13,9 @@
class Profile extends \Twig_Extension_Profiler
{
protected $view;

protected $profiler;


public function __construct(Twig_Profiler_Profile $profile)
{
$profile = new \Twig_Profiler_Profile();
Expand Down
14 changes: 7 additions & 7 deletions Template.php
Expand Up @@ -16,13 +16,13 @@ class Template
* Returns the attribute value for a given array/object.
*
* @param \Twig_Environment $env
* @param \Twig_Source $source
* @param mixed $object The object or array from where to get the item
* @param mixed $item The item to get from the array or object
* @param array $arguments An array of arguments to pass if the item is an object method
* @param string $type The type of attribute (@see Twig_Template constants)
* @param bool $isDefinedTest Whether this is only a defined check
* @param bool $ignoreStrictCheck Whether to ignore the strict attribute check or not
* @param \Twig_Source $source
* @param mixed $object The object or array from where to get the item
* @param mixed $item The item to get from the array or object
* @param array $arguments An array of arguments to pass if the item is an object method
* @param string $type The type of attribute (@see Twig_Template constants)
* @param bool $isDefinedTest Whether this is only a defined check
* @param bool $ignoreStrictCheck Whether to ignore the strict attribute check or not
*
* @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true
*
Expand Down
4 changes: 2 additions & 2 deletions Twig_Empty_Loader.php
Expand Up @@ -16,8 +16,8 @@
class Twig_Empty_Loader implements \Twig_LoaderInterface
{
/**
* @inheritdoc
*/
* @inheritdoc
*/
public function getSourceContext($name)
{
throw new Twig_Error_Loader("Can not render using empty loader");
Expand Down

0 comments on commit f91a99d

Please sign in to comment.