Commit Graph

3214 Commits

Author SHA1 Message Date
Fabien Potencier
ceae3bf16c fixed CS 2017-09-11 14:23:01 -07:00
Fabien Potencier
e844b640de Merge branch '2.8' into 3.3
* 2.8:
  [CS] Apply phpdoc_annotation_without_dot
2017-09-11 13:43:11 -07:00
Fabien Potencier
4e1c65c6f9 Merge branch '2.7' into 2.8
* 2.7:
  [CS] Apply phpdoc_annotation_without_dot
2017-09-11 13:39:16 -07:00
Dariusz
7a97b49436 [CS] Apply phpdoc_annotation_without_dot 2017-09-11 13:37:52 -07:00
Fabien Potencier
9570a454ef bumped Symfony version to 3.3.10 2017-09-11 09:45:56 -07:00
Fabien Potencier
b9c93f1faa updated VERSION for 3.3.9 2017-09-11 09:13:23 -07:00
Nicolas Grekas
b9c6928d7e [HttpKernel] "controller.service_arguments" services should be public 2017-09-07 14:08:26 +02:00
Fabien Potencier
9280ca429e bumped Symfony version to 3.3.9 2017-08-28 15:49:36 -07:00
Fabien Potencier
bad5b6293d updated VERSION for 3.3.8 2017-08-28 15:35:03 -07:00
Fabien Potencier
0b46166174 bumped Symfony version to 3.3.8 2017-08-28 13:30:14 -07:00
Fabien Potencier
8a33ecb058 updated VERSION for 3.3.7 2017-08-28 12:34:14 -07:00
Fabien Potencier
e313e69e98 bumped Symfony version to 2.8.28 2017-08-28 12:33:37 -07:00
Fabien Potencier
527e171383 updated VERSION for 2.8.27 2017-08-28 12:21:40 -07:00
Fabien Potencier
bc4e01500b bumped Symfony version to 2.7.35 2017-08-28 12:18:16 -07:00
Fabien Potencier
0f45d7963a updated VERSION for 2.7.34 2017-08-28 11:40:36 -07:00
Nicolas Grekas
d32c7060f1 Merge branch '2.8' into 3.3
* 2.8:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  Fix testHtml method with regexp
2017-08-15 15:31:09 +02:00
Nicolas Grekas
6434a00f10 Merge branch '2.7' into 2.8
* 2.7:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  Fix testHtml method with regexp
2017-08-15 15:30:53 +02:00
Nicolas Grekas
0a3dc11af9 [HttpKernel] Clean test directory on tear down 2017-08-15 15:06:19 +02:00
Nicolas Grekas
99806c5da3 minor #23803 [HttpKernel] Remove isset call used for legacy (ogizanagi)
This PR was merged into the 3.3 branch.

Discussion
----------

[HttpKernel] Remove isset call used for legacy

| Q             | A
| ------------- | ---
| Branch?       | 3.3 <!-- see comment below -->
| Bug fix?      | no
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | N/A <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

Added in #9628 in which the request stack dependency was nullable. Forgotten to be removed in #14634.

Commits
-------

e0a6010 [HttpKernel] Remove isset call used for legacy
2017-08-07 08:27:12 +02:00
Nicolas Grekas
049785b11b Merge branch '2.8' into 3.3
* 2.8:
  Github template: Remove EOM 3.2 from branch suggestion
  [Security] Fix security.interactive_login event const doc block
  Avoid infinite loops when profiler data is malformed
  [HttpFoundation] Generate safe fallback filename for wrongly encoded filename
2017-08-06 15:42:17 +02:00
Nicolas Grekas
684975ddf3 Merge branch '2.7' into 2.8
* 2.7:
  Github template: Remove EOM 3.2 from branch suggestion
  [Security] Fix security.interactive_login event const doc block
  Avoid infinite loops when profiler data is malformed
  [HttpFoundation] Generate safe fallback filename for wrongly encoded filename
