Commit Graph

4615 Commits

Author SHA1 Message Date
Fabien Potencier a38ccea3d1 feature #3018 Add a better error message for unknown macros (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add a better error message for unknown macros

Commits
-------

1153534a added a better error message for unknown macros
2019-05-18 09:08:39 +02:00
Fabien Potencier 1153534aac added a better error message for unknown macros 2019-05-18 09:01:55 +02:00
Fabien Potencier 60ab3e7134 fixed CS 2019-05-18 06:15:39 +02:00
Fabien Potencier 6d94b6405b Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-05-18 06:15:17 +02:00
Fabien Potencier f31aa2185b fixed CS 2019-05-18 06:14:51 +02:00
Fabien Potencier 84c698c99a simplified code 2019-05-18 06:10:53 +02:00
Fabien Potencier 347202d06b Merge branch '1.x' into 2.x
* 1.x:
  fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator
2019-05-18 06:08:10 +02:00
Fabien Potencier d0c65c3a82 bug #3017 Fix the "filter" filter when the argument is \Traversable but does not implement \Iterator (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix the "filter" filter when the argument is \Traversable but does not implement \Iterator

close #3015, closes #3016

Commits
-------

c2f685e1 fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator
2019-05-18 06:06:26 +02:00
Fabien Potencier c2f685e16f fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator 2019-05-18 06:01:24 +02:00
Fabien Potencier 7c098a2209 feature #3014 Add support for macros on "is defined" tests (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add support for macros on "is defined" tests

closes #1313

Commits
-------

9fe3213d added support for macros on "is defined" tests
2019-05-17 18:55:44 +02:00
Fabien Potencier 9fe3213d1b added support for macros on "is defined" tests 2019-05-17 18:04:15 +02:00
Fabien Potencier 257e6c29d3 fixed version 2019-05-17 14:21:21 +02:00
Fabien Potencier 6cfd53fa5c Merge branch '1.x' into 2.x
* 1.x:
  fixed typo
  update docs for for loop with conditional to reference filter filters
2019-05-17 14:21:07 +02:00
Fabien Potencier d3dcd6d3c5 fixed typo 2019-05-17 14:20:59 +02:00
Fabien Potencier 4c19987663 minor #3006 update docs for for loop with conditional to reference filter filters (shieldo)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3006).

Discussion
----------

update docs for for loop with conditional to reference filter filters

I don't know if there needs to be the same emphasis for this case as there's no special syntax for this any more? This PR assumes the same emphasis.

Commits
-------

b905e023 update docs for for loop with conditional to reference filter filters
2019-05-17 14:19:56 +02:00
Douglas Greenshields b905e02333 update docs for for loop with conditional to reference filter filters 2019-05-17 14:19:50 +02:00
Fabien Potencier f6855c6182 feature #3012 Macros imported "globally" in a template are now available in macros without re-importing them (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Macros imported "globally" in a template are now available in macros without re-importing them

closes #1790, closes #1052, closes #2414, closes #2442

Commits
-------

e1381640 macros imported "globally" in a template are now available in macros without re-importing them
2019-05-17 14:15:30 +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 cd49c5d44b added more tests 2019-05-17 11:15:47 +02:00
Fabien Potencier 8a9308c268 Merge branch '1.x' into 2.x
* 1.x:
  added some tests
2019-05-17 09:44:35 +02:00
Fabien Potencier f74ce7190a added some tests 2019-05-17 08:38:57 +02:00
Fabien Potencier 3d1e5f6493 bumped version to 2.11 2019-05-17 08:23:38 +02:00
Fabien Potencier 26b21cc24c Merge branch '1.x' into 2.x
* 1.x:
  bumped version to 1.42
2019-05-17 08:23:11 +02:00
Fabien Potencier 0f5a056968 bumped version to 1.42 2019-05-17 08:22:23 +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 a571638929 fixed tests 2019-05-17 08:14:18 +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 62748c9559 bug #3013 Fix a PHP fatal error when calling a macro imported in the template in a nested block (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a PHP fatal error when calling a macro imported in the template in a nested block

Commits
-------

11353ce3 fixed a PHP fatal error when calling a macro imported in the template in a nested block
2019-05-17 08:08:49 +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 bb01eb1c9c Merge branch '1.x' into 2.x
* 1.x:
  fixed typo
2019-05-16 21:07:33 +02:00
Fabien Potencier 8c80142ba3 fixed typo 2019-05-16 21:07:25 +02:00
Fabien Potencier 4e1c3b8a7c Merge branch '1.x' into 2.x
* 1.x:
  added some tests
2019-05-16 21:02:31 +02:00
Fabien Potencier 6b341104ec added some tests 2019-05-16 21:02:14 +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 bd1f9eb39b bug #3011 Fix a regression (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a regression

Commits
-------

3c7602b9 fixed a regression
2019-05-16 20:17:10 +02:00
Fabien Potencier 3c7602b9da fixed a regression 2019-05-16 19:44:44 +02:00
Fabien Potencier e671f267ce Merge branch '1.x' into 2.x
* 1.x:
  made code more readable
2019-05-16 16:31:36 +02:00
Fabien Potencier 06670f3630 made code more readable 2019-05-16 16:30:26 +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 0968176a05 bug #3010 Tweak the error message when using extends in a block/macro (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak the error message when using extends in a block/macro

Commits
-------

70c1b3a2 tweaked the error message when using extends in a block/macro
2019-05-16 16:16:26 +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 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 6315ea4786 bug #3009 Fix a PHP fatal error when calling a macro, imported in the template, in another macro (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a PHP fatal error when calling a macro, imported in the template, in another macro

The current code iterates over all imported functions (traversing all the scopes). So, the macro was found at compilation time, but didn't work at runtime, leading to a PHP fatal error. Now, you get a proper exception at compilation time.

Commits
-------

ba9b9681 fixed a PHP fatal error when calling a macro, imported in the template, in another macro
2019-05-16 14:15:37 +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 b5ad4c36cf Merge branch '1.x' into 2.x
* 1.x:
  tweaked error messages
  fixed wrong error message on "import" and "from"
  bumped version to 1.41.1-DEV
  prepared the 1.41.0 release
2019-05-16 11:42:35 +02:00
Fabien Potencier 0747f226f7 minor #3008 Tweak an error message (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak an error message

Commits
-------

19164de7 tweaked error messages
2019-05-16 11:37:12 +02:00
Fabien Potencier 19164de77b tweaked error messages 2019-05-16 11:32:52 +02:00
Fabien Potencier f81a1523c0 bug #3007 Fix wrong error message on "import" and "from" (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix wrong error message on "import" and "from"

Commits
-------

118462c1 fixed wrong error message on "import" and "from"
2019-05-16 11:28:20 +02:00