Commit Graph

514 Commits

Author SHA1 Message Date
Fabien Potencier 0b6c19d816 fixed bad merge 2017-05-31 11:12:45 -07:00
Fabien Potencier f783be6e85 Merge branch '1.x' into 2.x
* 1.x:
  [1.x] Allow using namespaced aliases as extension names
2017-05-31 10:36:08 -07:00
Nicolas Grekas c9a2f3db8b [1.x] Allow using namespaced aliases as extension names 2017-05-31 14:35:57 +02:00
Fabien Potencier fd98722d15 Merge branch '1.x' into 2.x
* 1.x:
  Add the aliases
  Add namespaced aliases
2017-05-25 15:39:31 -07:00
Nicolas Grekas 5420a5e3f8 Add the aliases 2017-05-25 08:32:07 +02:00
Fabien Potencier 3810368b3b marked Twig_Node_Module as final via an annotation (will be final in 3.0) 2017-05-22 08:18:37 +02:00
Fabien Potencier 0dbc6b87dc Merge branch '1.x' into 2.x
* 1.x:
  Length filter non-mb_string on 7.x fix.
  fixed code for older versions of PHP
  bumped version to 1.34
  Support PHPUnit 6 for testing extensions
  added PHP 7.2 to the test matrix
2017-05-12 06:59:34 -07:00
Fabien Potencier d884330572 bumped version to 1.34 2017-05-11 14:48:03 -07:00
Fabien Potencier 5c79de3a8e Merge branch '1.x' into 2.x
* 1.x:
  fixed tests
  Fix generating template name in createTemplate() method
  Prepare for php 7.2
  Fix typo in `advanced.rst` file
2017-05-11 13:26:47 -07:00
Andrej Hudec a7c8b08270 Fix generating template name in createTemplate() method
Before this change the name for the template was generated randomly based on uniqid(mt_rand()). It generated new file whenever the  template was loaded as string using the `template_from_string`  even the template was the same. The generated file wasn't used anymore.
Now the cache file is generated by the content of template so using the `template_from_string` is faster and doesn't pollute the cache folder with unneeded files.
2017-05-11 12:36:01 +02:00
Fabien Potencier 880856b233 bumped version to 2.3.3-DEV 2017-04-20 18:13:40 -06:00
Fabien Potencier 85e8372c45 prepared the 2.3.2 release 2017-04-20 18:13:02 -06:00
Fabien Potencier ef680be80e bumped version to 1.33.3-DEV 2017-04-20 11:41:13 -06:00
Fabien Potencier dd6ca96227 prepared the 1.33.2 release 2017-04-20 11:39:48 -06:00
Fabien Potencier 4335780853 bumped version to 2.3.2-DEV 2017-04-18 15:50:49 -06:00
Fabien Potencier 437efc4356 prepared the 2.3.1 release 2017-04-18 15:50:11 -06:00
Fabien Potencier 530be06a5a bumped version to 1.33.2-DEV 2017-04-18 15:44:30 -06:00
Fabien Potencier a87f959f4b prepared the 1.33.1 release 2017-04-18 15:43:11 -06:00
Fabien Potencier 84dea3134b bumped version to 2.3.1-DEV 2017-03-22 08:42:21 -07:00
Fabien Potencier 9718186a5d prepared the 2.3.0 release 2017-03-22 08:41:51 -07:00
Fabien Potencier c622995d6d bumped version to 1.33.1-DEV 2017-03-22 08:40:48 -07:00
Fabien Potencier 05cf49921b prepared the 1.33.0 release 2017-03-22 08:40:09 -07:00
Fabien Potencier f5596be101 Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
  Call clearstatcache() before calling is_dir().
  bumped version to 1.33
  fixed CHANGELOG
  Make "length" filter and "empty" test consider __toString [Twig 1.x]
2017-03-22 08:12:17 -07:00
Fabien Potencier 5040e38885 bumped version to 1.33 2017-03-22 07:48:20 -07:00
Fabien Potencier 82004b85f8 bug #2384 Fix undef. source in exception. (SpacePossum)
This PR was merged into the 2.x branch.

