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

..

Fixtures

[#1621] Failing tests for Filesystem loader

2015-02-16 11:10:29 +01:00

ArrayTest.php

remove string casts from loader which was done for template reference objects, but this type of parameter is not contracted by the LoaderInterface

2015-03-02 17:40:20 +01:00

ChainTest.php

fixed a unit test as Twig_ExistsLoaderInterface has been merged into Twig_LoaderInterface

2015-03-02 17:40:19 +01:00

FilesystemTest.php

Merge branch '1.x'

2015-05-16 16:12:48 +02:00