geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-17 21:07:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,319 Commits 10 Branches 273 Tags
ce396b4f80d570b2e4a07d3e75698ac9bd5217a8
Commit Graph

4319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier ce396b4f80 Merge branch '1.x' into 2.x 
* 1.x:
  refactored the implementation of dump()
 2019-03-23 14:35:29 +01:00
Fabien Potencier 4f77fd5b48 minor #2912 Refactor the implementation of dump() (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Refactor the implementation of dump()

Commits
-------

243021e6 refactored the implementation of dump()
 2019-03-23 14:32:18 +01:00
Fabien Potencier 243021e690 refactored the implementation of dump() 2019-03-23 14:27:39 +01:00
Fabien Potencier c468c93d2a minor #2910 fix(with): comment some strings (Kocal) 
This PR was squashed before being merged into the 2.x branch (closes #2910).

Discussion
----------

fix(with): comment some strings

I don't know if it was intentional or not, but I find the following screenshot weird:
![Sélection_027](https://user-images.githubusercontent.com/2103975/54807668-404eb100-4c7e-11e9-8407-526f1e443414.jpg)

I think it's better with a comment instead:
![Sélection_028](https://user-images.githubusercontent.com/2103975/54807638-2ad98700-4c7e-11e9-918a-257af3baf8e1.jpg)

What do you think?

Commits
-------

aca6e2cd fix(with): comment some strings
 2019-03-22 08:50:14 +01:00
Hugo Alliaume aca6e2cd44 fix(with): comment some strings 2019-03-22 08:50:06 +01:00
Fabien Potencier e6d2f8b33d bumped version to 2.7.4-DEV 2019-03-21 15:53:34 +01:00
Fabien Potencier 52b9a5bd41 prepared the 2.7.3 release v2.7.3 2019-03-21 15:53:02 +01:00
Fabien Potencier f32fb00c93 Merge branch '1.x' into 2.x 
* 1.x:
  bumped version to 1.38.4-DEV
  prepared the 1.38.3 release
 2019-03-21 15:51:35 +01:00
Fabien Potencier deab8a7745 bumped version to 1.38.4-DEV 2019-03-21 15:50:42 +01:00
Fabien Potencier 5df0ef0ca2 prepared the 1.38.3 release v1.38.3 2019-03-21 15:50:13 +01:00
Fabien Potencier 072214b6e3 updated CHANGELOG 2019-03-21 15:30:04 +01:00
Fabien Potencier 60687e8051 Merge branch '1.x' into 2.x 
* 1.x:
  Allow Traversable objects to be used in the with keyword of the include and embed tags
 2019-03-21 15:29:37 +01:00
Fabien Potencier 01f39731da feature #2909 Allow Traversable objects to be used in the with keyword of the include and embed tags (thewilkybarkid) 
This PR was squashed before being merged into the 1.x branch (closes #2909).

Discussion
----------

Allow Traversable objects to be used in the with keyword of the include and embed tags

Same as #2901 but for `include` and `embed`.

Commits
-------

068306fe Allow Traversable objects to be used in the with keyword of the include and embed tags
 2019-03-21 15:27:58 +01:00
Chris Wilkinson 068306feb9 Allow Traversable objects to be used in the with keyword of the include and embed tags 2019-03-21 15:27:53 +01:00
Fabien Potencier 1ea78e2893 Merge branch '1.x' into 2.x 
* 1.x:
  fixed phpunit configuration
  removed debug code
 2019-03-20 19:24:24 +01:00
Fabien Potencier 6cd3a72f26 fixed phpunit configuration 2019-03-20 19:20:34 +01:00
Fabien Potencier 828e82d07b removed debug code 2019-03-20 19:20:25 +01:00
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