34b7cea29e
fixed typo
2019-03-05 09:11:47 +01:00
5c10670cd4
feature #2864 Deprecate PSR-0 class names (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Deprecate PSR-0 class names
Commits
-------
5104936f
2019-03-05 08:55:22 +01:00
5104936ffc
deprecated PSR-0 class names
2019-03-05 08:53:08 +01:00
037ee67224
switched to namespace first, PSR-0 as a fallback
2019-03-05 08:14:45 +01:00
eca762f490
fixed tests for errors
2019-03-05 08:06:20 +01:00
540495d4b0
fixed Sandbox extension class name
2019-03-05 08:05:24 +01:00
33878edccd
fixed namespace typo
2019-03-05 08:05:24 +01:00
7e3c90dbbb
fixed class usage
2019-03-05 08:05:24 +01:00
eb8532a895
Merge branch '1.x' into 2.x
...
* 1.x:
switched to namespace first, PSR-0 as a fallback
fixed tests for errors
2019-03-05 06:58:56 +01:00
b6d17284cb
feature #2862 Switch to namespaces (fabpot)
...
This PR was squashed before being merged into the 1.x branch (closes #2862 ).
Discussion
----------
Switch to namespaces
Commits
-------
baa70287aae29ce8
2019-03-05 06:51:10 +01:00
baa70287f5
switched to namespace first, PSR-0 as a fallback
2019-03-04 21:33:40 +01:00
aae29ce833
fixed tests for errors
2019-03-04 20:21:44 +01:00
2fab2229d1
Merge branch '1.x' into 2.x
...
* 1.x:
fixed class usage
fixed deprecation warning when using the namespaced class for extensions
fixed namespace typo
fixed typo
2019-03-04 20:12:48 +01:00
b6ca450e23
minor #2861 Prepare the switch to namespaces (fabpot)
...
This PR was squashed before being merged into the 1.x branch (closes #2861 ).
Discussion
----------
Prepare the switch to namespaces
Commits
-------
0bc26324fb6d12f704e1634026cc50f5
2019-03-04 20:07:23 +01:00
67f09b4163
Merge branch '1.x' into 2.x
...
* 1.x:
removed PHP 5.4 code
2019-03-04 20:06:48 +01:00
0bc263247c
fixed class usage
2019-03-04 19:59:29 +01:00
fb6d12f721
fixed deprecation warning when using the namespaced class for extensions
2019-03-04 19:49:48 +01:00
04e1634047
fixed namespace typo
2019-03-04 18:38:09 +01:00
26cc50f5a5
fixed typo
2019-03-04 18:33:32 +01:00
3b98e82f37
minor #2860 Remove PHP 5.4 code (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Remove PHP 5.4 code
Commits
-------
1808776d
2019-03-04 18:33:14 +01:00
1808776de8
removed PHP 5.4 code
2019-03-04 18:28:16 +01:00
341b651e23
Merge branch '1.x' into 2.x
...
* 1.x:
clarify the type of returned loaders
2019-03-04 18:08:25 +01:00
6c55afeabb
minor #2859 clarify the type of returned loaders (xabbuh)
...
This PR was merged into the 1.x branch.
Discussion
----------
clarify the type of returned loaders
Commits
-------
0eb29aa5
2019-03-04 09:31:39 +01:00
0eb29aa514
clarify the type of returned loaders
2019-03-04 09:18:40 +01:00
5eb5ad9769
Merge branch '1.x' into 2.x
...
* 1.x:
added getLoaders() on the chain loader
Encourage using prepared statements
2019-03-03 20:50:09 +01:00
e57472d80a
feature #2858 Add getLoaders() on the chain loader (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Add getLoaders() on the chain loader
Commits
-------
31a549ce
2019-03-03 20:49:04 +01:00
31a549ce1e
added getLoaders() on the chain loader
2019-03-03 19:01:41 +01:00
8ebd8e90d5
minor #2855 Encourage using prepared statements (ntzm)
...
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2855 ).
Discussion
----------
Encourage using prepared statements
Although the previous code isn't vulnerable, it could be if copied and used to store user input.
Commits
-------
97d9dc04
2019-03-02 08:49:41 +01:00
97d9dc0404
Encourage using prepared statements
2019-03-02 08:49:36 +01:00
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
Fabien Potencier
Christian Flothmann
Nat Zimmermann
Robin Chalas