* 2.4:
[Bridge][Twig] Replace deprecated features
[HttpFoundation] fix switch statement
[Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
fixed previous merge
Added phpdoc for Cache-Control directives methods
Remove undefined variable $e
bumped Symfony version to 2.4.7
bumped Symfony version to 2.3.17
Fix a parameter name in a test
updated VERSION for 2.4.6
updated CHANGELOG for 2.4.6
updated VERSION for 2.3.16
update CONTRIBUTORS for 2.3.16
updated CHANGELOG for 2.3.16
[HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
* 2.3:
[Bridge][Twig] Replace deprecated features
[HttpFoundation] fix switch statement
[Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
fixed previous merge
Added phpdoc for Cache-Control directives methods
Remove undefined variable $e
bumped Symfony version to 2.3.17
Fix a parameter name in a test
updated VERSION for 2.3.16
update CONTRIBUTORS for 2.3.16
updated CHANGELOG for 2.3.16
[HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle
Conflicts:
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/HttpKernel/Kernel.php
This PR was squashed before being merged into the 2.6-dev branch (closes#10427).
Discussion
----------
Username in UsernameNotFoundException message data
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
Added username in UsernameNotFoundException message data
Commits
-------
3dfaa19 Username in UsernameNotFoundException message data
This PR was merged into the 2.6-dev branch.
Discussion
----------
[RFC][WebProfilerBundle] Add simple placeholders into search form
This is an RFC mostly, it's not a real feature, it's more like little helper for the profiler form, I guess that would mostly useful for _newcomers_, but sometimes even _old dogs_ could find it useful sometimes =)
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | kinda
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
![form](https://cloud.githubusercontent.com/assets/67402/2655386/4637aa0c-bfe5-11e3-958e-84308217b52e.png)
Commits
-------
be65226 [WebProfilerBundle] Add simple placeholders into search form
This PR was squashed before being merged into the 2.3-dev branch (closes#10851).
Discussion
----------
Added retrieval of sections
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #10145
| License | MIT
Commits
-------
7928767 Added retrieval of sections
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes#11016).
Discussion
----------
[Bridge][Twig] Replace deprecated features
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
This PR replaces the deprecated classes `Twig_Function_Node` and `Twig_Function_Method` by the`Twig_SimpleFunction`.
Commits
-------
14a4e4d [Bridge][Twig] Replace deprecated features
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes#11062).
Discussion
----------
UPGRADE-2.5.md: Yaml component change in 2.5
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
We had a very hard to find bug when I was trying to upgrading symfony from 2.4 to 2.5, I think it's worth mentioning in the UPGRADE file. I understand we shouldn't have had duplicated keys in yaml but that was it...
BTW maybe we should raise an error in cases like this?
PS I figured I shouldn't include the PR template with table here because it's just a UPGRADE-* file change, I will add it if you say
Commits
-------
3931723 Yaml component change in 2.5
We had a very hard to find bug when I was trying to upgrading symfony from 2.4 to 2.5, I think it's worth mentioning in the UPGRADE file. I understand we shouldn't have had duplicated keys in yaml but that was it...
BTW maybe we should raise an error in cases like this?
This PR was merged into the 2.5 branch.
Discussion
----------
[Serializer] Xml encoder whitespace fix
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Hi, after #11044 I'm back with more: A fix for another BC-break issue regarding decoding xml since PR #10668.
The problem is that I was getting more `#cdata-section` keys in deeper levels of the decoded xml:
```php
'str' =>
array(2) {
'#text' =>
array(2) {
...
}
'#cdata-section' =>
string(228) "Some text"
}
```
//cc @csarrazi
Commits
-------
466a3d7 [serializer] fixed whitespace issue when decoding xml
This PR was merged into the 2.3 branch.
Discussion
----------
[HttpFoundation] smaller fixes for PdoSessionHandler
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #10652
| License | MIT
For both the PdoSessionHandler and DbalSessionHandler
- https://github.com/symfony/symfony/pull/10652#issuecomment-42370425: Transactional DELETE + INSERT does not work as expected
- https://github.com/symfony/symfony/pull/10652#issuecomment-44359784: sqlsrv 2005 does not support the MERGE SQL, and if used it requires an HOLDLOCK
- missing time update for sqlsrv and oracle
Commits
-------
a0e1d4d [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
00d707f [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle
This PR was merged into the 2.5-dev branch.
Discussion
----------
[YAML] Added support for object-maps
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | NA
| License | MIT
| Doc PR | NA
Proposal for https://github.com/symfony/symfony/pull/10114
Commits
-------
0cee604 [Yaml] Cleanups for object maps
e2d5468 [Yaml] Added support for object maps
Previously, the parser treated maps ( {} ) the same as sets ( [] ).
Both were returned as PHP associative arrays. Since
these are distinct entities, this can cause considerably problems for
the users, especially when YAML is being serialized into another
format such as JSON.
This commit allows the user to enable object-map support via a third
parameter on the Parse method. It defaults to `false`, which means
that this commit does not break backwards compatibility.
If the user enables object-map support, maps are represented
by stdClass() objects. Sets remain as arrays.
This PR was squashed before being merged into the 2.5 branch (closes#11047).
Discussion
----------
#10862 loadClassMetadata vs loadValidatorMetadata: revert default config
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #10862
| License | MIT
| Doc PR |
Commits
-------
3bde718#10862 loadClassMetadata vs loadValidatorMetadata: revert default config
This PR was merged into the 2.6-dev branch.
Discussion
----------
[SecurityBundle] added acl:set command
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | no
| License | MIT
| Doc PR | n/a
This new command allows to set ACL directly from the command line. This useful to quickly set up an environment and for debugging / maintenance purpose.
This PR also includes a functional test system for the ACL component. As an example, it is used to test the `acl:set` command.
The provided entity class is not mandatory (tests will still be green without it) but can be useful to test other ACL related things. I can remove it if necessary.
The instantiation of the `MaskBuilder` object is done in a separate method to be easily overridable to use a custom one (e.g. the SonataAdmin one).
Commits
-------
a702124 [SecurityBundle] added acl:set command
This PR was squashed before being merged into the 2.6-dev branch (closes#10667).
Discussion
----------
[HttpFoundation] Add a way to match a specific scheme in RequestMatcher #10556
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #10556
| License | MIT
| Doc PR | no
Commits
-------
787ae07 [HttpFoundation] Add a way to match a specific scheme in RequestMatcher #10556
This PR was squashed before being merged into the 2.6-dev branch (closes#10699).
Discussion
----------
[DomCrawler] Added support for slicing nodes
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
There are no easy way to slice nodes in specific range. I created a method using \LimitIterator. Works fine for me.
An example using is:
```php
$crawler->filter('h1')->slice(5, 10)->each(function ($node, $i) {
return $node->text();
});
Commits
-------
1181bdc [DomCrawler] Added support for slicing nodes
This PR was merged into the 2.6-dev branch.
Discussion
----------
[Security] Allow overloading ContextListener::refreshUser()
Allow overloading refreshUser() for the use case of doing something special with user providers.
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | n.A.
| License | MIT
| Doc PR | n.A.
Commits
-------
b67ed43 Allow overloading ContextListener::refreshUser()
This PR was squashed before being merged into the 2.3-dev branch (closes#10980).
Discussion
----------
error.html.twig should contain a email value
When getting an exception on env PROD it would be nice to have an email to report to.
Current code has [email] instead of a value.
I'm not sure how to fix this as the email value should come from exception.html.twig
```html
<div id="logs">
{% include 'TwigBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %}
</div>
```
Some hints are welcome.
Commits
-------
030b8c0 error.html.twig should contain a email value
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes#10974).
Discussion
----------
[HttpFoundation] Added PHPDoc for Cache-Control directives methods
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
58b0aef Added phpdoc for Cache-Control directives methods
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes#11043).
Discussion
----------
[Console] OutputFormatter Unset Bold has wrong id
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | none
| License | MIT
| Doc PR | none
The Unsetter for Bold in *nix Console is the 22 not the 21. Problem is that the 21 is invalid and so no style will be unsetted. Don't look very nice. Also fixed small Typo with Vars in apply()
Commits
-------
724bb50 [Console] OutputFormatter Unset Bold has wrong id
This PR was merged into the 2.5 branch.
Discussion
----------
[Serializer] Fix BC break since 2.5
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
We spotted a BC break after upgrading to 2.5. The break seems to originate from PR #10668 and I hereby submit a test that passes if I revert the XmlEncoder.php back to before the PR.
The result of the given decode call currently is (notice the "#cdata-section"):
```php
array(1) {
'firstname' =>
array(1) {
'#cdata-section' =>
string(12) "Paul <or Me>"
}
}
```
I am looking for help fixing the issue, because so far I wasn't able to come up with a fix. @csarrazi as an author of the PR, do you perhaps have any thoughts on this matter?
Commits
-------
48d9f36 [Serializer] fixed bc-break with cdata-section nodes
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes#11041).
Discussion
----------
Remove undefined variable $e
This PR was submitted on the symfony/DependencyInjection read-only repository and moved automatically to the main Symfony repository (closessymfony/DependencyInjection#6).
Commits
-------
637c6e1 Remove undefined variable $e
This PR was merged into the 2.3 branch.
Discussion
----------
[Validator] Fix a parameter name in a test
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | none
| License | MIT
| Doc PR | not required
Commits
-------
069e925 Fix a parameter name in a test