Discussion
----------

Fix undef. source in exception.

closes https://github.com/twigphp/Twig/issues/2383

Two things:
- the tests fails without a corrupt cache, so maybe the message is of or the cache generation is off (i.e. not respecting the `$index`)
- passing the `$source` seems superfluous (but maybe that is only the case in the exception message)

Commits
-------

772373cf Fix undef. source in exception.
2017-03-05 13:51:23 -08:00
Fabien Potencier 31bf7951fd bumped version to 2.2.1-DEV 2017-02-26 16:17:12 -08:00
Fabien Potencier 29bb02dde0 prepared the 2.2.0 release 2017-02-26 16:16:20 -08:00
Fabien Potencier 27d7ea9675 bumped version to 1.32.1-DEV 2017-02-26 16:07:56 -08:00
Fabien Potencier 9935b662e2 prepared the 1.32.0 release 2017-02-26 16:07:03 -08:00
Fabien Potencier a818ab3ac3 bumped version to 2.2 2017-02-17 11:33:43 -08:00
Fabien Potencier 9578c35227 Merge branch '1.x' into 2.x
* 1.x:
  fixed tests for PHP 5.2
  fixed tests for PHP 5.2
  fixed tests for PHP 5.2
  Fix typo in test filename
  added a note in the docs about the PSR-11 runtime loader
  fixed typo
  updated CHANGELOG
  bumped version to 1.32
  Add ContainerRuntimeLoader
  tweaked docs
  Update striptags.rst
  fixed CS
  Mention autoescape=true deprecation (issue #2386)
  Fix typo.
  bumped version to 1.31.1-DEV
  prepared the 1.31.0 release
  added a note about macros usage in the deprecated docs
2017-02-17 11:32:53 -08:00
Fabien Potencier f08c06ed7e bumped version to 1.32 2017-02-17 11:10:54 -08:00
SpacePossum 772373cfd3 Fix undef. source in exception. 2017-01-31 10:46:11 +01:00
Fabien Potencier 465689da4d bumped version to 2.1.1-DEV 2017-01-11 11:39:41 -08:00
Fabien Potencier 9062992538 prepared the 2.1.0 release 2017-01-11 11:39:01 -08:00
Fabien Potencier 9b3796b140 bumped version to 1.31.1-DEV 2017-01-11 11:37:33 -08:00
Fabien Potencier ddc9e3e20e prepared the 1.31.0 release 2017-01-11 11:36:15 -08:00
Fabien Potencier 9ef01e8cbc Merge branch '1.x' into 2.x
* 1.x:
  Turned fatal error into exception when a previously generated cache prevents loading its newly compiled version
2017-01-11 08:02:12 -08:00
Nicolas Grekas 95c109919a Turned fatal error into exception when a previously generated cache prevents loading its newly compiled version 2017-01-11 16:22:32 +01:00
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 f02005ecd6 bumped version to 2.1.0 2017-01-10 14:08:27 -08:00
Fabien Potencier 3cdbd325d4 bumped version to 1.31.0 2017-01-10 14:00:36 -08:00
Christophe Coevoet a33fb6ce2c Delay marking the environment as initialized until it is done 2017-01-09 17:10:34 +01:00
Fabien Potencier 303115cf6c bumped version to 2.0.1-DEV 2017-01-05 09:13:42 -08:00
Fabien Potencier 2a86dde128 prepared the 2.0.0 release 2017-01-05 09:12:02 -08:00
Fabien Potencier 2cbc573aa5 bumped version to 1.30.1-DEV 2016-12-23 12:16:08 +01:00
Fabien Potencier c6ff71094f prepared the 1.30.0 release 2016-12-23 12:06:22 +01:00
Fabien Potencier 640568437f moved Twig_Template::getAttribute() to a function 2016-12-23 11:50:47 +01:00
Fabien Potencier 7ffb188710 deprecated function/test/filter/tag overriding 2016-12-20 04:58:45 +01:00