Commit Graph

17380 Commits

Author SHA1 Message Date
Fabien Potencier 0df6ebf595 updated CHANGELOG for 2.5.0 2014-05-31 20:45:43 +02:00
Fabien Potencier af10b106b4 Merge branch '2.4' into 2.5
* 2.4:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:56 +02:00
Fabien Potencier f1970a76ae Merge branch '2.3' into 2.4
* 2.3:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:48 +02:00
Fabien Potencier b8247a3fc6 bug #11014 [Validator] Remove property and method targets from the optional and required constraints (jakzal)
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.
2014-05-31 03:59:25 +02:00
Jakub Zalas 9c2616e788 [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).
2014-05-29 08:58:28 +01:00
Fabien Potencier 6b3be67d3e fixed CHANGELOG for 2.5 2014-05-29 01:38:22 +02:00
Fabien Potencier 082006278c bumped Symfony version to 2.5.0 2014-05-29 01:33:40 +02:00
Fabien Potencier 515fbe9d95 updated VERSION for 2.5.0-RC1 2014-05-28 03:21:58 +02:00
Fabien Potencier ffe53a31a3 updated CHANGELOG for 2.5.0-RC1 2014-05-28 03:21:47 +02:00
Fabien Potencier cff410507f bug #10983 [DomCrawler] Fixed charset detection in html5 meta charset tag (77web)
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
2014-05-27 00:15:18 +02:00
77web 172e75208a [DomCrawler] Fixed charset detection in html5 meta charset tag 2014-05-27 00:15:16 +02:00
Fabien Potencier 682f0a34fe Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-26 21:02:40 +02:00
Fabien Potencier 6cee250b55 Merge branch '2.4' into 2.5
* 2.4:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy
2014-05-26 18:43:24 +02:00
Fabien Potencier 53d5ecaa00 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy

Conflicts:
	src/Symfony/Component/HttpKernel/Tests/KernelTest.php
2014-05-26 18:43:09 +02:00
Fabien Potencier 5d13be7c71 Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
This reverts commit 735e9a4768, reversing
changes made to 5c91dc1a3a.
2014-05-26 18:42:04 +02:00
Fabien Potencier 55888299be Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
This reverts commit 7dc8931969, reversing
changes made to 309046a207.
2014-05-26 18:42:01 +02:00
Fabien Potencier d1f77c6d0d Revert "fixed CS"
This reverts commit 11816c5e51.
2014-05-26 18:41:58 +02:00
Fabien Potencier af1c41c2fc Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
This reverts commit 9766c72324, reversing
changes made to 168174af08.
2014-05-26 18:41:54 +02:00
Fabien Potencier 8d29ca160d Revert "[HttpKernel] simplified some tests"
This reverts commit ccacd8d2af.
2014-05-26 18:41:51 +02:00
Fabien Potencier ccacd8d2af [HttpKernel] simplified some tests 2014-05-26 18:12:56 +02:00
Fabien Potencier 9766c72324 bug #10979 Make rootPath part of regex greedy (artursvonda)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10979).

Discussion
----------

Make rootPath part of regex greedy

- Fixes #10977
- Also replaced `isset() && true` with simple `!empty()` which is equivalent.

Commits
-------

31da839 Make rootPath part of regex greedy
2014-05-26 18:03:54 +02:00
Arturs Vonda 31da839447 Make rootPath part of regex greedy
- Fixes #10977
2014-05-26 18:03:48 +02:00
Fabien Potencier 487e6ed466 Merge branch '2.4' into 2.5
* 2.4:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:38 +02:00
Fabien Potencier 4ba44a786c Merge branch '2.3' into 2.4
* 2.3:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:05 +02:00
Fabien Potencier 168174af08 bug #10995 [TwigBridge][Trans]set %count% only on transChoice from the current context. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge][Trans]set %count% only on transChoice from the current context.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8408
| License       | MIT

Commits
-------

d176ffc [TwigBridge][Trans]set %count% only on transChoice
2014-05-26 16:50:09 +02:00
Abdellatif AitBoudad d176ffca51 [TwigBridge][Trans]set %count% only on transChoice 2014-05-26 14:22:36 +01:00
Fabien Potencier 0572674ac0 minor #10988 [Debug] preserve modified error level (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] preserve modified error level

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

Minor edge case, but still a bug fix.
Replaces https://github.com/symfony/symfony/pull/10978

