Commit Graph

15630 Commits

Author SHA1 Message Date
Bernhard Schussek
18113672c1 [Process] Renamed flushOutput() and flushErrorOutput() to clearOutput() and clearErrorOutput() 2013-10-30 13:27:00 +01:00
Fabien Potencier
23f12faa53 fixed CS 2013-10-30 09:33:58 +01:00
Fabien Potencier
9138e1a64c Merge branch '2.3'
* 2.3:
  fixed CS
  fixed CS
  [HttpKernel] fixed memory limit display in MemoryDataCollector
  Fixed the error handling when decoding invalid XML to avoid a Warning
  [Form] Fixed: The "data" option is taken into account even if it is NULL
  [DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
2013-10-30 09:31:46 +01:00
Fabien Potencier
61dd06ea27 fixed CS 2013-10-30 09:30:20 +01:00
Fabien Potencier
43f749e507 Merge branch '2.2' into 2.3
* 2.2:
  fixed CS
  Fixed the error handling when decoding invalid XML to avoid a Warning
  [Form] Fixed: The "data" option is taken into account even if it is NULL
  [DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/FormType.php
2013-10-30 09:28:22 +01:00
Fabien Potencier
0211c387d3 fixed CS 2013-10-30 09:27:36 +01:00
Fabien Potencier
c2ca2e0242 minor #9389 [FrameworkBundle] Update deprecation message (asm89)
This PR was merged into the master branch.

Discussion
----------

[FrameworkBundle] Update deprecation message

Small addition to (doc string only):
https://github.com/symfony/symfony/pull/9252

Commits
-------

b057fab [FrameworkBundle] Update deprecation message
2013-10-29 17:17:07 +01:00
Fabien Potencier
d2daf5daac bug #9397 [BUG][Form] Fix nonexistent key id in twig of data collector (francoispluchino)
This PR was merged into the master branch.

Discussion
----------

[BUG][Form] Fix nonexistent key id in twig of data collector

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

When you create a single button form type, the id of data collector does not exist. It's caused by the PR #9394.

Commits
-------

19c74f3 Fix nonexistent key id in twig of data collector
2013-10-29 17:17:02 +01:00
François Pluchino
19c74f3b1d Fix nonexistent key id in twig of data collector 2013-10-28 17:47:24 +01:00
Fabien Potencier
b4e69e8707 bug #9395 [HttpKernel] fixed memory limit display in MemoryDataCollector (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] fixed memory limit display in MemoryDataCollector

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

Commits
-------

644f78d [HttpKernel] fixed memory limit display in MemoryDataCollector
2013-10-28 16:22:12 +01:00
Hugo Hamon
644f78d806 [HttpKernel] fixed memory limit display in MemoryDataCollector 2013-10-28 15:46:04 +01:00
Fabien Potencier
d866a5acc4 bug #9168 [FrameworkBundle] made sure that the debug event dispatcher is used everywhere (fabpot)
This PR was merged into the master branch.

Discussion
----------

[FrameworkBundle] made sure that the debug event dispatcher is used everywhere

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

The removal of the Profiler dependency on the TraceableEventDispatcher (#9170) allows to remerge the patch from #9068 that fixes #6686.

This PR also cleans up how profiles are stored. A Profile is now always stored only once.

The fix will only be available on 2.4+ as the changes are too deep to be backported to 2.2 and 2.3.

Commits
-------

1e1835e [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
2013-10-28 15:29:55 +01:00
Fabien Potencier
4bff07956a bug #9388 [Form] Fixed: The "data" option is taken into account even if it is NULL (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Fixed: The "data" option is taken into account even if it is NULL

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

Commits
-------

c1a3eb3 [Form] Fixed: The "data" option is taken into account even if it is NULL
2013-10-28 14:27:57 +01:00
Fabien Potencier
53315562f2 bug #9394 [Form] Fixed form debugger to work even when no view variables are logged (bschussek)
This PR was merged into the master branch.

Discussion
----------

[Form] Fixed form debugger to work even when no view variables are logged

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

Commits
-------

99a4b7e [Form] Fixed form debugger to work even when no view variables are logged  (e.g. upon redirects)
2013-10-28 14:27:05 +01:00
Bernhard Schussek
99a4b7ebdd [Form] Fixed form debugger to work even when no view variables are logged (e.g. upon redirects) 2013-10-28 14:22:47 +01:00
Fabien Potencier
ef695655f5 bug #9391 [Serializer] Fixed the error handling when decoding invalid XML to avoid a Warning (stof)
This PR was merged into the 2.2 branch.

Discussion
----------

[Serializer] Fixed the error handling when decoding invalid XML to avoid a Warning

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

Without the exception being thrown here, the call to ``simplexml_import_dom`` throws a warning saying ``Invalid Nodetype to import``.
This has been reported by @Tobion after we refactored FOSRestBundle to use this XmlEncoder instead of a duplication of a previous version of the class: https://github.com/FriendsOfSymfony/FOSRestBundle/pull/583/files#r7221045

Commits
-------

b2550b9 Fixed the error handling when decoding invalid XML to avoid a Warning
2013-10-28 14:03:08 +01:00
Christophe Coevoet
b2550b90ae Fixed the error handling when decoding invalid XML to avoid a Warning 2013-10-28 13:20:44 +01:00
Alexander
b057fab170 [FrameworkBundle] Update deprecation message
Small addition to (doc string only):
https://github.com/symfony/symfony/pull/9252
2013-10-28 11:36:52 +01:00
Bernhard Schussek
c1a3eb3f2e [Form] Fixed: The "data" option is taken into account even if it is NULL 2013-10-28 10:50:26 +01:00
Fabien Potencier
a9c17c3266 feature #9365 prevent PHP from magically setting a 302 header (lsmith77)
This PR was merged into the master branch.

Discussion
----------

prevent PHP from magically setting a 302 header

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes (for people relying on getting a magic 302 when setting a Location header)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

this needs a test case .. but first let me know if you are ok with this change.
see http://www.php.net/manual/en/function.header.php

Commits
-------

c140d4f prevent PHP from magically setting a 302 header, see http://www.php.net/manual/en/function.header.php
2013-10-28 10:44:48 +01:00
Fabien Potencier
ca1cb27bcf feature #9252 [FrameworkBundle] Only enable CSRF protection when enabled in config (asm89)
This PR was squashed before being merged into the master branch (closes #9252).

Discussion
----------

[FrameworkBundle] Only enable CSRF protection when enabled in config

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | maybe?
| Deprecations? | no
| Tests pass?   | I hope, master was already broken here
| License       | MIT

bf85e8365a introduced new service configuration for CSRF protection in the frameworkbundle. It is always enabled even if you don't use it. Since it also depends on enabling the session that's not so nice.

Commits
-------

60dce14 [FrameworkBundle] Only enable CSRF protection when enabled in config
2013-10-28 10:42:32 +01:00
Alexander
60dce14228 [FrameworkBundle] Only enable CSRF protection when enabled in config 2013-10-28 10:42:32 +01:00
Lukas Kahwe Smith
c140d4feae prevent PHP from magically setting a 302 header, see http://www.php.net/manual/en/function.header.php 2013-10-27 08:50:44 +01:00
Fabien Potencier
6fcb06034a bug #9378 [DomCrawler] [HttpFoundation] Make Content-Type attributes identification case-insensitive (matthieuprat)
This PR was merged into the 2.2 branch.

Discussion
----------

[DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive

According to [section 3.7 of RFC 2616][], media-type attribute names in the `Content-Type` header are case-insensitive.
Therefore, identification of the `text` type and the `charset` parameter in the `Content-Type` header should be case-insensitive.

[section 3.7 of RFC 2616]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7

Commits
-------

17a2d66 [DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive
2013-10-26 10:02:56 +02:00
Fabien Potencier
a8acbf8fed Merge branch '2.3'
* 2.3:
  Fixed English usage for existing users.
  Clean up of WebProfiler Controller classes:
  [Process] Fix #9343 : revert file handle usage on Windows platform
2013-10-26 09:53:03 +02:00
Fabien Potencier
c1247a2054 Merge branch '2.2' into 2.3
* 2.2:
  Fixed English usage for existing users.
  [Process] Fix #9343 : revert file handle usage on Windows platform
2013-10-26 09:52:48 +02:00
Fabien Potencier
ed799c96af bug #9354 [2.2][Process] Fix #9343 : revert file handle usage on Windows platform (romainneutron)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Process] Fix #9343 : revert file handle usage on Windows platform

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

Hello,

I propose to revert the use of file handles only for `STDOUT` on Windows platform (see implementation in 2.2.6 [here](4059720232/src/Symfony/Component/Process/Process.php (L231-L242))).

When I decoupled pipes management from `Process` in #8924, I used file handles for both `STDOUT` and `STDERR`. This was an error as it introduced random failure in reading the handles (reported as [PHP#65650](https://bugs.php.net/bug.php?id=65650)).

Reverting to the previous implementation solves the issue. My apologies for the issues it introduced.

Versions that have been affected by the bug are 2.2.7, 2.2.8, 2.2.9, 2.3.4, 2.3.5 and 2.3.6.

Side note : I thought about testing the file handles implementation on *nix, but it fails most of the time where as Windows is okay. Unit testing on windows is okay (AbstractProcessTest::testProcessPipes tests it), but I don't provide a travis compatible test.

Commits
-------

e9dd408 [Process] Fix #9343 : revert file handle usage on Windows platform
2013-10-26 09:51:51 +02:00
Matthieu Prat
17a2d66456 [DomCrawler] [HttpFoundation] Make Content-Type attributes identification case-insensitive 2013-10-25 15:49:57 +00:00
Fabien Potencier
6ef251392f git push #9372 Fixed English usage for existing users. (mgenereu)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9372).

Discussion
----------

Fixed English usage for existing users.

Commits
-------

b674e44 Fixed English usage for existing users.
2013-10-24 21:28:54 +02:00
Michael Genereux
95bca6cbf0 Fixed English usage for existing users. 2013-10-24 21:28:54 +02:00
Fabien Potencier
729faa8d4f minor #9359 Clean up of WebProfiler Controller classes (caponica)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9359).

Discussion
----------

Clean up of WebProfiler Controller classes

 - Added missing "@throws" PHPdoc comments in controllers
 - Updated deprecated reference to Symfony\Component\HttpKernel\Debug\ExceptionHandler to use Symfony\Component\Debug\ExceptionHandler instead

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no

Commits
-------

592b831 Clean up of WebProfiler Controller classes:
2013-10-24 18:01:17 +02:00
caponica
9f4ca0818b Clean up of WebProfiler Controller classes:
Added missing "@throws" PHPdoc comments in controllers
Updated deprecated reference to Symfony\Component\HttpKernel\Debug\ExceptionHandler to use Symfony\Component\Debug\ExceptionHandler instead
2013-10-24 18:01:17 +02:00
Fabien Potencier
10751c89fb minor #9362 fixed typo (samsonasik)
This PR was merged into the master branch.

Discussion
----------

fixed typo

Commits
-------

98bdb5f fixed typo
2013-10-24 17:58:31 +02:00
Abdul Malik Ikhsan
98bdb5fdec fixed typo 2013-10-23 15:18:42 +07:00
Romain Neutron
e9dd408881 [Process] Fix #9343 : revert file handle usage on Windows platform 2013-10-21 13:56:16 +02:00
Fabien Potencier
1206176fc4 Merge branch '2.3'
* 2.3:
  [DoctrineBridge] Added type check to prevent calling clear() on arrays
  [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
  Fix docblock typo
2013-10-18 17:01:47 +02:00
Fabien Potencier
f2c6211306 bug #9335 [2.4][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty (bschussek)
This PR was merged into the master branch.

Discussion
----------

[2.4][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty

#9333 merged into master.

Commits
-------

9a8ec64 Merge branch 'fix-csrf-default-2.3' into fix-csrf-default-2.4
baa2356 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
408769e bug #9328 [2.3][Form] Changed FormTypeCsrfExtension to use the form's name as default intention (bschussek)
2013-10-18 17:01:02 +02:00
Fabien Potencier
60a14f6ffe Merge branch '2.2' into 2.3
* 2.2:
  [DoctrineBridge] Added type check to prevent calling clear() on arrays
  [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
  Fix docblock typo

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
2013-10-18 17:00:23 +02:00
Fabien Potencier
14a904d401 bug #9334 [2.3][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty (bschussek)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty

#9333 merged into 2.3.

Commits
-------

baa2356 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
2013-10-18 16:59:32 +02:00
Fabien Potencier
2a637b12b4 bug #9333 [2.2][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty

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

ping @stof

follow-up PR to #9327

Commits
-------

219e44d [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
2013-10-18 16:57:55 +02:00
Fabien Potencier
4dbe623903 bug #9338 [DoctrineBridge] Added type check to prevent calling clear() on arrays (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[DoctrineBridge] Added type check to prevent calling clear() on arrays

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

Commits
-------

4ff59d7 [DoctrineBridge] Added type check to prevent calling clear() on arrays
2013-10-18 16:57:09 +02:00
Fabien Potencier
f6d4bc4e5b bug #9330 [2.4][Config] Fixed namespace when dumping reference (WouterJ)
This PR was merged into the master branch.

Discussion
----------

[2.4][Config] Fixed namespace when dumping reference

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

The namespace was given to the wrong function, resulting in wrong namespaes when dumping XML.

Commits
-------

2b0b355 Fixed XML dump
2013-10-18 16:54:07 +02:00
Bernhard Schussek
4ff59d77a8 [DoctrineBridge] Added type check to prevent calling clear() on arrays 2013-10-18 16:04:39 +02:00
Bernhard Schussek
9a8ec64338 Merge branch 'fix-csrf-default-2.3' into fix-csrf-default-2.4
Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
2013-10-18 13:14:20 +02:00
Bernhard Schussek
baa2356859 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty 2013-10-18 13:11:42 +02:00
Bernhard Schussek
219e44d610 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty 2013-10-18 13:07:56 +02:00
Wouter J
2b0b355544 Fixed XML dump 2013-10-18 11:29:21 +02:00
Fabien Potencier
bae30242cb minor #9311 [Csrf] component fixes (Tobion)
This PR was squashed before being merged into the master branch (closes #9311).

Discussion
----------

[Csrf] component fixes

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

- [Csrf] fixed some phpdocs
- [Csrf] fixed return types (also https://github.com/symfony/symfony/pull/9216#discussion_r6797190 )
- [Csrf] fixed test class namespaces

Commits
-------

d7eb8ff [Csrf] component fixes
2013-10-17 23:29:17 +02:00
Tobias Schultze
d7eb8ff64a [Csrf] component fixes 2013-10-17 23:29:16 +02:00
Fabien Potencier
1b97ad44e9 minor #9312 [Security] Fix docblock typo (adrienbrault)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9312).

Discussion
----------

[Security] Fix docblock typo

Commits
-------

bff65b2 [Security] Fix docblock typo
2013-10-17 23:27:39 +02:00