* 2.2:
[HttpFoundation] fixed regression in the way the request format is handled for duplicated requests (closes#8917)
[HttpKernel] fixer HInclude src (closes#8951)
Fixed escaping of service identifiers in configuration
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)
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
* 2.2:
[HttpFoundation] removed extra parenthesis
[Process][2.2] Fix Process component on windows
[HttpFoundation] improve perf of previous merge (refs #8882)
Request->getPort() should prefer HTTP_HOST over SERVER_PORT
Fixing broken http auth digest in some circumstances (php-fpm + apache).
fixed typo
Conflicts:
src/Symfony/Component/Process/Process.php
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
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-reconstructionb6290a184c/lib/rack/request.rb (L92)
Commits
-------
fa97d80 Request->getPort() should prefer HTTP_HOST over SERVER_PORT
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).
* 2.2:
Fixing singular form for kisses, accesses and addresses.
fixed some circular references
[Security] fixed a leak in ExceptionListener
[Security] fixed a leak in the ContextListener
Ignore posix_istatty warnings
typos
[HttpKernel] fixed route parameters storage in the Request data collector (closes#8867)
Return BC compatibility for `@Route` parameters and default values
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
src/Symfony/Component/Console/Application.php
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
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
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.
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
This PR was merged into the 2.3 branch.
Discussion
----------
[Form] fix iterator phpdoc
It returns IteratorAggregate. But we probably only want to specify Traversable because that is was counts.
Fix from #8852
Commits
-------
f438ac3 [Form] fix iterator typehint
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes#8247).
Discussion
----------
[Form][BUG]Button missing getErrorsAsString() fixes#8084
Debug: Not calling undefined method anymore.
If the form contained a submit button the call would fail and the debug of the form wasn't possible.
Now it will work in all cases.
This fixes#8084
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #8084
| License | MIT
Commits
-------
dab0688 [Form][BUG]Button missing getErrorsAsString() fixes#8084 Debug: Not calling undefined method anymore. If the form contained a submit button the call would fail and the debug of the form wasn't possible. Now it will work in all cases. This fixes#8084
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes#8907).
Discussion
----------
Use isset() instead of array_key_exists() in DIC
It doesn't look like the array_key_exists() in Container::get() and Container::has() is necessary. Changing this to isset() removed over 1,000 calls on a default Drupal 8 install - attaching before/after xhprof screenshots with this change.
![screen shot 2013-09-01 at 1 13 41 pm](https://f.cloud.github.com/assets/116285/1063965/d826057c-1300-11e3-96c3-2c94b89fe83a.png)
![screen shot 2013-09-01 at 1 13 49 pm](https://f.cloud.github.com/assets/116285/1063961/99a0f7b2-1300-11e3-9bd2-b0bf22d4245e.png)
Commits
-------
3c01ae6 Use isset() instead of array_key_exists() in DIC
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes#8912).
Discussion
----------
Fixed annotation
See #8910.
Commits
-------
18ce361 Fixed annotation