Commit Graph

23681 Commits

Author SHA1 Message Date
Fabien Potencier 45fe468074 Merge branch '2.8'
* 2.8:
  removed usage of the deprecated StringUtils::equals() method
  Fix: Resolve tempdir symlink, not working on OSX
  fixed tests
  migrate session after remember me authentication
  prevent timing attacks in digest auth listener
  mitigate CSRF timing attack vulnerability
  fix potential timing attack issue
  [WebProfilerBundle] Added a top left border radius to the minified to…
  [Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder
  [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase
  [Process] PhpExecutableFinder: add regression test
2015-11-23 11:41:47 +01:00
Fabien Potencier 2dbb75aef4 removed usage of the deprecated StringUtils::equals() method 2015-11-23 11:39:33 +01:00
Fabien Potencier 8a6da3f021 Merge branch '2.7' into 2.8
* 2.7:
  fixed tests
  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:41 +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 92f317971c bug #16633 [Filesystem] Fixed failing test due to tempdir symlink (toretto460)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #16633).

Discussion
----------

[Filesystem] Fixed failing test due to tempdir symlink

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

Fixes the failing test referred in #16632

Commits
-------

3aee6b9 Fix: Resolve tempdir symlink, not working on OSX
2015-11-23 11:19:46 +01:00
toretto460 3aee6b93e2 Fix: Resolve tempdir symlink, not working on OSX 2015-11-23 11:19:46 +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
Fabien Potencier 551d164b4f minor #16606 [Process] PhpExecutableFinder: add regression test (ogizanagi)
This PR was merged into the 2.8 branch.

Discussion
----------

[Process] PhpExecutableFinder: add regression test

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

I guess it won't be a shame to have this simple test after #16599 .

Commits
-------

576f802 [Process] PhpExecutableFinder: add regression test
2015-11-23 10:36:02 +01:00
Fabien Potencier 06959c045d bug #16607 [HttpFoundation] Delete not existing session handler proxy member (belka-ew)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[HttpFoundation] Delete not existing session handler proxy member

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

open() and close() SessionHandlerProxy method suse $this->active
that was removed from the parent AbstractProxy class after 2.8.

Commits
-------

b06b93f [HttpFoundation] Remove not existing class member
2015-11-23 10:33:29 +01:00
Fabien Potencier 922b9468b1 bug #16609 [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase

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

While trying to migrate Blackfire to 2.8-beta, I found this BC-break: by resetting the container on kernel shut-down, functional tests are broken when they need to use the container after a call to `$this->client->request()`. Broken because e.g . the session or the profiler state is lost between consecutive requests in the same test, and because a call to $container->get('kernel') throws a synthetic-related exception.

This PR fixes the BC-break by reverting to the <=2.7 behavior (not resetting the container on kernel shut-down), and moving resetting to the KernelTestCase.

Commits
-------

baad4da [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase
2015-11-23 10:32:50 +01:00
Fabien Potencier 43d82e7845 minor #16628 [WebProfilerBundle] Added a top left border radius to the minified to… (Jelle Kapitein)
This PR was squashed before being merged into the 2.8 branch (closes #16628).

Discussion
----------

[WebProfilerBundle] Added a top left border radius to the minified to…

| 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

The minified toolbar (to us at least) looked very out of place in all of our projects. Adding a border radius to the top left fixes that.

Chrome 46
![schermafbeelding 2015-11-23 om 09 29 06](https://cloud.githubusercontent.com/assets/6209772/11332470/41240b96-91c6-11e5-9d03-4738ff213295.png)

Firefox 42
![schermafbeelding 2015-11-23 om 09 29 53](https://cloud.githubusercontent.com/assets/6209772/11332476/55fbf574-91c6-11e5-898b-1ba2590a813b.png)

Safari 9
![schermafbeelding 2015-11-23 om 09 30 33](https://cloud.githubusercontent.com/assets/6209772/11332485/6351525a-91c6-11e5-8cbc-14b7efd82ce0.png)

Cannot test on IE/Edge at the moment, will be able to later today.

(The screenshots do not have commit 0459912523)

Commits
-------

ca9f446 [WebProfilerBundle] Added a top left border radius to the minified to…
2015-11-23 10:30:31 +01:00
Jelle Kapitein ca9f446f03 [WebProfilerBundle] Added a top left border radius to the minified to… 2015-11-23 10:30:25 +01:00
Fabien Potencier 57e0468cc3 bug #16477 [Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder (weaverryan)
This PR was squashed before being merged into the 2.8 branch (closes #16477).

Discussion
----------

[Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder

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

Based on conversation starting here: https://github.com/symfony/symfony/pull/15990#issuecomment-154081718.

```php
// Before:
$routes->mount('/admin', $routes->import(__DIR__.'/config/admin.yml');

// After:
$routes->import(__DIR__.'/config/admin.yml', '/admin');
```

This makes `import()` actually add the `RouteCollectionBuilder` into itself. We didn't do this before at Fabien's request, and actually the current implementation (before this PR) is quite "clean". However, I agree with @WouterJ that `import()` really sounds/looks like it will actually *import* those routes *into* this `RouteCollectionBuilder`.

This change is subjective - we just need to pick which way we like better and run full steam with it.

Commits
-------

8feb9ef [Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder
2015-11-23 10:29:40 +01:00
Ryan Weaver 8feb9ef080 [Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder 2015-11-23 10:29:39 +01:00
Nicolas Grekas 4d2ea16b90 Merge branch '2.8'
* 2.8:
  Add Spanish translation for BIC validator
  Added translation for BIC validator
  Sent out a status text for unknown HTTP headers.
  [DependencyInjection] Unescape parameters for all types of injection
  [Process] Fix trailing space in PHP binary finder
  Remove tmp addition of zend-stdlib
  [WebProfilerBundle] Fix minitoolbar height
  [Form] Fix ResolvedFormType deprecation notices
  [Serializer] add missing unit tests related to Encoder
  add it back

Conflicts:
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Component/Form/ResolvedFormType.php
2015-11-20 18:45:52 +01:00
Nicolas Grekas fe6e9e4543 Merge branch '2.7' into 2.8
* 2.7:
  Sent out a status text for unknown HTTP headers.
  [DependencyInjection] Unescape parameters for all types of injection
2015-11-20 18:41:52 +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 02c31ad773 minor #16610 Add Spanish translation for BIC validator (ajgarlag)
This PR was merged into the 2.8 branch.

Discussion
----------

Add Spanish translation for BIC validator

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

Commits
-------

357dea1 Add Spanish translation for BIC validator
2015-11-20 15:39:26 +01:00
Fabien Potencier 34f5823d06 minor #16608 Added translation for BIC validator (jaytaph)
This PR was merged into the 2.8 branch.

Discussion
----------

Added translation for BIC validator

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

Commits
-------

a591ba3 Added translation for BIC validator
2015-11-20 15:38:03 +01:00
Antonio J. García Lagar 357dea1ea8 Add Spanish translation for BIC validator 2015-11-20 14:32:45 +01:00
Nicolas Grekas baad4da9b7 [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase 2015-11-20 13:20:48 +01:00
Joshua Thijssen a591ba3d80 Added translation for BIC validator 2015-11-20 11:06:22 +01:00
ogizanagi 576f802917 [Process] PhpExecutableFinder: add regression test 2015-11-20 08:33:53 +01:00
Fabien Potencier b6857ba405 minor #16557 [Serializer] add missing unit tests related to Encoder (FlorianLB)
This PR was merged into the 2.8 branch.

Discussion
----------

[Serializer] add missing unit tests related to Encoder

Add some missing unit tests on the Serializer component.

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

Commits
-------

7418d29 [Serializer] add missing unit tests related to Encoder
2015-11-20 07:33:45 +01:00
Eugene Wissner b06b93fd30 [HttpFoundation] Remove not existing class member
open() and close() SessionHandlerProxy method suse $this->active
that was removed from the parent AbstractProxy class after 2.8.
2015-11-20 04:02:44 +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 4e1fffe016 bug #16377 [WebProfilerBundle] Fix minitoolbar height (rvanlaak)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfilerBundle] Fix minitoolbar height

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

The height of the minimized toolbar icon was a bit off. This change makes sure the icon has the same height as the toolbar itself.

Commits
-------

0459912 [WebProfilerBundle] Fix minitoolbar height
2015-11-19 17:15:38 +01:00
Fabien Potencier 5a17f80858 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix trailing space in PHP binary finder
  Remove tmp addition of zend-stdlib
2015-11-19 17:12:55 +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
Richard 0459912523 [WebProfilerBundle] Fix minitoolbar height 2015-11-19 10:07:51 +01:00
Tobias Schultze a22a43636f minor #16592 [Form] Fix ResolvedFormType deprecation notices (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fix ResolvedFormType deprecation notices

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

Commits
-------

baafb7a [Form] Fix ResolvedFormType deprecation notices
2015-11-19 00:57:27 +01:00
Nicolas Grekas baafb7a88b [Form] Fix ResolvedFormType deprecation notices 2015-11-18 19:46:46 +01:00
Fabien Potencier 36bf7069ac bug #16585 Add support for HTTP status code 418 back (dawehner)
This PR was merged into the 2.8 branch.

Discussion
----------

Add support for HTTP status code 418 back

See https://gist.github.com/anonymous/a863d7b493c4b09733ec what this results into

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

Commits
-------

db5fbe0 add it back
2015-11-18 18:36:10 +01:00
Nicolas Grekas dba51b40fc Merge branch '2.8'
* 2.8:
  [Process] Fix PhpProcess with phpdbg runtime

Conflicts:
	src/Symfony/Bridge/ProxyManager/composer.json
2015-11-18 17:57:58 +01:00
Nicolas Grekas 7748b05747 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix PhpProcess with phpdbg runtime

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
2015-11-18 17:56:24 +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