This PR was squashed before being merged into the 2.1 branch (closes#7906).
Discussion
----------
if the repository method returns an array ensure that it's internal poin...
...ter is resetted
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6651
| License | MIT
| Doc PR |
Commits
-------
0610750 if the repository method returns an array ensure that it's internal poin...
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7909).
Discussion
----------
[DependencyInjection] Fix method use + example in doc block
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
Fixes using a wrong method in ``findTaggedServiceIds`` and adds an example for the usage and showing the returned data structure as ``@return array`` is not very helpful, the datastructure being a bit unintuitive.
Commits
-------
ad2c955 [DependencyInjection] Fix wrong method in findTaggedServiceIds(), add example to docblock.
* 2.1:
remove validation related headers when needed
use while loop for iterating
[Filesystem] copy() is not working when open_basedir is set
Conflicts:
src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7857).
Discussion
----------
[HttpCache] remove validation related headers when needed
| Q | A
| ------------- | ---
| Bug fix? | [yes]
| New feature? | [no]
| BC breaks? | [yes]
| Deprecations? | [no]
| Tests pass? | [yes]
| Fixed tickets | [#6977]
| License | MIT
Fixes#6977 by removing validation related headers when there is at least one embedded response.
I've added an embedded response counter because the current check was wrong I think, it was checking count($this->ttls) which isn't updated for validateable responses.
And for the BC break, looking at the interface PHPDoc description, it supposes add() method should only be applied on esi responses and update() takes the master one at the end, what do you think?
Commits
-------
bb80139 [HttpCache] remove validation related headers when needed
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7886).
Discussion
----------
[HttpKernel][Profile] Fixes#7883
Commits
-------
0172fc1 [HttpKernel][Profile] use while loop for iterating
This PR was merged into the 2.1 branch.
Discussion
----------
[Filesystem] copy() is not working when open_basedir is set
More details: https://bugs.php.net/bug.php?id=64634
Commits
-------
10dea94 [Filesystem] copy() is not working when open_basedir is set
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7871).
Discussion
----------
Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
[HttpFoundation] fixed something
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7870
| License | MIT
| Doc PR |
Ensure that the getPort() method returns port 443 as default when
X-FORWARDED-PROTO is set to https. Currently it would return port 80
if X-FORWARDED-PROTO was set to https and X-FORWARDED-PORT was not
set by the trusted proxy.
Commits
-------
8554af3 Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
* 2.1:
[BrowserKit] fixed BC break done recently
[Process] Fix#5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
Rename misprint property (from warmer to finder)
Add This field is missing RU translation
Conflicts:
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
This PR was merged into the 2.1 branch.
Discussion
----------
[BrowserKit] fixed BC break done recently
| 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
This PR tries to avoid a BC break that was introduced recently in the management of cookies (see #7738).
see fabpot/Silex#684
Commits
-------
25b8b84 [BrowserKit] fixed BC break done recently
This PR was merged into the 2.1 branch.
Discussion
----------
[Process] Fix#5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #5594
| License | MIT
When a process is signaled, an exception is thrown saying `The process has been signaled with signal "0".`. This is wrong because "0" is not a signal.
This is actually a bug in `Process` because we retrieve the `stopsig` property of the process status whereas we should retrieve the `termsig`.
`stopsig` should be retrieved in case the process has been stopped, and `termsig` when it has been signaled, see [PHP documentation](http://www.php.net/manual/en/function.proc-get-status.php).
Commits
-------
8757ad4 [Process] Fix#5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
This PR was merged into the 2.2 branch.
Discussion
----------
[Console] is not ambiguous anymore if it has a perfect match command name (closes#7860)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes, locally
| Fixed tickets | #7860
| License | MIT
| Doc PR | no
Commits
-------
be34917 [Console] find command even if its name is a namespace too (closes#7860)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7837).
Discussion
----------
Rename misprint property (from warmer to finder)
Commits
-------
a1f5bd5 Rename misprint property (from warmer to finder)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7819).
Discussion
----------
[Translator] Added reloading of fallback catalogues when calling addResource() (#7715)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7715
| License | MIT
| Doc PR |
Commits
-------
4f0b063 [Translator] Reset all catalogues when adding resource to fallback locale (#7715, #7819)
5544f36 [Translator] Added reloading of fallback catalogues when calling addResource() (#7715)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7806).
Discussion
----------
[Profiler] Re-added context information to log list
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7679
| License | MIT
Commits
-------
55c2044 [Profiler] Re-added context information to log list
This PR was merged into the 2.1 branch.
Discussion
----------
Add This field is missing RU translation
This PR was submitted on the symfony/Validator read-only repository and moved automatically to the main Symfony repository (closessymfony/Validator#4).
<source>This field is missing.</source>
Have no translation. Not exists in EN version too. Just forgot?
Symfony\Component\Validator\Constraints\Collection()
public $missingFieldsMessage = 'This field is missing.';
Commits
-------
97c4291 Add This field is missing RU translation
<source>This field is missing.</source>
Have no translation. Not exists in EN version too. Just forgotten?
Symfony\Component\Validator\Constraints\Collection()
public $missingFieldsMessage = 'This field is missing.';
* 2.1:
Removed trailing whitespace
[Validator] added missing estonian translation of messages
Filesystem::touch() not working with different owners (utime/atime issue)
Conflicts:
src/Symfony/Component/Validator/Resources/translations/validators.et.xlf
This PR was merged into the 2.2 branch.
Discussion
----------
[Validator] added missing estonian translation of messages
| Q | A
| ------------- | ---
| Fixed tickets | -
| License | MIT
This commit adds missing Estonian translation of messages introduced in 2.2. It's a follow-up to #7769.
Commits
-------
633b63b [Validator] added missing estonian translation of messages
This PR was merged into the 2.1 branch.
Discussion
----------
[Validator] added missing estonian translation of messages
| Q | A
| ------------- | ---
| Fixed tickets | -
| License | MIT
Commits
-------
efff50a [Validator] added missing estonian translation of messages
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7752).
Discussion
----------
Filesystem::touch() not working with different owners (utime/atime issue)
This PR was submitted on the symfony/Filesystem read-only repository and moved automatically to the main Symfony repository (closessymfony/Filesystem#3).
Case: I have 2 users, www-data and myself. I have a command script that makes a lock file in /var/lock/.../ something. This command is called from a post request by FOS and ran in the background. Whever one of the 2 methods (web/cli manually) is used, the other user won't have permissions to use the Filesystem::touch(). The reason this won't work is the second parameter.
What touch() does:
$touch param: The touch time. If time is not supplied, the current system time is used.
$atime param: If present, the access time of the given filename is set to the value of atime. Otherwise, it is set to the value passed to the time parameter. If neither are present, the current system time is used.
So the current code is basically copying this. However, if the second parameter is null it is still present and will cause the same problem. Note that all files and folders related are set to 0777 and have the owner of www-data. I'm accessing them under my own account here:
Interactive shell
php > var_dump(touch('/var/lock/tripolis/ontw/dev/2140191804.lock', null));
PHP Warning: touch(): Utime failed: Operation not permitted in php shell code on line 1
Warning: touch(): Utime failed: Operation not permitted in php shell code on line 1
bool(false)
php > var_dump(touch('/var/lock/tripolis/ontw/dev/2140191804.lock'));
bool(true)
If I were to pass it without second parameter, let it be time() or null (Filesystem uses time() by default if not present), it DOES work. However, Filesystem::touch() ALWAYS gives a parameter to touch. This parameter is exactly the same value as what the function itself would do in php. Let it be that in my case there is an issue with the atime. I'm not exactly sure how it works but it's not tracked or usable in my case. Because parameter 2 exists, parameter 3 is set. Parameter 3 is not allowed and therefore causes Filesystem::touch() to throw an exception.
Commits
-------
e3a0fe6 Filesystem::touch() not working with different owners (utime/atime issue)
* 2.1:
[HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
[BrowserKit] removed dead code
[HttpFoundation] fixed empty domain= in Cookie::__toString()
fixed detection of secure cookies received over https
[Translation] removed an uneeded class property
[Translation] removed unneeded getter/setter
[Translator] added additional conversion for encodings other than utf-8
fix a DI circular reference recognition bug
[HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
