27 Commits

Author SHA1 Message Date
Fabien Potencier 5527658f08 Merge branch '1.x' into 2.x
* 1.x:
  removed years in (c) in files (we have them in the referenced main LICENSE file)
2017-01-10 14:15:38 -08:00
Fabien Potencier 4e1c232b67 removed years in (c) in files (we have them in the referenced main LICENSE file) 2017-01-10 14:14:10 -08:00
Fabien Potencier 4eaa29cfae removed obsolete code 2016-10-21 17:36:37 -07:00
Fabien Potencier 0fdae163ea Merge branch '1.x'
* 1.x:
  added missing phpdoc
  made using Twig_SourceContextLoaderInterface required
  made name required for Twig_Source
2016-10-21 17:29:34 -07:00
Fabien Potencier 21ecba8c44 made using Twig_SourceContextLoaderInterface required 2016-10-21 17:07:14 -07: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
Fabien Potencier b0c41d42c4 fixed CS 2015-07-03 08:47:09 +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
Possum 2030482e4d clean ups 2015-04-24 17:14:22 +02:00
Fabien Potencier fbecccd1e2 emptied deprecated interfaces 2015-03-02 17:39:56 +01:00
Fabien Potencier dff81dc846 fixed CS 2015-01-20 14:20:15 +01:00
Fabien Potencier 81699ca6ca made types consistent with the ones of Hack 2014-04-16 12:37:16 +02:00
Fabien Potencier 214385dccf removed unneeded PHPdoc tags 2013-02-24 22:41:17 +01:00
Fabien Potencier a009821dd3 fixed CS 2012-11-03 08:27:41 +01:00
Fabien Potencier e28663efd8 fixed CS 2012-05-19 09:41:36 +02:00
andrerom be0717431c Added @return doc on Twig_LoaderInterface->isFresh() 2012-03-10 16:58:52 +01:00
andrerom 8315992979 Added missing @throws in Twig_LoaderInterface
Based on Twig_Loader_Chain implementation, this seems to be the possible exceptions that can be thrown by loaders.
2012-03-10 16:39:02 +01:00
Fabien Potencier 17f814223b updated email address 2011-04-29 17:18:51 +02:00
nikic 7048606421 fix loader doccomments 2011-01-08 14:34:57 +01:00
Fabien Potencier 8fee70e3d1 added some missing phpdoc 2010-12-31 16:50:39 +01:00
Fabien Potencier 2d1b78e849 removed @version phpdoc attribute 2010-11-07 09:26:25 +01:00
Fabien Potencier 4d8fc51112 changed coding standards 2010-05-11 10:38:48 +02:00
fabien d3ee1165fe refactored loaders (closes #38)
git-svn-id: http://svn.twig-project.org/trunk@142 93ef8e89-cb99-4229-a87c-7fa0fa45744b
2009-11-16 15:01:52 +00:00
fabien 475eae5fce moved getTemplateClass() to Twig_Environment
git-svn-id: http://svn.twig-project.org/trunk@132 93ef8e89-cb99-4229-a87c-7fa0fa45744b
2009-11-11 16:57:23 +00:00
fabien b721f043cd renamed getTemplateName to getTemplateClass
git-svn-id: http://svn.twig-project.org/trunk@131 93ef8e89-cb99-4229-a87c-7fa0fa45744b
2009-11-11 16:55:35 +00:00
fabien 7d913df23f added setEnvironment to the Twig_LoaderInterface
git-svn-id: http://svn.twig-project.org/trunk@128 93ef8e89-cb99-4229-a87c-7fa0fa45744b
2009-11-11 16:33:33 +00:00
fabien fd0646e4cf initial commit
git-svn-id: http://svn.twig-project.org/trunk@4 93ef8e89-cb99-4229-a87c-7fa0fa45744b
2009-10-07 21:21:11 +00:00