This PR was merged into the 2.2 branch.
Discussion
----------
[HttpKernel] fix overwriting of request's locale by LocaleListener if attribute _locale is missing
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7474
| License | MIT
| Doc PR | n.a.
Commits
-------
e8cae94 fix overwriting of request's locale if attribute _locale is missing
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7567).
Discussion
----------
[Security] [ACL] Fix finding ACLs from ObjectIdentity's with different types
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
If more than one ObjectIdentity with different Type (Class name) is given to AclProvider::findAcls() it would throw an exception stating that it could not find the ACLs
This fixes this issue which was introduced in 2.2.0-RC3 - see commit 3c3a90b9e5
/cc @iBiryukov @schmittjoh
Commits
-------
8b0bb57 [Security] [ACL] Fix finding ACLs from ObjectIdentity's with different types
This PR was merged into the 2.2 branch.
Discussion
----------
[Symfony\Bridge\Twig\Extension] fixed two methods' documentation blocks
| Q | A
| ------------- | ---
| Fixed tickets | None
| License | MIT
Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
Commits
-------
2ea5eaa Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7537).
Discussion
----------
#7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
Fixed FileLocator in HttpKernel\Config package if global path ($path) is NULL (default).
Commits
-------
8a8239d #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes#7589).
Discussion
----------
[2.2][Console] Fix autocompletion of command names when namespaces conflict
Fixes#7234
Currently autocompletion of namespaces works on *all* namespaces at once. This fixes it to only search inside subnamespaces once we matched the first level namespace. Otherwise if you have `api:doc` and `generate:doctrine:entity` commands, typing `gen:doc:entity` trips it up because it thinks "doc" is "api:doc", and you end up with a completed name of `generate:doc:entity` which does not match any command.
Commits
-------
fa465b1 [2.2][Console] Fix autocompletion of command names when namespaces conflict
This PR was merged into the 2.1 branch.
Discussion
----------
[2.1][Process] Fix timeout in Process::stop method
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7579
| License | MIT
- The timeout is ten times more than set.
- The timeout does not occurs, it is actually blocking until the process dies.
Commits
-------
bec8ff1 Fix timeout in Process::stop method
This PR was merged into the 2.1 branch.
Discussion
----------
[2.1][Process] Fix Process timeout
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6976
| License | MIT
This PR fixes timeout in the process component.
Timeout can now be float values. The precision of the timeout is given by the `Process::TIMEOUT_PRECISION` constant.
Note : The timeout works when running the process with the `Process::run` method. When using the `Process::start` method, the `Process::checkTimeout` method should be regularly triggered to perform a check.
example :
```php
$process->start();
while ($condition) {
// some stuff
$process->checkTimeout(); // throws an Symfony\Process\Exception\RuntimeException if timeout is reached
usleep(1000);
}
```
Commits
-------
bf4a9b0 Round stream_select fifth argument up.
3780fdb Fix Process timeout
This PR was merged into the 2.2 branch.
Discussion
----------
[2.2][HttpKernel] Remove args from 5.3 stack traces to avoid filling log files
Fixes#7259 - it just makes the PHP 5.3 behavior match the one on 5.4.
Commits
-------
99256e4 [HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes#7259
* 2.1:
[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
[FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes#7562)
[WebProfilerBundle] removed next pointer class in a template
This PR was merged into the 2.1 branch.
Discussion
----------
[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
| Q | A
| ------------- | ---
| Bug fix? | [no]
| New feature? | [no]
| BC breaks? | [no]
| Deprecations? | [no]
| Tests pass? | [yes] I assume : only changed a comment word
| License | MIT
Commits
-------
815eb61 [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
This PR was merged into the 2.1 branch.
Discussion
----------
[WebProfilerBundle] removed next pointer class in a template
It's not needed as there is nothing after the span here, eg. on a 404, see :
http://awesomescreenshot.com/0d5149an51
It displays "n/a ::".
Commits
-------
b0ba9fd [WebProfilerBundle] removed next pointer class in a template
* 2.1:
fixed doc references (closes#7515)
small changes
[SecurityBundle] Fixed configuration exemple
idAsIndex should be true with a smallint or bigint id field.
Fixed long multibyte parameter logging in DbalLogger:startQuery
Keep the file extension in the temporary copy and test that it exists (closes#7482)
[Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
Conflicts:
src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
This PR was merged into the 2.1 branch.
Discussion
----------
[Form] [Doctrine] [EntityChoiceList] idAsIndex should be true with a smallint id field.
When the id of an entity is a smallint, $this->idAsIndex should also be true.
It was not the case.
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: should
License of the code: MIT
Commits
-------
673fd9b idAsIndex should be true with a smallint or bigint id field.
This PR was merged into the 2.1 branch.
Discussion
----------
[2.1][SecurityBundle] Fixed configuration exemple
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
2c7a99b [SecurityBundle] Fixed configuration exemple
This PR was merged into the 2.2 branch.
Discussion
----------
[Security/Http/RememberMe] PersistentTokenBasedRememberMeServices bugfix
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
The database and debug layer cannot handle raw random strings. It may contain invalid ut8 characters and whatnot. So, in order to avoid a lot of database bugs, we must base64_encode the random strings.
Commits
-------
751abe1 Doctrine cannot handle bare random non-utf8 strings
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7536).
Discussion
----------
Fix Finder tests on OS X
... where sys_get_temp_dir() does not return a realpath().
Commits
-------
0ed8441 On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var.
This PR was merged into the 2.1 branch.
Discussion
----------
[2.1][2.2][2.3][Bridge][Doctrine] Fixing long multibyte parameter logging in DbalLogger:startQuery
See #7484
Commits
-------
64a1d39 Fixed long multibyte parameter logging in DbalLogger:startQuery
This PR was merged into the 2.1 branch.
Discussion
----------
[Validator] [translation] updated Japanese translation for Validator component
| Q | A
| ------------- | ---
| Fixed tickets | N/A
| License | MIT
I will also update translations for new messages available after 2.2 once this request is merged.
Commits
-------
987aded [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
