Commit Graph

13875 Commits

Author SHA1 Message Date
Fabien Potencier
8aec247dc3 merged branch fabpot/circular-refs-php-dumper (PR #8999)
This PR was merged into the 2.2 branch.

Discussion
----------

[DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)

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

Commits
-------

ce7de37 [DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)
2013-09-12 14:24:44 +02:00
Fabien Potencier
ee05995bd5 merged branch bschussek/issue8981-regression (PR #9001)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Fixed regression causing invalid "WHERE id IN ()" statements

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

Commits
-------

867b81a [Form] Fixed regression causing invalid "WHERE id IN ()" statements
2013-09-12 10:33:00 +02:00
Bernhard Schussek
867b81af5a [Form] Fixed regression causing invalid "WHERE id IN ()" statements 2013-09-12 10:17:07 +02:00
Fabien Potencier
ce7de37f16 [DependencyInjection] fixed a non-detected circular reference in PhpDumper (closes #8425)
This circular reference cannot be detected by the compiler pass as we
don't check for method arguments there.

The Container itself already detects such circular references at runtime.

So this fix is about circular references that are not detected at
compile time, and are not even detected at runtime because the code that
would cause the detection is never run (generated after a return
statement.)
2013-09-12 09:51:05 +02:00
Fabien Potencier
447fa2d321 merged branch bschussek/issue8989 (PR #9000)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Fixed regression in BooleanToStringTransformer

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

Commits
-------

2747bdc [Form] Fixed regression in BooleanToStringTransformer from ed83752
2013-09-12 09:30:02 +02:00
Bernhard Schussek
2747bdca76 [Form] Fixed regression in BooleanToStringTransformer from ed83752 2013-09-12 09:25:54 +02:00
Fabien Potencier
610301d5e0 [FrameworkBundle] removed obsolete code 2013-09-12 06:41:55 +02:00
Fabien Potencier
328818a5f9 merged branch romainneutron/unix-pipes (PR #8996)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process][2.2] Close unix pipes before calling `proc_close` to avoid a deadlock

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

see http://php.net/manual/en/function.proc-close.php

Commits
-------

37102dc [Process] Close unix pipes before calling `proc_close` to avoid a deadlock
2013-09-12 06:24:58 +02:00
Romain Neutron
37102dcc7c [Process] Close unix pipes before calling proc_close to avoid a deadlock
see http://php.net/manual/en/function.proc-close.php
2013-09-11 21:13:38 +02:00
Fabien Potencier
6ec2cbaa6c [HttpFoundation] fixed some unit tests 2013-09-10 23:20:45 +02:00
Fabien Potencier
e7386a85d8 merged branch fabpot/request-hotfix (PR #8985)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] fixed format duplication in Request

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

Commits
-------

8c2a733 [HttpFoundation] fixed format duplication in Request
2013-09-10 22:39:59 +02:00
Fabien Potencier
8c2a733528 [HttpFoundation] fixed format duplication in Request 2013-09-10 22:37:04 +02:00
Fabien Potencier
2a304e09bf merged branch bschussek/issue5113-2.2 (PR #8980)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Form] Fixed expanded choice field to be marked invalid when unknown choices are submitted

Same as #7940, rebased onto 2.2.

Commits
-------

4d2dc55 [DoctrineBridge] Improved test coverage of EntityChoiceList
9d3628c [Form] Improved test coverage of ChoiceList classes
ed83752 [Form] Fixed expanded choice field to be marked invalid when unknown choices are submitted
30aa1de [Form] Fixed ChoiceList::get*By*() methods to preserve order and array keys
53f292a [Form] Removed usage of the ChoiceList::getIndicesFor*() methods where they don't offer any performance benefit
2013-09-10 19:44:51 +02:00
Fabien Potencier
fbbbd644be merged branch romainneutron/process-8970 (PR #8983)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process][2.2] Fix #8970 : read output once the process is finished, enable pipe tests on Windows

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

This fix the read of file handles after `proc_close` as described in the issue. I enable some stdin=>stdout pipes tests on windows with some dedicated buffer size. Solving the issue, I finally reproduced this [PHP bug](https://bugs.php.net/bug.php?id=65650) that I first described in my PR note in #8924

Most of Windows usage should be okay, but in case of a program throws lots of output and fills the buffer, some data might be lost/corrupted. Should it be documented ? This is a Windows only known issue.

Commits
-------

1e75cf9 [Process] Fix #8970 : read output once the process is finished, enable pipe tests on Windows
2013-09-10 19:38:55 +02:00
Fabien Potencier
e548c688a9 merged branch apfelbox/patch-1 (PR #8982)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8982).

Discussion
----------

Fixed docblock in UserInterface::getSalt()

This method can return null, too.
See the line above:

> "This can return null if the password was not encoded using a salt."

Commits
-------

3c7b557 Fixed docblock in UserInterface::getSalt()
2013-09-10 19:35:57 +02:00
Jannik Zschiesche
1c623c6d46 Fixed docblock in UserInterface::getSalt()
This method can return null, too.
See the line above:

> "This can return null if the password was not encoded using a salt."
2013-09-10 19:35:57 +02:00
Romain Neutron
1e75cf9da1 [Process] Fix #8970 : read output once the process is finished, enable pipe tests on Windows 2013-09-10 19:14:06 +02:00
Bernhard Schussek
4d2dc5574d [DoctrineBridge] Improved test coverage of EntityChoiceList 2013-09-10 18:22:14 +02:00
Bernhard Schussek
9d3628cf13 [Form] Improved test coverage of ChoiceList classes 2013-09-10 18:05:04 +02:00
Bernhard Schussek
ed837522af [Form] Fixed expanded choice field to be marked invalid when unknown choices are submitted 2013-09-10 18:05:04 +02:00
Bernhard Schussek
30aa1de8dc [Form] Fixed ChoiceList::get*By*() methods to preserve order and array keys 2013-09-10 17:43:42 +02:00
Bernhard Schussek
53f292adcc [Form] Removed usage of the ChoiceList::getIndicesFor*() methods where they don't offer any performance benefit 2013-09-10 17:40:49 +02:00
Fabien Potencier
dc762e10d7 [HttpKernel] made code more reliable 2013-09-08 19:54:19 +02:00
Fabien Potencier
11c3b16a4d merged branch fabpot/format-fix (PR #8961)
This PR was merged into the 2.2 branch.

Discussion
----------

fixed regression in the way the request format is handled

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

Commits
-------

719b2bf [HttpFoundation] fixed regression in the way the request format is handled for duplicated requests (closes #8917)
2013-09-08 16:59:13 +02:00
Fabien Potencier
719b2bf67f [HttpFoundation] fixed regression in the way the request format is handled for duplicated requests (closes #8917) 2013-09-08 16:57:01 +02:00
Fabien Potencier
d4236ca8ac merged branch fabpot/hinclude-signer (PR #8960)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpKernel] fix HInclude src (closes #8951)

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

fixes a regression introduced in #8879

Commits
-------

49f5027 [HttpKernel] fixer HInclude src (closes #8951)
2013-09-08 09:34:37 +02:00
Fabien Potencier
49f50271d4 [HttpKernel] fixer HInclude src (closes #8951) 2013-09-08 09:24:10 +02:00
Fabien Potencier
eb6b3b0206 merged branch jaikdean/twig-configuration-service-escaping (PR #8686)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8686).

Discussion
----------

[TwigBundle] Fixed escaping of service identifiers in configuration

To recreate, add the following to `config.yml`:

    twig:
        globals:
            foo: "@@bar"

**Expected behaviour:** Twig has a global variable named `foo` containing the string `@bar`.

**Actual behaviour:** ServiceNotFoundException: The service "twig" has a dependency on a non-existent service "@bar".

Environment tested on:
- Symfony Standard Distribution 2.3.2
- OS X 10.8.4
- PHP 5.4.16

Commits
-------

d613110 [TwigBundle] Fixed escaping of service identifiers in configuration
2013-09-08 08:36:16 +02:00
Jaik Dean
c567262b7e Fixed escaping of service identifiers in configuration 2013-09-08 08:36:15 +02:00
Fabien Potencier
d05ab6b940 [HttpFoundation] removed extra parenthesis 2013-09-07 14:10:08 +02:00
Fabien Potencier
8e71bfe3b2 merged branch craue/patch-27 (PR #8909)
This PR was merged into the 2.2 branch.

Discussion
----------

fixed typo

Commits
-------

42c7b95 fixed typo
2013-09-07 08:45:07 +02:00
Fabien Potencier
2dead87b31 merged branch romainneutron/process-windows (PR #8924)
This PR was squashed before being merged into the 2.2 branch (closes #8924).

Discussion
----------

[Process][2.2] Fix Process component on windows

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

This PR fixes Process on windows (almost, see note below).
 - Some unit tests were not Windows compatible
 - Use a file handle for STDERR as well as STDOUT to avoid blocking
 - Decouple pipes and descriptors from Process

As this move some a part of Process in a sub class, I hope merging this in 2.3 and master would not be a PITA. I'm here to make some adjustments after theses merge if needed.

**Important note** :

We are using file handles instead of streams for `proc_open` pipes as described in the code (see [PHP bug #51800](https://bugs.php.net/bug.php?id=51800)). Unfortunately, this workaround may produce corrupted output/error output in some race conditions. That's why `AbstractProcessTest::testProcessPipes` randomly fails when using file handles (on unix and windows).

Commits
-------

4a76c76 [Process][2.2] Fix Process component on windows
2013-09-07 08:18:58 +02:00
Romain Neutron
4a76c76698 [Process][2.2] Fix Process component on windows 2013-09-07 08:18:57 +02:00
Fabien Potencier
729ac7b967 [HttpFoundation] improve perf of previous merge (refs #8882) 2013-09-07 08:13:51 +02:00
Fabien Potencier
85eaec3eda merged branch dhotson/request-http-host-port (PR #8882)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8882).

Discussion
----------

[HttpFoundation] Request->getPort() should prefer HTTP_HOST over SERVER_PORT

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

What is this?
----

_Note to reviewer: This follows on from a previous pull request: https://github.com/symfony/symfony/pull/8184
Since the introduction of `Request->setTrustedHosts()` — the implementation of this fix has been simplified._

This fixes the semantics of the `Request#getPort()` method to prefer the HTTP_HOST header over SERVER_PORT.

This is relevant in situations where the web server is running on a different port to the public facing website. e.g. load balancers, proxies, port forwarding.

Consistency
----

This change makes Symfony more consistent with other popular web frameworks.

Preferring HTTP_HOST over SERVER_NAME and SERVER_PORT is the strategy used by Ruby's Rack and Python's Django.

Python has a PEP that describes how to reconstruct URLs:
http://www.python.org/dev/peps/pep-0333/#url-reconstruction

b6290a184c/lib/rack/request.rb (L92)

Commits
-------

fa97d80 Request->getPort() should prefer HTTP_HOST over SERVER_PORT
2013-09-07 08:11:06 +02:00
Dennis Hotson
65814bae27 Request->getPort() should prefer HTTP_HOST over SERVER_PORT 2013-09-07 08:11:05 +02:00
Fabien Potencier
1086faf0fb merged branch shouze/fix/auth-digest (PR #8952)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8952).

Discussion
----------

[HttpFoundation] Fixing broken http auth digest in some circumstances.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | can be refered in issue #1813
| License       | MIT
| Doc PR        | n/a

With some apache + php-fpm setup we need to set ```PHP_AUTH_DIGEST``` value if not already setted in GLOBAL vars.

Added some unit tests too.

Commits
-------

9fc994b [HttpFoundation] Fixing broken http auth digest in some circumstances (php-fpm + apache).
2013-09-07 07:57:27 +02:00
Sébastien HOUZÉ
e75d2842cd Fixing broken http auth digest in some circumstances (php-fpm + apache). 2013-09-07 07:57:27 +02:00
Fabien Potencier
535cf50c3a merged branch fabpot/firewall-leaks (PR #8946)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security] fixed a leak in the ContextListener

| 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

Trying to fix leaks when using the same Kernel to handle several requests in a row without resetting the Container or shutting down the Kernel.

Commits
-------

899f176 [Security] fixed a leak in ExceptionListener
2fd8a7a [Security] fixed a leak in the ContextListener
2013-09-06 20:18:09 +02:00
Fabien Potencier
c753d68771 merged branch fabpot/random-leaks (PR #8948)
This PR was merged into the 2.2 branch.

Discussion
----------

Fixed some random leaks

| 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
-------

970405f fixed some circular references
2013-09-06 20:17:18 +02:00
Fabien Potencier
a42ad21003 merged branch jjanvier/master (PR #8943)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8943).

Discussion
----------

[PropertyAccess] Fixing singular form for kisses, accesses and addresses.

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

Plural form of noums finishing by *sses* is always *ss* (contrary to plural form of noums finishing by *ses*).

Commits
-------

ebae88f Fixing singular form for kisses, accesses and addresses.
2013-09-06 16:56:44 +02:00
jjanvier
011434a54d Fixing singular form for kisses, accesses and addresses. 2013-09-06 16:56:44 +02:00
Fabien Potencier
970405f293 fixed some circular references 2013-09-06 16:26:52 +02:00
Fabien Potencier
899f1760a6 [Security] fixed a leak in ExceptionListener 2013-09-06 16:13:07 +02:00
Fabien Potencier
2fd8a7acf3 [Security] fixed a leak in the ContextListener 2013-09-06 15:53:58 +02:00
Fabien Potencier
abb8042249 merged branch norzechowicz/posix_isatty (PR #8939)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8939).

Discussion
----------

[Console] Ignore posix_istatty warnings

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

When input stream is ``php://memory`` or ``php://temp`` function ``posix_isatty`` throws following warning

> posix_isatty(): could not use stream of type 'MEMORY' in ....

Commits
-------

cc255dd Ignore posix_istatty warnings
2013-09-05 15:35:47 +02:00
Norbert Orzechowicz
4e9d99032b Ignore posix_istatty warnings 2013-09-05 15:35:47 +02:00
Fabien Potencier
aee97998d5 merged branch enumag/patch-4 (PR #8923)
This PR was merged into the 2.2 branch.

Discussion
----------

typos

Commits
-------

4e363a1 typos
2013-09-03 19:24:00 +02:00
Jáchym Toušek
4e363a145e typos 2013-09-03 19:10:25 +02:00
Christian Raue
42c7b95ab3 fixed typo 2013-09-01 20:32:33 +02:00