* 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 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 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 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
* 2.4:
[Validator] Remove property and method targets from the optional and required constraints.
[DomCrawler] Fixed charset detection in html5 meta charset tag
* 2.3:
[Validator] Remove property and method targets from the optional and required constraints.
[DomCrawler] Fixed charset detection in html5 meta charset tag
This PR was merged into the 2.3 branch.
Discussion
----------
[Validator] Remove property and method targets from the optional and required constraints
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #11013
| License | MIT
| Doc PR |
At the moment both constraints can only be defined on other annotations. Both constraints are [only mentioned in the docs in the context of the Collection](http://symfony.com/doc/current/reference/constraints/Collection.html#required-and-optional-field-constraints).
Defining the required or optional annotation directly on a field or method
throws a ClassNotFoundException, since the constraint validator factory tries to load the validator (which does not exist):
```
ClassNotFoundException: Attempted to load class "OptionalValidator"
from namespace "Symfony\Component\Validator\Constraints"
in /var/www/server/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php line 71.
Do you need to "use" it from another namespace?
```
By applying this patch the end user will get a more helpful error message:
```
[Semantical Error] Annotation @Assert\Optional is not allowed to be declared on property Acme\DemoBundle\Entity\Contact::$message.
You may only use this annotation on these code elements: ANNOTATION.
```
Commits
-------
9c2616e [Validator] Remove property and method targets from the optional and required constraints.
At the moment both constraints can only be defined on other annotations (specifically, the Collection annotation). Defining the required or optional annotation directly on a field or method throws a ClassNotFoundException, since the constraint validator factory tries to load the validator (which does not exist).
This PR was squashed before being merged into the 2.3 branch (closes#10983).
Discussion
----------
[DomCrawler] Fixed charset detection in html5 meta charset tag
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | N/A
| License | MIT
It may be minor to folks with ascii-charactered language, but is critical for us Japanese.
Many Japanese websites with SJIS encoding have "Shift_JIS" as their encoding declaration.
Commits
-------
172e752 [DomCrawler] Fixed charset detection in html5 meta charset tag