2017-08-06 15:41:54 +02:00
Maxime Steinhausser
e0a601092b [HttpKernel] Remove isset call used for legacy 2017-08-06 14:00:34 +02:00
Javier Eguiluz
e5ef9fb74a Avoid infinite loops when profiler data is malformed 2017-08-03 22:11:44 +02:00
Nicolas Grekas
52cf7657d0 bug #23703 Bump minimal PHP version to ^5.5.9|>=7.0.8 (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

Bump minimal PHP version to ^5.5.9|>=7.0.8

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #22973
| License       | MIT
| Doc PR        | -

As spotted in the linked issue, because of https://bugs.php.net/72229.

Commits
-------

2282a6f Bump minimal PHP version to ^5.5.9|>=7.0.8
2017-08-03 10:59:45 +02:00
Fabien Potencier
468b44a031 bumped Symfony version to 3.3.7 2017-08-01 13:24:30 +02:00
Fabien Potencier
cb1835aa28 updated VERSION for 3.3.6 2017-08-01 12:25:59 +02:00
Fabien Potencier
6f05bebe1f bumped Symfony version to 2.8.27 2017-08-01 11:29:28 +02:00
Fabien Potencier
d2e8f38a78 updated VERSION for 2.8.26 2017-08-01 11:05:02 +02:00
Fabien Potencier
8acbd12a24 bumped Symfony version to 2.7.34 2017-08-01 09:21:40 +02:00
Fabien Potencier
b30d34baf6 updated VERSION for 2.7.33 2017-08-01 09:07:03 +02:00
Nicolas Grekas
2282a6f895 Bump minimal PHP version to ^5.5.9|>=7.0.8 2017-07-29 23:54:42 +02:00
Fabien Potencier
5c2797afd3 bumped Symfony version to 3.3.6 2017-07-17 21:17:46 +02:00
Fabien Potencier
d7d9a07917 updated VERSION for 3.3.5 2017-07-17 21:08:23 +02:00
Fabien Potencier
53b8579bec bumped Symfony version to 2.8.26 2017-07-17 20:14:06 +02:00
Fabien Potencier
5836f0ea64 updated VERSION for 2.8.25 2017-07-17 20:00:03 +02:00
Fabien Potencier
3d4e143619 bumped Symfony version to 2.7.33 2017-07-17 19:58:04 +02:00
Fabien Potencier
f01f3d328a updated VERSION for 2.7.32 2017-07-17 19:33:19 +02:00
Maxime Steinhausser
34e7094d3d [Profiler] Fix data collector getCasters() call 2017-07-15 09:52:13 +02:00
Nicolas Grekas
754d3a7568 [HttpKernel][VarDumper] Truncate profiler data & optim perf 2017-07-10 16:18:27 +02:00
Fabien Potencier
94b6ec3092 bumped Symfony version to 3.3.5 2017-07-05 16:59:31 +03:00
Fabien Potencier
e81d5d17d6 updated VERSION for 3.3.4 2017-07-05 16:28:15 +03:00
Nicolas Grekas
70bd2bc41b [VarDumper] Reduce size of serialized Data objects 2017-07-05 16:02:37 +03:00
Fabien Potencier
15df829a83 bumped Symfony version to 2.8.25 2017-07-05 12:39:23 +03:00
Fabien Potencier
bf1be0e08f updated VERSION for 2.8.24 2017-07-05 11:52:59 +03:00
Fabien Potencier
39fc4ddec7 bumped Symfony version to 2.7.32 2017-07-05 11:52:01 +03:00
Fabien Potencier
beee4332a1 updated VERSION for 2.7.31 2017-07-05 10:16:12 +03:00
Fabien Potencier
d879eed12a fixed bad merge 2017-07-05 09:33:38 +03:00
Fabien Potencier
ecaae2368d Merge branch '2.7' into 2.8
* 2.7:
  [FrameworkBundle] Do not remove files from assets dir
  bumped Symfony version to 2.7.31
  updated VERSION for 2.7.30
  update CONTRIBUTORS for 2.7.30
  updated CHANGELOG for 2.7.30
2017-07-05 09:32:23 +03:00
Fabien Potencier
5de56eba9a bumped Symfony version to 3.3.4 2017-07-04 09:15:40 +03:00
Fabien Potencier
5d8d746a10 updated VERSION for 3.3.3 2017-07-04 09:02:59 +03:00