Commits
-------

e40b717 [Debug] preserve modified error level
2014-05-25 16:44:21 +02:00
Fabien Potencier ea6886d804 bug #10989 [Debug] throw even in stacking mode to preserve code paths (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] throw even in stacking mode to preserve code paths

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no if throwing a parent class is accepted
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

Throwing \ErrorException instead of ContextErrorException is a better work around for https://bugs.php.net/42098

Commits
-------

d06b206 [Debug] throw even in stacking mode to preserve code paths
2014-05-25 16:42:47 +02:00
Nicolas Grekas d06b206762 [Debug] throw even in stacking mode to preserve code paths 2014-05-25 12:15:31 +02:00
Nicolas Grekas e40b717b17 [Debug] preserve modified error level 2014-05-25 11:36:54 +02:00
Fabien Potencier 78649a804d bug #10987 [DomCrawler] Fixed a forgotten case of complex XPath queries (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Fixed a forgotten case of complex XPath queries

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10986
| License       | MIT
| Doc PR        | n/a

This fixes the case I forgot when rewritting the XPath to avoid making it produce invalid queries. I ran the new tests against the old implementation first, to ensure they cover the BC properly.

I could have detected it by running the Mink 1.5 testsuite with the new code (which is the case for people reporting the bug), but I only ran it for Mink 1.6 which does not produce such XPath anymore.

Commits
-------

a9de61e [DomCrawler] Fixed a forgotten case of complex XPath queries
2014-05-25 03:09:37 +02:00
Christophe Coevoet a9de61e86d [DomCrawler] Fixed a forgotten case of complex XPath queries 2014-05-24 19:16:55 +02:00
Fabien Potencier bd68412a28 feature #10930 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput (romainneutron)
This PR was merged into the 2.4-dev branch.

Discussion
----------

[Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT

This deprecates passing a `Process` input any value that is not a strict string. This needs #10929 to be merged.
I don't know if the use of `trigger_error` is correct or should be removed.

Commits
-------

9887b83 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput
2014-05-23 16:34:38 +02:00
Fabien Potencier e705499f34 bumped Symfony version to 2.4.6 2014-05-23 16:00:26 +02:00
Romain Neutron 9887b831d2 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput 2014-05-23 11:02:52 +02:00
Fabien Potencier 885b6d1744 updated VERSION for 2.4.5 2014-05-22 23:04:05 +02:00
Fabien Potencier 939778b894 updated CHANGELOG for 2.4.5 2014-05-22 23:03:59 +02:00
Fabien Potencier e7971e5af5 bug #10971 [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation (romainneutron)
This PR was merged into the 2.3-dev branch.

Discussion
----------

[Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT

As reported in https://github.com/symfony/symfony/pull/10932#issuecomment-43939786, it's been introduced when merging 2.3 in master

Commits
-------

3454d60 [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation
2014-05-22 22:57:44 +02:00
Romain Neutron 3454d6084f [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation 2014-05-22 22:37:04 +02:00
Fabien Potencier 29341fab1b bumped Symfony version to 2.3.16 2014-05-22 22:22:30 +02:00
Fabien Potencier 424a567d2c updated VERSION for 2.3.15 2014-05-22 19:23:49 +02:00
Fabien Potencier 7bd0873550 updated CHANGELOG for 2.3.15 2014-05-22 19:23:43 +02:00
Tobias Schultze ad348a9b07 [HttpFoundation] implement session locking for PDO 2014-05-22 18:22:20 +02:00
Fabien Potencier 26bc81e5a0 Merge branch '2.4'
* 2.4:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14
2014-05-22 18:21:05 +02:00
Fabien Potencier 513483fb49 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-22 18:21:00 +02:00
Fabien Potencier 57a64a0fa6 Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-22 18:20:26 +02:00
Fabien Potencier 08bc4d9203 bumped Symfony version to 2.3.15 2014-05-22 18:18:05 +02:00
Fabien Potencier a037f31de8 updated VERSION for 2.3.14 2014-05-22 16:27:03 +02:00
Fabien Potencier 5a66baf22c update CONTRIBUTORS for 2.3.14 2014-05-22 16:26:40 +02:00
Fabien Potencier 2ee1df31cd updated CHANGELOG for 2.3.14 2014-05-22 16:26:18 +02:00