8e166f2dae
Merge branch '1.x' into 2.x
...
* 1.x:
improved the tag documentation
2019-02-27 08:39:53 +01:00
ea371bee81
minor #2853 Improve the tag documentation (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Improve the tag documentation
Commits
-------
ab02b24f
2019-02-27 08:39:35 +01:00
ab02b24f91
improved the tag documentation
2019-02-26 18:57:58 +01:00
62a1c66397
removed mentions of version 1.x in docs for 2.x
2019-02-25 09:39:24 +01:00
b2883a9885
Merge branch '1.x' into 2.x
...
* 1.x:
fixed wrong version in docs
2019-02-25 09:38:41 +01:00
4f9d21fbce
fixed wrong version in docs
2019-02-25 09:38:34 +01:00
56cab7674c
Merge branch '1.x' into 2.x
...
* 1.x:
improved documentation on tags
2019-02-25 09:36:05 +01:00
f0e30abd79
minor #2852 Improve documentation on tags (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Improve documentation on tags
Commits
-------
571cf6e9
2019-02-25 09:35:53 +01:00
571cf6e984
improved documentation on tags
2019-02-25 09:34:06 +01:00
e00241546d
minor #2851 Tweak some docs (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Tweak some docs
Commits
-------
a12e79b6
2019-02-24 10:13:35 +01:00
a12e79b6a9
tweaked some docs
2019-02-24 10:12:46 +01:00
eae31defba
Merge branch '1.x' into 2.x
...
* 1.x:
removed support forum in composer.json
2019-02-22 01:48:55 +01:00
3757418b88
removed support forum in composer.json
2019-02-22 01:48:47 +01:00
99011015fb
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typos
2019-02-17 19:30:43 +01:00
624ed711a2
fixed typos
2019-02-17 19:29:59 +01:00
9ab1f2efc2
Merge branch '1.x' into 2.x
...
* 1.x:
Fix undefined class Profile in templates
2019-02-17 18:14:01 +01:00
12dd9a4e3f
bug #2849 Fix undefined class Profile in templates (chalasr)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix undefined class Profile in templates
Fixes https://travis-ci.org/symfony/symfony/jobs/494506116 .
~~The calling line is https://github.com/twigphp/Twig/blob/2.x/lib/Twig/Profiler/Node/EnterProfile.php#L34 , let me know if we should just rollback to `new \Twig\Profiler\Profile()` there.~~ just reverted the failing line to its original state (using FQCN)
Commits
-------
c185a6e7
2019-02-17 18:13:04 +01:00
c185a6e7f8
Fix undefined class Profile in templates
2019-02-17 17:39:28 +01:00
5d596fa455
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
2019-02-17 11:05:01 +01:00
e7e1a71bd5
fixed CS
2019-02-17 11:04:35 +01:00
90d579e433
moved most FQCN to use statements
2019-02-17 11:01:18 +01:00
4f0876ea13
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
moved most FQCN to use statements
prepared use statements
2019-02-17 10:55:19 +01:00
e9919c2187
fixed CS
2019-02-17 10:53:37 +01:00
de61216493
prepared use statements
2019-02-17 10:48:17 +01:00
1e9c84adef
minor #2848 Use statements everywhere (fabpot)
...
This PR was squashed before being merged into the 1.x branch (closes #2848 ).
Discussion
----------
Use statements everywhere
Commits
-------
1ddb8253c92feb6a
2019-02-17 10:43:43 +01:00
1ddb825336
moved most FQCN to use statements
2019-02-17 10:37:46 +01:00
c92feb6ab9
prepared use statements
2019-02-17 10:31:45 +01:00
43fc1a8397
feature #2847 Deprecate the possibility to change the base template for generated templates (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Deprecate the possibility to change the base template for generated templates
Generated templates should be opaque and an implementation detail.
Commits
-------
3f71217f
2019-02-17 09:41:10 +01:00
3f71217f63
deprecated the possibility to change the base template for generated templates
2019-02-17 09:39:54 +01:00
e37d86fca9
minor #2846 Use ::class whenever possible (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Use ::class whenever possible
Commits
-------
725f9423
2019-02-16 19:24:46 +01:00
725f94233a
used ::class whenever possible
2019-02-16 19:20:58 +01:00
bcba477953
minor #2845 Move some more classes to namespaced ones (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Move some more classes to namespaced ones
Commits
-------
69f37c16
2019-02-16 19:20:09 +01:00
69f37c164b
moved some more classes to namespaced ones
2019-02-16 19:13:57 +01:00
b4eae7c197
moved to namespaced classes by default
2019-02-15 08:48:39 +01:00
d1596b6ccf
moved to namespaced classes by default
2019-02-15 08:44:47 +01:00
ff77e221e0
Merge branch '1.x' into 2.x
...
* 1.x:
moved to namespaced classes by default
fixed some class names
bumped version to 1.38
2019-02-15 08:34:23 +01:00
210fb60a0d
feature #2844 Use namespaced classes by default (fabpot)
...
This PR was squashed before being merged into the 1.x branch (closes #2844 ).
Discussion
----------
Use namespaced classes by default
Commits
-------
3632a46edb751d6266b708bd
2019-02-15 08:31:33 +01:00
3632a46e82
moved to namespaced classes by default
2019-02-15 08:28:49 +01:00
db751d62d3
fixed some class names
2019-02-15 08:28:49 +01:00
66b708bde8
bumped version to 1.38
2019-02-15 08:28:49 +01:00
f5ef60924a
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
fixed some PHPUnit assertions
2019-02-15 08:00:14 +01:00
966296ff42
fixed CS
2019-02-15 07:56:53 +01:00
7600efc010
minor #2843 Fix some PHPUnit assertions (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix some PHPUnit assertions
Commits
-------
40c6f1d1
2019-02-15 07:20:44 +01:00
40c6f1d1b9
fixed some PHPUnit assertions
2019-02-15 07:19:24 +01:00
1e4466523f
fixed CS
2019-02-15 06:19:39 +01:00
91ffc7fcef
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked PHP-CS-Fixer config
2019-02-15 06:19:26 +01:00
3ea04337b7
minor #2842 Tweak PHP-CS-Fixer config (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak PHP-CS-Fixer config
Commits
-------
98a15a89
2019-02-15 06:18:14 +01:00
98a15a8973
tweaked PHP-CS-Fixer config
2019-02-15 06:17:13 +01:00
3486de9e35
fixed CS
2019-02-15 06:06:19 +01:00
9b1ff6a90b
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
2019-02-15 06:05:53 +01:00
Fabien Potencier
Robin Chalas