Commit Graph

22437 Commits

Author SHA1 Message Date
Nicolas Grekas
f8a7ddb9f8 minor #16684 [appveyor] Workaround transient segfault when APCu is enabled (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Workaround transient segfault when APCu is enabled

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

See e.g. https://ci.appveyor.com/project/nicolas-grekas/symfony/build/1.0.4#L1186

Commits
-------

12a152b [appveyor] Workaround transient segfault when APCu is enabled
2015-11-27 09:29:25 +01:00
Fabien Potencier
d65b92469e Merge branch '2.3' into 2.7
* 2.3:
  Fixed the wrong source name and the ja translation
  [SecurityBundle] disable the init:acl command if ACL is not used
  [DI] remove useless condition around unset
2015-11-27 06:41:56 +01:00
Fabien Potencier
12e63398fe minor #16700 Fixed the wrong source name and the ja translation (hainey)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16700).

Discussion
----------

Fixed the wrong source name and the ja translation

Commits
-------

90f3b94 Fixed the wrong source name and the ja translation
2015-11-27 06:41:09 +01:00
hainey
90f3b941d3 Fixed the wrong source name and the ja translation 2015-11-27 06:41:08 +01:00
Dariusz Ruminski
acef3a3b34 CS: remove impossible default argument value 2015-11-26 23:11:33 +01:00
Fabien Potencier
82b6ec192b bug #16695 [SecurityBundle] disable the init:acl command if ACL is not used (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] disable the init:acl command if ACL is not used

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

Related to #16694 but this should go in 2.3 IMO because it was just forgotten. The other acl command already has this logic: https://github.com/symfony/symfony/blob/2.7/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php#L36

It ensures the command list is not flooded with unusable commands.

Commits
-------

55f84a3 [SecurityBundle] disable the init:acl command if ACL is not used
2015-11-26 21:09:40 +01:00
Fabien Potencier
98f827beab minor #16664 [Debug] fix readme: DebugClassLoader moved to debug itself (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] fix readme: DebugClassLoader moved to debug itself

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/16663#discussion_r45866385
| License       | MIT
| Doc PR        | -

Commits
-------

123a300 [Debug] fix readme: DebugClassLoader moved to debug itself
2015-11-26 21:07:32 +01:00
Tobias Schultze
123a300ad7 [Debug] fix readme: DebugClassLoader moved to debug itself 2015-11-26 21:02:12 +01:00
Tobias Schultze
55f84a3369 [SecurityBundle] disable the init:acl command if ACL is not used 2015-11-26 20:19:29 +01:00
Fabien Potencier
fd140fc045 minor #16691 [DI] remove useless condition around unset (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[DI] remove useless condition around unset

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

478375d [DI] remove useless condition around unset
2015-11-26 19:04:30 +01:00
Tobias Schultze
478375d664 [DI] remove useless condition around unset 2015-11-26 18:53:25 +01:00
Fabien Potencier
99c05b3fc4 bug #16679 [Form] Disabled view data validation if "data_class" is set to null (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Disabled view data validation if "data_class" is set to null

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

