Commit Graph

86 Commits

Author SHA1 Message Date
Fabien Potencier de4e46e77e Merge branch '1.x' into 2.x
* 1.x:
  Update api.rst
  Fix typo
  Fix CI on PHP5
2020-04-24 08:31:39 +02:00
Yohann Durand abe625a1a1 Update api.rst 2020-04-24 08:25:17 +02:00
Fabien Potencier e74a51ecb1 Merge branch '1.x' into 2.x
* 1.x:
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
2019-12-28 08:09:20 +01:00
Laurent VOULLEMIER 92e1cd35c5 Update doc with new escaping behavior
When applied on ternary statements
2019-12-27 08:28:48 +01:00
Fabien Potencier 46e232b37c Merge branch '1.x' into 2.x
* 1.x:
  Add missing link in docs
  Correct return type of twig_date_converter
2019-12-09 17:39:17 +01:00
Fabien Potencier 335dcad4b0 Add missing link in docs 2019-12-09 17:35:58 +01:00
Fabien Potencier 240e967c61 Remove usage of the old Autoloader class in the docs 2019-11-15 16:44:44 +01:00
Fabien Potencier b18733bce0 added the possibility to register classes/interfaces as being safe for the escaper 2019-05-21 15:41:28 +02:00
Fabien Potencier 61eb901f16 fixed doc markup 2019-04-30 14:23:18 +02:00
Fabien Potencier 27a9a4d91d Merge branch '1.x' into 2.x
* 1.x:
  tweaked the doc
2019-04-27 16:57:11 +01:00
Fabien Potencier 5ac239ca4f tweaked the doc 2019-04-27 15:54:47 +01:00
Fabien Potencier 97167aab98 Merge branch '1.x' into 2.x
* 1.x:
  tweaked doc markup
  tweaked escape docs
2019-04-25 14:27:37 +02:00
Fabien Potencier fa836ddfea tweaked doc markup 2019-04-25 12:14:46 +02:00
Fabien Potencier 5001301df9 Merge branch '1.x' into 2.x
* 1.x:
  fixed doc markup
2019-03-05 11:11:07 +01:00
Fabien Potencier eaa29417ba fixed doc markup 2019-03-05 11:07:38 +01:00
Fabien Potencier d1596b6ccf moved to namespaced classes by default 2019-02-15 08:44:47 +01:00
Fabien Potencier 3632a46e82 moved to namespaced classes by default 2019-02-15 08:28:49 +01:00
Fabien Potencier db751d62d3 fixed some class names 2019-02-15 08:28:49 +01:00
Fabien Potencier 2ed21eea43 Merge branch '1.x' into 2.x
* 1.x:
  fixed .php_cs CS
  removed 5.3 from Travis matrix
  removed array notation in comments
  enabled short array notation in docs
  fixed usage of short array notation in tests
  fixed usage of short array notation in tests
  fixed more short array notations
  switched to use PHP short array notation for Twig's code
  switched to use short arrays in generated code
  dropped PHP 5.3 support
  bumped version
2019-01-08 17:28:13 +01:00
Fabien Potencier a2c4253406 enabled short array notation in docs 2019-01-08 11:56:48 +01:00
Fabien Potencier 183f062bbf removed obsolete code 2016-11-15 17:01:14 -05:00
Fabien Potencier 5a7b20205d Merge branch '1.x' into 2.x
* 1.x:
  exposed a way to access template data and methods in a portable way
  removed optimization as it's not compatible with Symfony cache system
2016-11-15 16:57:15 -05:00
Fabien Potencier d7062f35b8 exposed a way to access template data and methods in a portable way 2016-11-12 19:45:39 -08: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 9c50224837 Merge branch '1.x'
* 1.x:
  fixed the filesystem loader with relative paths
2016-10-21 07:04:16 -07:00
Fabien Potencier a343c92805 fixed the filesystem loader with relative paths 2016-10-21 06:52:23 -07:00
Fabien Potencier 95ad579e37 Merge branch '1.x'
* 1.x:
  fixed docs
  fixed typo
  fixed typo
2016-10-17 15:42:41 -07:00
Fabien Potencier 3c764b2b01 fixed docs 2016-10-17 15:41:50 -07:00
Fabien Potencier 620613ced8 Merge branch '1.x'
* 1.x: (23 commits)
  changed a test to make it more robust
  bumped version to 1.24.3-DEV
  prepared the 1.24.2 release
  updated CHANGELOG
  Floor - use cast and not intval
  fixed CS
  Do not mix indention levels
  fixed typo
  Add Visual Studio Code to the list of IDE integrations
  Fixed all deprecation notices by using
  [Doc] Fixed small error in code example
  Update macro.rst
  Update use.rst
  Fix exception message for static method and object without req. params.
  add named macro end-tag documentation
  fixed CS
  Fix load cache
  Minor rst syntax tweaks
  Reset blocks also in doLeaveNode
  fix a case where the autoescaping does not work as expected
  ...
2016-09-18 18:58:25 -07:00
Javier Eguiluz b42ddb3989 Minor rst syntax tweaks 2016-06-13 10:25:29 +02:00
Shaun 02a7bd6d7e Remove reference to String loader in docs 2015-07-06 15:43:15 -04: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 d0b71307d6 fixed previous merge 2015-06-07 01:22:13 +02:00
Kevin Simper 0a46d06069 Organize and show value types 2015-06-07 01:19:31 +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 72cc7d8081 removed obsolete docs 2015-03-02 18:32:57 +01:00
Fabien Potencier cb732490a3 removed an obsolete recipe 2015-03-02 18:29:18 +01:00
Fabien Potencier 886b863dcb removed the Autoloader as Composer provide one 2015-03-02 17:40:39 +01:00
Fabien Potencier 6c3febca9e removed pre-1.8 autoescape tag syntax, removed true as a valid autoescape strategy 2015-03-02 17:40:38 +01:00
Fabien Potencier bb30b98706 udpated the docs for 2.0 2015-03-02 17:40:20 +01:00
Fabien Potencier 4408caae0c added a profiler 2015-01-20 03:04:00 +01:00
Fabien Potencier 01ab6f317b added some more tests for the filename autoescape strategy 2015-01-14 07:56:45 +01:00
Fabien Potencier 4481bf5f38 added an escaping strategy based on the template filename extension 2015-01-13 16:33:59 +01:00
Fabien Schurter 882f44b0d3 Correct base template name
The base template name used in $loader1 and $loader2 is actually
"base.html", not "base.twig".
2014-10-16 09:32:46 +02:00
Fabien Potencier d12f7afbbe made it clear that Twig_Loader_String must not be used by end users 2014-10-11 22:30:59 +02:00
Philipp Rieber a21df952ab [Docs] Some minor fixes: Typos, Notations 2013-11-23 21:51:26 +01:00
Fabien Potencier fd9643071c fixed doc markup (closes #1106) 2013-05-27 08:04:18 +02:00
Bilal Amarni 12a5d026ed [doc] switched a BC call 2013-05-13 13:14:39 +02:00
Fabien Potencier 81af6a1fd1 removed list of built-in items in the docs in favor of a link (easier to maintain and better for discoverability) 2013-01-31 11:19:12 +01:00