Commit Graph

22421 Commits

Author SHA1 Message Date
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
Fabien Potencier
16fb7016c8 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix trailing space in PHP binary finder
  Remove tmp addition of zend-stdlib
2015-11-19 17:11:24 +01:00
Tristan Darricau
331a0469c1 [DependencyInjection] Unescape parameters for all types of injection 2015-11-19 15:08:33 +01:00
Nicolas Grekas
1728dcca82 minor #16599 [Process] Fix trailing space in PHP binary finder (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix trailing space in PHP binary finder

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

Commits
-------

f15e6e0 [Process] Fix trailing space in PHP binary finder
2015-11-19 13:57:32 +01:00
Nicolas Grekas
f15e6e0ba9 [Process] Fix trailing space in PHP binary finder 2015-11-19 13:49:26 +01:00
Nicolas Grekas
49aa6d4351 minor #16595 Remove tmp addition of zend-stdlib (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove tmp addition of zend-stdlib

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

Reverts #16553

Commits
-------

6e015e7 Remove tmp addition of zend-stdlib
2015-11-19 13:48:26 +01:00
Nicolas Grekas
6e015e7e0e Remove tmp addition of zend-stdlib 2015-11-19 13:33:53 +01:00
Nicolas Grekas
aa82cd338a Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix PhpProcess with phpdbg runtime

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
2015-11-18 17:27:55 +01:00
Nicolas Grekas
a05e73fa47 bug #16574 [Process] Fix PhpProcess with phpdbg runtime (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix PhpProcess with phpdbg runtime

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

With this PR, I'm able to successfully run the test suite of the Process component using
`phpdbg -qrr ./phpunit src/Symfony/Component/Process/`

Commits
-------

9669238 [Process] Fix PhpProcess with phpdbg runtime
2015-11-18 17:26:24 +01:00
Nicolas Grekas
9669238af6 [Process] Fix PhpProcess with phpdbg runtime 2015-11-18 16:41:59 +01:00
Nicolas Grekas
a8d21b5ca9 Merge branch '2.3' into 2.7
* 2.3:
  Fix undefined array $server
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Add missing exclusions from phpunit.xml.dist
  Fix the server variables in the router_*.php files
  [Validator] Allow an empty path with a non empty fragment or a query
  The following change adds support for Armenian pluralization.
  [2.3][Process] fix Proccess run with pts enabled

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
	src/Symfony/Component/Security/phpunit.xml.dist
2015-11-18 14:41:01 +01:00
Fabien Potencier
6f72d6346e minor #16580 Add missing exclusions from phpunit.xml.dist (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Add missing exclusions from phpunit.xml.dist

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

Commits
-------

d4880c4 Add missing exclusions from phpunit.xml.dist
2015-11-18 11:16:24 +01:00
Fabien Potencier
a4ea881109 minor #16566 [HttpFoundation] Fix undefined array $server (belka-ew)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16566).

Discussion
----------

[HttpFoundation] Fix undefined array $server

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

$server variable isn't defined in the test /src/Symfony/Component/HttpFoundation/Tests/RequestTest.php:RequestTest

Commits
-------

75aa6f6 Fix undefined array $server
2015-11-18 11:13:04 +01:00
Eugene Wissner
75aa6f68f8 Fix undefined array $server 2015-11-18 11:13:04 +01:00
Fabien Potencier
2cbf8221e6 bug #16578 [Console] Fix bug in windows detection (kbond)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #16578).

Discussion
----------

[Console] Fix bug in windows detection

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

Commits
-------

c4068d9 Fix bug in windows detection
2015-11-18 10:54:27 +01:00
Kevin Bond
c4068d923d Fix bug in windows detection 2015-11-18 10:54:26 +01:00
Nicolas Grekas
040b4095fa minor #16553 [ProxyManager] Tmp fix composer reqs issue in ZF (nicolas-grekas)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16553).

Discussion
----------

[ProxyManager] Tmp fix composer reqs issue in ZF

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

See https://github.com/Ocramius/ProxyManager/issues/260#issuecomment-156962918

Commits
-------

0125145 [ProxyManager] Tmp fix composer reqs issue in ZF
2015-11-18 10:04:25 +01:00