After this PR, Form::setData() does not validate the view data anymore when "data_class" is set to `null`. This way it is possible to create fields with dynamic view data types (see #14877).

Commits
-------

f495410 [Form] Disabled view data validation if "data_class" is set to null
2015-11-26 18:18:04 +01:00
Nicolas Grekas
12a152b666 [appveyor] Workaround transient segfault when APCu is enabled 2015-11-26 16:12:01 +01:00
Nicolas Grekas
0a40b543e4 Merge branch '2.3' into 2.7
* 2.3:
  [HttpFoundation] Workaround HHVM rewriting HTTP response line

Conflicts:
	src/Symfony/Component/HttpFoundation/Response.php
2015-11-26 10:20:19 +01:00
Nicolas Grekas
5f93188dc0 bug #16676 [HttpFoundation] Workaround HHVM rewriting HTTP response line (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Workaround HHVM rewriting HTTP response line

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16481, #9365
| License       | MIT
| Doc PR        | -

Commits
-------

5013f98 [HttpFoundation] Workaround HHVM rewriting HTTP response line
2015-11-26 10:19:28 +01:00
Bernhard Schussek
f495410d25 [Form] Disabled view data validation if "data_class" is set to null 2015-11-26 10:11:54 +01:00
Nicolas Grekas
d1a50a2b61 Merge branch '2.3' into 2.7
* 2.3:
  Always enable clock-mock for HttpFoundation
  [ClassLoader] Fix parsing namespace when token_get_all() is missing
  Bug #16343 [Router] Too many Routes ?
2015-11-26 08:00:48 +01:00
Nicolas Grekas
5013f9895f [HttpFoundation] Workaround HHVM rewriting HTTP response line 2015-11-26 07:58:58 +01:00
Nicolas Grekas
7ddfc5fae9 minor #16670 Always enable clock-mock for HttpFoundation (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Always enable clock-mock for HttpFoundation

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

Commits
-------

1712086 Always enable clock-mock for HttpFoundation
2015-11-26 07:56:24 +01:00
Tobias Schultze
27327d3e4d bug #16668 [ClassLoader] Fix parsing namespace when token_get_all() is missing (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] Fix parsing namespace when token_get_all() is missing

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

Commits
-------

4a17c9e [ClassLoader] Fix parsing namespace when token_get_all() is missing
2015-11-25 20:26:50 +01:00
Nicolas Grekas
171208627d Always enable clock-mock for HttpFoundation 2015-11-25 19:15:39 +01:00
Nicolas Grekas
4a17c9e6af [ClassLoader] Fix parsing namespace when token_get_all() is missing 2015-11-25 18:16:22 +01:00
Nicolas Grekas
bece73aa27 bug #16386 Bug #16343 [Router] Too many Routes ? (jelte)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16386).

Discussion
----------

Bug #16343 [Router] Too many Routes ?

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/16343
| License       | MIT
| Doc PR        | N/A

Seems there is an issue when you have more than 7265 routes declared,
The routes are generated into the cached appDevUrlGenerator.php but php only loads the last 7265 elements of the array.

Commits
-------

0113ac3 Bug #16343 [Router] Too many Routes ?
2015-11-25 13:20:53 +01:00
Jelte Steijaert
0113ac3ce2 Bug #16343 [Router] Too many Routes ? 2015-11-25 13:20:52 +01:00
Nicolas Grekas
26ef430b5b bug #16651 [Debug] Ensure class declarations are loaded only once (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Ensure class declarations are loaded only once

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

Commits
-------

01c08fc [Debug] Ensure class declarations are loaded only once
2015-11-24 13:20:25 +01:00
Nicolas Grekas
01c08fccf4 [Debug] Ensure class declarations are loaded only once 2015-11-24 12:55:28 +01:00
Nicolas Grekas
6de2304c0b Merge branch '2.3' into 2.7
* 2.3:
  [travis] Disable xdebug on PHP7
  bumped Symfony version to 2.3.36
  updated VERSION for 2.3.35
  update CONTRIBUTORS for 2.3.35
  updated CHANGELOG for 2.3.35

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-11-24 08:32:22 +01:00
Nicolas Grekas
8d0ec00caa minor #16644 [travis] Disable xdebug on PHP7 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Disable xdebug on PHP7

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

Commits
-------

dfda5ce [travis] Disable xdebug on PHP7
2015-11-24 08:30:27 +01:00
Nicolas Grekas
dfda5ced7c [travis] Disable xdebug on PHP7 2015-11-24 08:24:59 +01:00
Fabien Potencier
fc0ee0efd5 bumped Symfony version to 2.7.8 2015-11-23 13:27:27 +01:00
Fabien Potencier
cc69dbd24b Merge pull request #16638 from fabpot/release-2.7.7
released v2.7.7
2015-11-23 12:58:08 +01:00
Fabien Potencier
d99f2410b3 updated VERSION for 2.7.7 2015-11-23 12:57:49 +01:00
Fabien Potencier
d386f9c302 updated CHANGELOG for 2.7.7 2015-11-23 12:57:39 +01:00
Fabien Potencier
03eb2e909d bumped Symfony version to 2.3.36 2015-11-23 12:27:40 +01:00
Fabien Potencier
8f52c651e4 Merge pull request #16634 from fabpot/release-2.3.35
released v2.3.35
2015-11-23 11:44:17 +01:00
Fabien Potencier
3b790dd0da updated VERSION for 2.3.35 2015-11-23 11:44:06 +01:00
Fabien Potencier
6836bc34b7 update CONTRIBUTORS for 2.3.35 2015-11-23 11:44:00 +01:00
Fabien Potencier
4e44295288 updated CHANGELOG for 2.3.35 2015-11-23 11:43:52 +01:00
Fabien Potencier
5edc71e2fc Merge branch '2.3' into 2.7
* 2.3:
  migrate session after remember me authentication
  prevent timing attacks in digest auth listener
  mitigate CSRF timing attack vulnerability
  fix potential timing attack issue
2015-11-23 11:34:14 +01:00
Fabien Potencier
f95078c409 security #16631 n/a (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

n/a

n/a

Commits
-------

f88e600 migrate session after remember me authentication
2015-11-23 11:22:15 +01:00
Fabien Potencier
c51977293a security #16630 n/a (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

n/a

n/a

Commits
-------

819aa54 prevent timing attacks in digest auth listener
557ea17 mitigate CSRF timing attack vulnerability
f1fd768 fix potential timing attack issue
2015-11-23 11:21:11 +01:00
Fabien Potencier
d12cf1904c fixed tests 2015-11-23 11:17:36 +01:00
Christian Flothmann
f88e600833 migrate session after remember me authentication 2015-11-23 11:04:06 +01:00
Christian Flothmann
819aa54fe4 prevent timing attacks in digest auth listener 2015-11-23 11:02:49 +01:00
Christian Flothmann
557ea17eeb mitigate CSRF timing attack vulnerability 2015-11-23 11:02:49 +01:00
Christian Flothmann
f1fd7686c5 fix potential timing attack issue 2015-11-23 11:02:49 +01:00
Nicolas Grekas
c91638f826 Merge branch '2.3' into 2.7
* 2.3:
  Sent out a status text for unknown HTTP headers.
  [DependencyInjection] Unescape parameters for all types of injection
2015-11-20 18:41:18 +01:00
Fabien Potencier
3dc2244187 bug #16588 Sent out a status text for unknown HTTP headers. (dawehner)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16588).

Discussion
----------

Sent out a status text for unknown HTTP headers.

* The HTTP RFC explains that header('HTTP/1.1 418 ') should be fine, see http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html#sec6.1
* Apache itself though is broken, see https://gist.github.com/anonymous/a863d7b493c4b09733ec

The fix is to sent out some status text, when we don't know a better text.

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

Commits
-------

eec6fbc Sent out a status text for unknown HTTP headers.
2015-11-19 17:24:58 +01:00
Daniel Wehner
eec6fbc768 Sent out a status text for unknown HTTP headers. 2015-11-19 17:24:57 +01:00
Fabien Potencier
f11e2e9601 bug #16295 [DependencyInjection] Unescape parameters for all types of injection (Nicofuma)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Unescape parameters for all types of injection

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

The parameters must be escaped when injected in the container.
But they are only unescaped when the container is dumped and when these parameters are used in the service constructor.
We need to unescape them every time their are injected (constructor, setter and property injection)

Commits
-------

331a046 [DependencyInjection] Unescape parameters for all types of injection
2015-11-19 17:18:46 +01:00