Commit Graph

4302 Commits

Author SHA1 Message Date
Fabien Potencier bafd5d26f2 updated CHANGELOG 2019-03-20 07:24:27 +01:00
Fabien Potencier 71375f2820 Merge branch '1.x' into 2.x
* 1.x:
  Allow Traversable objects to be used in the with tag
2019-03-20 07:23:53 +01:00
Fabien Potencier 02f8423a3a feature #2901 Allow Traversable objects to be used in the with tag (thewilkybarkid)
This PR was merged into the 1.x branch.

Discussion
----------

Allow Traversable objects to be used in the with tag

Currently `with` does an `in_array()` check, this allows `Traversable`~/`JsonSerializable`~ objects to be used as they can also contain a hash.

Commits
-------

572a2a09 Allow Traversable objects to be used in the with tag
2019-03-20 07:18:37 +01:00
Chris Wilkinson 572a2a09fd Allow Traversable objects to be used in the with tag 2019-03-19 14:21:09 +00:00
Fabien Potencier 712147f6f0 Merge branch '1.x' into 2.x
* 1.x:
  fixed typo
2019-03-19 14:08:27 +01:00
Fabien Potencier f0efbc5b20 fixed typo 2019-03-19 14:07:27 +01:00
Fabien Potencier 516571558a fixed BC break 2019-03-19 13:56:26 +01:00
Fabien Potencier 99cececaa2 feature #2904 Add some type hints (fabpot)
This PR was squashed before being merged into the 2.x branch (closes #2904).

Discussion
----------

Add some type hints

Commits
-------

6c91803a added some type hints on final classes
1dead738 added some type hints on constructors
241f95cb added some type hints on private methods
2019-03-19 12:57:21 +01:00
Fabien Potencier 6c91803a90 added some type hints on final classes 2019-03-19 12:40:46 +01:00
Fabien Potencier 1dead73882 added some type hints on constructors 2019-03-16 15:26:39 +01:00
Fabien Potencier 241f95cb25 added some type hints on private methods 2019-03-16 13:24:59 +01:00
Fabien Potencier 5aab10578e fixed wrong argument type in test 2019-03-16 12:03:28 +01:00
Fabien Potencier c0cd361fe6 removed dead code 2019-03-16 11:57:15 +01:00
Fabien Potencier b858bb6be6 fixed tests 2019-03-16 11:37:02 +01:00
Fabien Potencier d8a229b938 removed some usage of loadTemplate in tests 2019-03-16 11:33:46 +01:00
Fabien Potencier 672242e026 Merge branch '1.x' into 2.x
* 1.x:
  removed some usage of loadTemplate in tests
2019-03-16 11:33:35 +01:00
Fabien Potencier 931a8b5cdf removed some usage of loadTemplate in tests 2019-03-16 11:32:43 +01:00
Fabien Potencier d6df732a8b added a note about Environment::resolveTemplate in 3.0 2019-03-15 17:40:37 +01:00
Fabien Potencier 6d35153bd2 updated CHANGELOG 2019-03-15 17:32:56 +01:00
Fabien Potencier f5689b50e5 updated CHANGELOG 2019-03-15 17:31:30 +01:00
Fabien Potencier ee0df8d069 bug #2902 Fix BC break on Environment::resolveTemplate() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix BC break on Environment::resolveTemplate()

closes #2900

Commits
-------

b24d5256 fixed BC break on Environment::resolveTemplate()
2019-03-15 17:29:14 +01:00
Fabien Potencier b24d52565a fixed BC break on Environment::resolveTemplate() 2019-03-15 17:25:18 +01:00
Fabien Potencier a482da9fd0 bug #2899 Fixed spaceless filter (tifabien)
This PR was merged into the 1.x branch.

Discussion
----------

Fixed spaceless filter

As now the `spaceless` tag is deprecated, I tried to replace it by the new `spaceless` filter instead but it broke my application. Actually there is a difference between the tag and the filter. Spaceless tag trim also whistespace (or line feed).

I propose to do the same thing on the new filter.

Commits
-------

3412d1a5 Fixed spaceless filter
2019-03-14 14:57:20 +01:00
Fabien Lucas 3412d1a56a Fixed spaceless filter 2019-03-14 11:35:56 +01:00
Fabien Potencier e04a9a248f added some missing tests 2019-03-14 10:06:54 +01:00
Fabien Potencier 5e58f22d91 Merge branch '1.x' into 2.x
* 1.x:
  fixed the autoloader to take into account namespaced classes
  added some tests for the set tag
  bumped version to 1.38.3-DEV
  prepared the 1.38.2 release
2019-03-14 07:47:25 +01:00
Fabien Potencier df60e7003c bug #2896 Fix the autoloader to take into account namespaced classes (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix the autoloader to take into account namespaced classes

fixes #2895

Commits
-------

0c1d18b9 fixed the autoloader to take into account namespaced classes
2019-03-14 07:46:27 +01:00
Fabien Potencier 0c1d18b90a fixed the autoloader to take into account namespaced classes 2019-03-14 07:45:39 +01:00
Fabien Potencier 8c18e7d063 added some tests for the set tag 2019-03-13 10:57:08 +01:00
Fabien Potencier ab0374f82c bumped version to 2.7.3-DEV 2019-03-12 19:48:55 +01:00
Fabien Potencier 70c59531da prepared the 2.7.2 release v2.7.2 2019-03-12 19:48:26 +01:00
Fabien Potencier dae3b1cead bumped version to 1.38.3-DEV 2019-03-12 19:46:15 +01:00
Fabien Potencier 874adbd922 prepared the 1.38.2 release v1.38.2 2019-03-12 19:45:24 +01:00
Fabien Potencier 4718c92548 Merge branch '1.x' into 2.x
* 1.x:
  added TemplateWrapper::getTemplateName()
  bumped version to 1.38.2-DEV
  prepared the 1.38.1 release
2019-03-12 19:42:32 +01:00
Fabien Potencier c0d5991cf7 feature #2893 Add TemplateWrapper::getTemplateName() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add TemplateWrapper::getTemplateName()

closes #2892

Commits
-------

861066e5 added TemplateWrapper::getTemplateName()
2019-03-12 19:40:48 +01:00
Fabien Potencier 861066e50b added TemplateWrapper::getTemplateName() 2019-03-12 19:33:04 +01:00
Fabien Potencier b59a77e884 bumped version to 2.7.2-DEV 2019-03-12 16:47:45 +01:00
Fabien Potencier c0dd4dc5f4 prepared the 2.7.1 release v2.7.1 2019-03-12 16:45:07 +01:00
Fabien Potencier b0d8cd7788 bumped version to 1.38.2-DEV 2019-03-12 16:43:49 +01:00
Fabien Potencier 88fc6d1454 prepared the 1.38.1 release v1.38.1 2019-03-12 16:43:04 +01:00
Fabien Potencier 2e72beba5a updated CHANGELOG 2019-03-12 16:41:59 +01:00
Fabien Potencier 94887ffc15 Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
2019-03-12 16:41:45 +01:00
Fabien Potencier 675686844a updated CHANGELOG 2019-03-12 16:41:40 +01:00
Fabien Potencier 1d10d05775 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  force loading class aliases used in typehints
  bumped version to 1.38.1-DEV
  prepared the 1.38.0 release
2019-03-12 16:40:19 +01:00
Fabien Potencier fb19ea7dde fixed CS 2019-03-12 16:38:19 +01:00
Fabien Potencier dd22fe6f84 bug #2887 Force loading class aliases used in typehints (stof)
This PR was merged into the 1.x branch.

Discussion
----------

Force loading class aliases used in typehints

Fixes #2886

Commits
-------

65c05591 force loading class aliases used in typehints
2019-03-12 16:35:38 +01:00
Christophe Coevoet 65c0559125 force loading class aliases used in typehints 2019-03-12 15:24:00 +01:00
Fabien Potencier 2fe2f2d8bb bumped version to 2.7.1-DEV 2019-03-12 13:47:01 +01:00
Fabien Potencier 57bd838bb7 prepared the 2.7.0 release v2.7.0 2019-03-12 13:46:23 +01:00
Fabien Potencier 47297c2ae9 bumped version to 1.38.1-DEV 2019-03-12 13:43:05 +01:00