Commit Graph

189 Commits

Author SHA1 Message Date
Fabien Potencier 67ed0d6c40 simplified code 2015-08-13 08:44:03 +02:00
Fabien Potencier f5898c61e7 Merge branch '1.x'
* 1.x:
  bumped version to 1.20.1-DEV
  prepared the 1.20.0 release
  updated CHANGELOG
  Fix the accessibility of Twig_Template::getEnvironment method in the C ext
  Fix the handling of internal Twig_Template properties in the C ext
  Forbid access to the Twig environment from template instance
  fixed sandbox security issue
  Prevent importing or calling reserved macro names
2015-08-12 23:19:32 +02:00
Fabien Potencier 37553291e6 bumped version to 1.20.1-DEV 2015-08-12 18:01:39 +02:00
Fabien Potencier 1ea4e5f81c prepared the 1.20.0 release 2015-08-12 17:56:39 +02:00
Tugdual Saunier 22500609b6 Fix the accessibility of Twig_Template::getEnvironment method in the C ext 2015-08-12 17:44:05 +02:00
Christophe Coevoet e000420096 Fix the handling of internal Twig_Template properties in the C ext 2015-08-12 17:44:05 +02:00
Fabien Potencier 3f521d483f bumped to 1.20 2015-08-11 15:22:12 +02:00
Fabien Potencier 617eaa0009 bumped version to 1.19.1-DEV 2015-07-31 15:50:08 +02:00
Fabien Potencier edbeaf43b0 prepared the 1.19.0 release 2015-07-31 15:45:26 +02:00
Fabien Potencier ea2648768e bumped version to 1.19 2015-07-05 10:14:03 +02:00
Fabien Potencier 881a7b67bc Merge branch '1.x'
* 1.x:
  fixed CS
  fix batch filter with zero items
  Fix PHP_FE_END value
2015-07-03 08:49:50 +02:00
Remi Collet a1eee074e8 Fix PHP_FE_END value
See explanation on rev c41d305
2015-07-01 12:05:34 +02:00
Fabien Potencier e22fb8728b bumped version to 1.18.3-DEV 2015-06-07 01:35:59 +02:00
Fabien Potencier e8e6575abf prepared the 1.18.2 release 2015-06-07 01:31:24 +02:00
Fabien Potencier fe67c5ba3a Merge branch '1.x'
* 1.x:
  updated CHANGELOG
  reverted unexpected change
  fixed previous merge
  Organize and show value types
  Added label for "Whitespace Control" section
  Added note about case sensitivity of logic operators
  Fixed CS
  Fixed error guessing for nested templates
  Travis no longer supports hhvm-nightly
  fixed CS
  Added an example for "and" on if statment
  Updated exception messages for null vars in Twig_Template::getAttribute().
  Use stubs for profiles. Fixes #1660

Conflicts:
	doc/api.rst
2015-06-07 01:29:09 +02:00
Fabien Potencier d63ac2088e minor #1667 [1.x] Updated exception messages for null vars (phansys)
This PR was merged into the 1.x branch.

Discussion
----------

[1.x] Updated exception messages for null vars

Updated exception messages for null vars in ```Twig_Template::getAttribute()```.

Example:
**Before:**
```
Impossible to invoke a method ("myMethod") on a NULL variable ("") in My:template.html.twig at line 1
```

**After:**
```
Impossible to invoke a method ("myMethod") on a null variable in My:template.html.twig at line 1
```

Commits
-------

ddf011d Updated exception messages for null vars in Twig_Template::getAttribute().
2015-05-16 16:17:41 +02:00
Fabien Potencier 56e515b64e Merge branch '1.x'
* 1.x:
  Fix two failed unit tests on Windows:
  updated CHANGELOG
  Reduce the name of the cache directories to 1 character
  clean ups
  bumped version to 1.18.2-DEV
  prepared the 1.18.1 release
  updated CHANGELOG
  Cleanup API - make the compiler happy
  Fixed memory leaks
  tweaked docs about the C extension
  removed an obsolete recipe

Conflicts:
	CHANGELOG
	doc/api.rst
	doc/recipes.rst
	ext/twig/php_twig.h
	lib/Twig/Environment.php
	lib/Twig/NodeTraverser.php
	lib/Twig/Template.php
