5b1f41b855
Merge branch '2.x' into 3.x
...
* 2.x:
fixed markup in docs
fixed markup in docs
fixed typo
fixed CS
fixed typo
2019-08-10 16:16:55 +02:00
5168c0e2fe
fixed markup in docs
2019-08-10 16:16:47 +02:00
1e7ca11c0f
fixed markup in docs
2019-08-10 16:14:01 +02:00
d3ee0f7479
fixed typo
2019-08-10 16:12:34 +02:00
42611d7c40
fixed CS
2019-08-10 16:11:58 +02:00
b41eb45c3b
fixed typo
2019-08-10 16:08:18 +02:00
fdf44d29d8
Merge branch '2.x' into 3.x
...
* 2.x:
added the Intl extension
2019-08-10 16:03:35 +02:00
f67b567ca2
feature #3108 Add an Intl extension (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add an Intl extension
This new Intl extension is made of 2 parts: one is about formatting dates/currencies/numbers (which is what we already have partially in twig-extensions) and the second part is about ICU data as available in Symfony 4.3+.
I've decided to put this extension into Twig instead of the Symfony bridge because of the functions that do not rely on Symfony (and I wanted everything in the same place). Also, some Twig features now depends on some external libraries, so it makes more sense now than a few years ago where Twig had no external dependencies. Last, but not least, intl is an important topic, and I think it deserves to be a Twig first class citizen.
TODO:
- [x] add documentation
- [ ] what do we want to do with the existing `date` and `number_format` filters?
closes https://github.com/symfony/symfony/pull/20053
closes #2567
closes https://github.com/symfony/symfony/issues/13641
closes https://github.com/twigphp/Twig-extensions/pull/134
closes https://github.com/twigphp/Twig-extensions/pull/137
closes https://github.com/twigphp/Twig-extensions/pull/183
closes https://github.com/twigphp/Twig-extensions/pull/229
closes https://github.com/twigphp/Twig-extensions/issues/167
closes https://github.com/twigphp/Twig-extensions/issues/211
Commits
-------
03d93aac
2019-08-10 16:01:08 +02:00
03d93aace8
added the Intl extension
2019-08-10 15:59:48 +02:00
c4279abb1f
Merge branch '2.x' into 3.x
...
* 2.x:
disabled some tests that are not compatible with pHp 7.4 yet
fixed typos
2019-08-10 15:49:59 +02:00
0a1c0f6d7c
minor #3120 Disable some tests that are not compatible with pHp 7.4 yet (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Disable some tests that are not compatible with pHp 7.4 yet
Commits
-------
7fedcba5
2019-08-10 15:49:38 +02:00
7fedcba568
disabled some tests that are not compatible with pHp 7.4 yet
2019-08-10 15:48:29 +02:00
3d5d053238
fixed typos
2019-08-10 15:14:08 +02:00
6b9c3aeacd
Merge branch '2.x' into 3.x
...
* 2.x:
fixed wrong class usage
made a class final
added suggestions for extra extensions
fixed path
added missing dep
fixed Travis config
fixed config/ directory in extra bundle
Revamping bundle structure to not mix source code with config files
Fix PHPDoc of twig_get_attribute()
2019-08-10 14:59:35 +02:00
f3355fe878
fixed wrong class usage
2019-08-10 14:59:27 +02:00
51242d807f
made a class final
2019-08-10 14:48:51 +02:00
19a1487f85
feature #3118 Add suggestions for extra extensions (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add suggestions for extra extensions
Commits
-------
908eef05
2019-08-10 14:32:15 +02:00
908eef05de
added suggestions for extra extensions
2019-08-10 14:29:58 +02:00
879d1b1e76
fixed path
2019-08-10 14:29:31 +02:00
a8ccf22d4b
added missing dep
2019-08-10 14:21:21 +02:00
af1ead5014
fixed Travis config
2019-08-10 14:19:10 +02:00
2658b4a390
fixed config/ directory in extra bundle
2019-08-10 14:18:25 +02:00
43a7e3ae09
minor #3119 Revamping bundle structure to not mix source code with config files (yceruto)
...
This PR was merged into the 2.x branch.
Discussion
----------
Revamping bundle structure to not mix source code with config files
Still compatible with any Symfony version.
Commits
-------
f24f057a
2019-08-10 14:11:12 +02:00
f24f057a15
Revamping bundle structure to not mix source code with config files
2019-08-10 08:00:43 -04:00
8374211dd8
minor #3117 Fix PHPDoc of twig_get_attribute() (szepeviktor)
...
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead (closes #3117 ).
Discussion
----------
Fix PHPDoc of twig_get_attribute()
@fabpot Repel the attack of the French keyboard
props. @phpstan
Commits
-------
1aa7dbff
2019-08-10 13:39:14 +02:00
1aa7dbff35
Fix PHPDoc of twig_get_attribute()
...
Repel the attack of the French keyboard
2019-08-10 13:39:07 +02:00
6e3fa76d71
fixed bad merge
2019-08-10 11:56:26 +02:00
f8d0cb73f6
Merge branch '2.x' into 3.x
...
* 2.x:
fixed composer.json
2019-08-10 11:55:29 +02:00
33fbbe5097
fixed composer.json
2019-08-10 11:50:28 +02:00
c3a6f3cf31
Merge branch '2.x' into 3.x
...
* 2.x:
added the Markdown extension
2019-08-10 11:31:32 +02:00
5d6205ba90
feature #3115 Add the Markdown extension (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add the Markdown extension
Commits
-------
741ea46e
2019-08-10 11:29:54 +02:00
741ea46e02
added the Markdown extension
2019-08-10 11:29:35 +02:00
32ef272559
Merge branch '2.x' into 3.x
...
* 2.x:
fixed package name
2019-08-10 11:25:12 +02:00
f8c0c76f46
fixed package name
2019-08-10 11:23:15 +02:00
4b152df5a1
Merge branch '2.x' into 3.x
...
* 2.x:
fixed Travis
2019-08-10 11:21:39 +02:00
2e3aa4f7ec
fixed Travis
2019-08-10 11:21:33 +02:00
6d14d9c9db
Merge branch '2.x' into 3.x
...
* 2.x:
fixed HTML extension
2019-08-10 11:13:02 +02:00
be629b591b
bug #3116 Fix HTML extension (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix HTML extension
Commits
-------
5cc40a06
2019-08-10 11:08:29 +02:00
5cc40a06f1
fixed HTML extension
2019-08-10 11:07:38 +02:00
41ab8b9699
Merge branch '2.x' into 3.x
...
* 2.x:
moved the HTML extension to an external Composer package
2019-08-10 07:48:25 +02:00
40fa5ea8ab
feature #3113 move the HTML extension to an external Composer package (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
move the HTML extension to an external Composer package
Commits
-------
59bb9d10
2019-08-10 07:41:42 +02:00
59bb9d1033
moved the HTML extension to an external Composer package
2019-08-08 18:10:45 +02:00
5b300ea457
Merge branch '2.x' into 3.x
...
* 2.x:
added an entry to .gitignore
2019-08-08 18:07:37 +02:00
f07a7f388d
Merge branch '1.x' into 2.x
...
* 1.x:
added an entry to .gitignore
2019-08-08 18:07:29 +02:00
a8c77b85a7
added an entry to .gitignore
2019-08-08 18:07:23 +02:00
879fb0adcc
Merge branch '2.x' into 3.x
...
* 2.x:
removed usage of getmockBuilder() when not needed
removed usage of getmockBuilder() when not needed
2019-08-08 13:35:34 +02:00
c7b0a459ca
removed usage of getmockBuilder() when not needed
2019-08-08 13:34:04 +02:00
656c295ed9
Merge branch '1.x' into 2.x
...
* 1.x:
removed usage of getmockBuilder() when not needed
2019-08-08 13:33:07 +02:00
3ee934ef45
minor #3112 Remove usage of getmockBuilder() when not needed (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Remove usage of getmockBuilder() when not needed
/cc @jderusse
Commits
-------
5861a539
2019-08-08 12:14:28 +02:00
5861a539e4
removed usage of getmockBuilder() when not needed
2019-08-08 11:59:51 +02:00
Fabien Potencier
Yonel Ceruto
Viktor Szépe