36 Commits

Author SHA1 Message Date
Fabien Potencier e33577f1be Merge branch '2.x' into 3.x
* 2.x:
  do not reuse internally generated variable names during parsing
2022-02-25 09:30:09 +01:00
Christian Flothmann 1411c454c1 do not reuse internally generated variable names during parsing 2022-02-24 17:25:50 +01:00
Fabien Potencier 63b3ddd11a Merge branch '2.x' into 3.x
* 2.x:
  Hashing is not necessary to generate unique variable names during compilation
2021-12-14 15:28:12 -08:00
Jérôme Tamarelle ba2b4e6dfe Hashing is not necessary to generate unique variable names during compilation 2021-12-14 15:26:59 -08:00
Den 17c6371fb5 Some code style fixes 2021-05-14 10:26:05 +02:00
Fabien Potencier 2dd1d909b9 Fix CS 2021-05-12 09:37:17 +02:00
Fabien Potencier 81751d6671 Add "registerUndefinedTokenParserCallback" 2020-12-31 09:12:48 +01:00
Fabien Potencier dce7bd9e14 Merge branch '2.x' into 3.x
* 2.x:
  macros imported "globally" in a template are now available in macros without re-importing them
  added more tests
  added some tests
2019-05-17 14:16:15 +02:00
Fabien Potencier e138164015 macros imported "globally" in a template are now available in macros without re-importing them 2019-05-17 13:03:55 +02:00
Fabien Potencier b2fc808c1d Merge branch '2.x' into 3.x
* 2.x:
  fixed typo
  fixed tests
  fixed a PHP fatal error when calling a macro imported in the template in a nested block
  fixed typo
  added some tests
  fixed a regression
2019-05-17 08:14:55 +02:00
Fabien Potencier c8d2cc3ae5 Merge branch '1.x' into 2.x
* 1.x:
  fixed typo
2019-05-17 08:14:40 +02:00
Fabien Potencier b086d4f4bb fixed typo 2019-05-17 08:14:31 +02:00
Fabien Potencier e9a09d90c3 Merge branch '1.x' into 2.x
* 1.x:
  fixed a PHP fatal error when calling a macro imported in the template in a nested block
2019-05-17 08:09:05 +02:00
Fabien Potencier 11353ce3a7 fixed a PHP fatal error when calling a macro imported in the template in a nested block 2019-05-17 08:04:06 +02:00
Fabien Potencier 73326f0ddc Merge branch '1.x' into 2.x
* 1.x:
  fixed a regression
2019-05-16 20:18:06 +02:00
Fabien Potencier 3c7602b9da fixed a regression 2019-05-16 19:44:44 +02:00
Fabien Potencier 50f8df7fc7 Merge branch '2.x' into 3.x
* 2.x:
  tweaked the error message when using extends in a block/macro
2019-05-16 16:17:01 +02:00
Fabien Potencier ad1d08a431 Merge branch '1.x' into 2.x
* 1.x:
  tweaked the error message when using extends in a block/macro
2019-05-16 16:16:50 +02:00
Fabien Potencier 70c1b3a2c2 tweaked the error message when using extends in a block/macro 2019-05-16 16:07:04 +02:00
Fabien Potencier 2e8354bdee Merge branch '2.x' into 3.x
* 2.x:
  simplified code
  fixed a PHP fatal error when calling a macro, imported in the template, in another macro
2019-05-16 14:16:52 +02:00
Fabien Potencier b0f29468f0 simplified code 2019-05-16 14:16:39 +02:00
Fabien Potencier 10d1145ef6 Merge branch '1.x' into 2.x
* 1.x:
  fixed a PHP fatal error when calling a macro, imported in the template, in another macro
2019-05-16 14:16:01 +02:00
Fabien Potencier ba9b9681ca fixed a PHP fatal error when calling a macro, imported in the template, in another macro 2019-05-16 14:09:44 +02:00
Fabien Potencier 54cec4e3b8 added type hints 2019-04-26 12:01:21 +02:00
Fabien Potencier d10c0c33d3 removed obsolete code 2019-04-23 19:22:21 +02:00
Fabien Potencier 02767df5c0 removed block definition nested in non-capturing nodes 2019-04-23 18:25:38 +02:00
Fabien Potencier 2fa26d6f4a removed Parser::isReservedMacroName() 2019-04-23 18:23:16 +02:00
Fabien Potencier 55a8ad3410 removed the spaceless tag 2019-04-23 17:59:51 +02:00
Fabien Potencier 273b666a71 removed the obsolete lib/ directory, removed PSR-0 class aliases 2019-04-23 16:34:05 +02:00
Fabien Potencier 241f95cb25 added some type hints on private methods 2019-03-16 13:24:59 +01:00
Fabien Potencier f3941f0662 fixed some deprecation messages 2019-03-10 10:19:10 +01:00
Fabien Potencier 037ee67224 switched to namespace first, PSR-0 as a fallback 2019-03-05 08:14:45 +01:00
Fabien Potencier baa70287f5 switched to namespace first, PSR-0 as a fallback 2019-03-04 21:33:40 +01:00
Maxime Steinhausser 2c174e4015 Use class_exists instead of require 2017-06-05 23:42:50 +02:00
Nicolas Grekas 5420a5e3f8 Add the aliases 2017-05-25 08:32:07 +02:00
Nicolas Grekas 71af32b306 Add namespaced aliases 2017-05-24 10:12:32 +02:00