2015-05-16 16:12:48 +02:00
Fabien Potencier 7d5fe0fbd4 bumped version to 1.18.2-DEV 2015-04-19 10:35:47 +02:00
Fabien Potencier 9f70492f44 prepared the 1.18.1 release 2015-04-19 10:30:27 +02:00
Javier Spagnoletti ddf011d360 Updated exception messages for null vars in Twig_Template::getAttribute(). 2015-04-02 16:25:27 -03:00
Julien Pauli c41d305251 Cleanup API - make the compiler happy 2015-03-26 12:44:45 +01:00
Julien Pauli 8bb7cbbd9d Fixed memory leaks 2015-03-26 12:44:37 +01:00
Fabien Potencier df3d5335fa removed obsolete interfaces 2015-03-02 17:40:20 +01:00
Fabien Potencier f9195a2dc1 bumped version to 2.0.0-DEV 2015-03-02 17:39:55 +01:00
Fabien Potencier 6b434f4521 bumped version to 1.18.1-DEV 2015-01-25 18:35:14 +01:00
Fabien Potencier 4cf7464348 prepared the 1.18.0 release 2015-01-25 18:32:08 +01:00
Fabien Potencier 4408caae0c added a profiler 2015-01-20 03:04:00 +01:00
Fabien Potencier e999532003 bumped version to 1.17.1-DEV 2015-01-14 11:18:41 +01:00
Fabien Potencier 2493970fa4 prepared the 1.17.0 release 2015-01-14 11:15:49 +01:00
Fabien Potencier 4481bf5f38 added an escaping strategy based on the template filename extension 2015-01-13 16:33:59 +01:00
Fabien Potencier d375c805fb bumped version to 1.16.4-DEV 2014-12-25 21:52:25 +01:00
Fabien Potencier 6dc11a1e8e prepared the 1.16.3 release 2014-12-25 20:58:19 +01:00
Fabien Potencier 5e4abadb4a bumped version to 1.16.3-DEV 2014-10-17 15:00:03 +02:00
Fabien Potencier 42f758d9fe prepared the 1.16.2 release 2014-10-17 14:53:44 +02:00
Tobias Schultze c8cd7f20ff Delete license in twig extension
This file is outdated and does not seem useful as there is already a license in the root which covers also this.
2014-10-11 22:49:11 +02:00
Fabien Potencier 84df881b8b bumped version to 1.16.2-DEV 2014-10-10 20:56:23 +02:00
Fabien Potencier 7c4c01dcf5 prepared the 1.16.1 release 2014-10-10 16:09:53 +02:00
Tugdual Saunier 759a77d040 [Ext] updating Twig extension for previous commit 2014-08-06 07:18:48 +01:00
Fabien Potencier 11ea5976e3 bumped version to 1.16.1-DEV 2014-07-07 14:54:10 +02:00
Fabien Potencier 8ce3711580 prepared the 1.16.0 release 2014-07-05 14:19:05 +02:00
Fabien Potencier 1930600e4e fixed url_encode when raw is false and URL is an array 2014-05-26 02:31:15 +02:00
Fabien Potencier b0ee99d6d6 bumped version to 1.15.2-DEV 2014-02-13 11:36:05 +01:00
Fabien Potencier 1fb5784662 prepared the 1.15.1 release 2014-02-13 11:19:29 +01:00
Tugdual Saunier 6e800d8277 Fixed fetching of a property defined but not initialized in C extension, fixed #1337 2014-02-13 09:48:39 +00:00
Martin Hasoň 770712b4c0 Improved exception message for accessing object without ArrayAccess as array 2013-12-31 22:30:37 +01:00
Fabien Potencier 7066ce68ad bumped version to 1.15.1-DEV 2013-12-06 09:13:22 +01:00
Fabien Potencier 85e4ff9800 prepared the 1.15.0 release 2013-12-06 08:47:10 +01:00
Tugdual Saunier 1abf5d99fa [ext] Mirroring PHP change for call_user_func_array, see #1286 2013-12-03 15:03:12 +01:00
Fabien Potencier 726a40a1b4 bumped version to 1.15 2013-10-31 13:37:55 +01:00
Tugdual Saunier 40bba0e447 Fixed C extension sandbox behavior 2013-10-31 12:37:11 +01:00