Commit Graph

18333 Commits

Author SHA1 Message Date
Jakub Zalas
ef23f02415 [DoctrineBridge] Fix empty parameter logging in the dbal logger 2014-08-22 12:29:51 +02:00
Lee Rowlands
1ee96a8b1b Test examples from Drupal SA-CORE-2014-003 2014-08-22 11:57:03 +02:00
Nicolas Grekas
5506ee8f66 Fix potential DoS when parsing HOST 2014-08-22 11:56:47 +02:00
Tom Corrigan
580e1a7b46 [Validator] fixed: Expressions always valid for null values
The ExpressionValidator was incorrectly skipping validation of null or
empty string values.
2014-08-21 16:49:24 +10:00
Christophe Coevoet
b96e7f9707 bug #11692 [DomCrawler] check for the correct field type (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] check for the correct field type

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

HTML allow to define different form fields with the same name. Imagine the following form:

```html
    <html>
        <body>
            <form action="/">
                <input type="hidden" name="option" value="default">
                <input type="radio" name="option" value="A">
                <input type="radio" name="option" value="B">
                <input type="hidden" name="settings[1]" value="0">
                <input type="checkbox" name="settings[1]" value="1" id="setting-1">
                <button>klickme</button>
            </form>
        </body>
    </html>
```

Since the `FormFieldRegistry` can only handle one field per name, the hidden field option is registered first before the radio field with the same name is evaluated. Thus, the `FormFieldRegistry` returns an `InputFormField` instance on which the `addChoices()` method can not be called.

Commits
-------

169b397 check for the correct field type
2014-08-21 02:21:59 +02:00
Tobias Schultze
14d3f97488 [Validator] add getConstraints to MetadataInterface 2014-08-20 16:22:55 +02:00
Issei.M
0deb505e64 [Form] FormBuilder::getIterator() now deals with resolved children 2014-08-20 19:06:28 +09:00
Tobias Schultze
f262b01c5f bug #11672 [Routing] fix handling of nullable XML attributes (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] fix handling of nullable XML attributes

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

As @Tobion pointed out in #11394, ``true`` and ``1`` are valid values in boolean XML attributes. The XmlFileLoader didn't handle ``1`` values properly.

Commits
-------

7b4d4b6 fix handling of nullable XML attributes
2014-08-20 10:56:18 +02:00
Bernhard Schussek
aa58bb8048 minor #11706 [Validator] ClassMetadata doc fix (Tobion)
This PR was merged into the 2.5 branch.

Discussion
----------

[Validator] ClassMetadata doc fix

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

- [Validator] fix return doc of ClassMetadata::getCascadingStrategy (int instead of bool)
- [Validator] remove duplicate interface implementations (they are already implemented by extension)

Commits
-------

1eec2d6 [Validator] remove duplicate interface implementations
6dd5592 [Validator] fix return doc of ClassMetadata::getCascadingStrategy
2014-08-20 10:30:39 +02:00
Christian Flothmann
a47a8848c3 add test for #11604
Adds a test case for #11604 to avoid regressions. The actual issue
has been fixed in Symfony 2.3 with the merge of #11615.
2014-08-19 17:38:34 +02:00
Tobias Schultze
04eb61b80e [Validator] deprecate member metadata accessors in favor of existing property metadata accessors
add changelog for deprecations

fix test
2014-08-19 17:31:17 +02:00
Tobias Schultze
1eec2d6fda [Validator] remove duplicate interface implementations 2014-08-19 17:15:19 +02:00
Tobias Schultze
6dd55923e3 [Validator] fix return doc of ClassMetadata::getCascadingStrategy 2014-08-19 17:01:40 +02:00
Bernhard Schussek
229355618b feature #11657 [Validator] Added ConstraintViolation::getConstraint() (webmozart)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Validator] Added ConstraintViolation::getConstraint()

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

This PR adds a `getConstraint()` method to the `ConstraintViolation` in order to access the constraint causing the violation.

Related to #7276, #7273 and #9691.

Commits
-------

ce1d209 [Validator] Added ConstraintViolation::getConstraint()
2014-08-19 14:35:17 +02:00
Christophe Coevoet
00aedfc150 bug #11624 [DomCrawler] fix the axes handling in a bc way (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] fix the axes handling in a bc way

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

The previous fix in #11548 for handling XPath axes was not backward compatible. In previous Symfony versions the Crawler handled nodes by holding a "fake root node". This must be taken into account when evaluating (relativizing) XPath expressions.

Commits
-------

d26040f [DomCrawler] fix the axes handling in a bc way
2014-08-19 12:43:37 +02:00
Bernhard Schussek
ce1d2093bd [Validator] Added ConstraintViolation::getConstraint() 2014-08-19 11:39:05 +02:00
Bernhard Schussek
60a5863ba4 [Validator] Added date support to comparison constraints and Range 2014-08-19 11:31:05 +02:00
Bernhard Schussek
afab3ee4c2 bug #11676 [Form] Fixed #11675 ValueToDuplicatesTransformer accept "0" value (Nek-)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11676).

Discussion
----------

[Form] Fixed #11675 ValueToDuplicatesTransformer accept "0" value

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

Commits
-------

31d48ab Fixed #11675 ValueToDuplicatesTransformer accept "0" value
2014-08-19 11:05:04 +02:00
Nek (Maxime Veber)
31d48ab91f Fixed #11675 ValueToDuplicatesTransformer accept "0" value
Fixed wrong return null syntax

Added transformation to null on empty arrays

Removed useless statement in condition and switched to yoda condition
2014-08-19 11:05:04 +02:00
Bernhard Schussek
1d7599d97f Merge branch '2.5'
* 2.5:
  [Validator] Fixed missing use statements
  [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise
  [FrameworkBundle] Fixed validator factory definition when the Validator API is "auto" for PHP < 5.3.9
  return empty metadata collection if none do exist
2014-08-19 10:59:23 +02:00
Bernhard Schussek
fb97786a10 [Validator] Fixed missing use statements 2014-08-19 10:58:49 +02:00
Bernhard Schussek
59cd05f5b7 Merge branch '2.4' into 2.5
* 2.4:
  [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise
  return empty metadata collection if none do exist
2014-08-19 10:56:37 +02:00
Bernhard Schussek
9c69d7004d Merge branch '2.3' into 2.4
* 2.3:
  [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise
  return empty metadata collection if none do exist
2014-08-19 10:55:40 +02:00
Bernhard Schussek
3d59e3417f bug #11695 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise (webmozart)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11695).

Discussion
----------

[Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise

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

I just ran the tests with ICU 52.1 installed and noticed that a few of them failed. This PR fixes these tests.

Commits
-------

5440ed5 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise
2014-08-19 10:50:01 +02:00
Bernhard Schussek
5440ed5c38 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise 2014-08-19 10:50:01 +02:00
Bernhard Schussek
f825f5d1c3 minor #11615 [Validator] return empty metadata collection if none do exist (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] return empty metadata collection if none do exist

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | [The reference to the documentation PR if any]

Backport of #11614 for Symfony 2.3 and 2.4.

Commits
-------

f5bc18d return empty metadata collection if none do exist
2014-08-19 10:48:01 +02:00
Bernhard Schussek
a6beede7d7 bug #11691 [Validator] Fixed Constraint class to not destroy custom groups upon serialization (webmozart)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Validator] Fixed Constraint class to not destroy custom groups upon serialization

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

Commits
-------

d405f43 [Validator] Fixed Constraint class to not destroy custom groups upon serialization
2014-08-19 10:15:39 +02:00
Christian Flothmann
169b3978ae check for the correct field type
HTML allow to define different form fields with the same name.
Imagine the following form:

    <html>
        <body>
            <form action="/">
                <input type="hidden" name="option" value="default">
                <input type="radio" name="option" value="A">
                <input type="radio" name="option" value="B">
                <input type="hidden" name="settings[1]" value="0">
                <input type="checkbox" name="settings[1]" value="1" id="setting-1">
                <button>klickme</button>
            </form>
        </body>
    </html>

Since the `FormFieldRegistry` can only handle one field per name, the
hidden field option is registered first before the radio field with
the same name is evaluated. Thus, the `FormFieldRegistry` returns an
`InputFormField` instance on which the `addChoices()` method can not
be called.
2014-08-18 17:01:30 +02:00
Christian Flothmann
45a5863508 [YAML] resolve variables in inlined YAML 2014-08-18 16:09:32 +02:00
Hryhorii Hrebiniuk
ef5d7c596e [Translation] added method to expose collected messages 2014-08-18 16:11:02 +03:00
Bernhard Schussek
bb9552f2f6 bug #11584 [FrameworkBundle] Fixed validator factory definition when the Validator API is "auto" for PHP < 5.3.9 (webmozart)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] Fixed validator factory definition when the Validator API is "auto" for PHP < 5.3.9

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

Commits
-------

a74b758 [FrameworkBundle] Fixed validator factory definition when the Validator API is "auto" for PHP < 5.3.9
2014-08-18 13:55:07 +02:00
Bernhard Schussek
d405f43a9b [Validator] Fixed Constraint class to not destroy custom groups upon serialization 2014-08-18 13:53:05 +02:00
Matthieu Auger
ce53c8a00b [FrameworkBundle] Add Event Dispatcher debug command 2014-08-18 13:47:30 +02:00
Nicolas Grekas
73c7eae317 feature #11668 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field (catchamonkey)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field

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

This PR applies #11510 to master instead of 2.3

Should be merged on master:
- [x] after https://github.com/symfony/symfony/pull/11667 is merged to 2.3
- [x] and after 2.3 is merged back to master

Commits
-------

beca900 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
2014-08-18 11:48:07 +02:00
Chris Sedlmayr
beca900a61 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field 2014-08-18 11:06:41 +02:00
Nicolas Grekas
7f38207967 Merge branch '2.5'
* 2.5:
  add missing options
  [Form] Fixed ValidatorExtension to work with the 2.5 Validation API
  revert #11510, moved to 2.6
  [WebProfilerBundle] Fixed double height of canvas
2014-08-18 11:02:08 +02:00
Nicolas Grekas
de871dc6f8 Merge branch '2.4' into 2.5
* 2.4:
  add missing options
  revert #11510, moved to 2.6
  [WebProfilerBundle] Fixed double height of canvas
2014-08-18 11:01:49 +02:00
Nicolas Grekas
562ca3d19c Merge branch '2.3' into 2.4
* 2.3:
  add missing options
  revert #11510, moved to 2.6
  [WebProfilerBundle] Fixed double height of canvas
2014-08-18 11:01:24 +02:00
Nicolas Grekas
b674e678db minor #11674 [Validator] Add missing translation NL (1emming)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11674).

Discussion
----------

[Validator] Add missing translation NL

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

Commits
-------

2d5ab91 add missing options
2014-08-18 10:59:14 +02:00
Seb Koelen
2d5ab91fe4 add missing options 2014-08-18 10:59:14 +02:00
Bernhard Schussek
cf8b4e253b bug #11645 [Form] Fixed ValidatorExtension to work with the 2.5 Validation API (webmozart)
This PR was merged into the 2.5 branch.

Discussion
----------

[Form] Fixed ValidatorExtension to work with the 2.5 Validation API

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

The ValidatorExtension::loadTypeGuesser() method used to fail because the method `getMetadataFactory()` does not exist anymore on the new `ValidatorInterface`. This was fixed easily, because `ValidatorInterface` now extends `ClassMetadataFactory`.

Commits
-------

ff74f4e [Form] Fixed ValidatorExtension to work with the 2.5 Validation API
2014-08-15 11:42:11 +02:00
Bernhard Schussek
ff74f4e565 [Form] Fixed ValidatorExtension to work with the 2.5 Validation API 2014-08-15 11:41:31 +02:00
Christian Flothmann
7b4d4b63eb fix handling of nullable XML attributes
As @Tobion pointed out in #11394, true and 1 are valid values in
boolean XML attributes. The XmlFileLoader didn't handle 1 values
properly.
2014-08-15 11:05:55 +02:00
Bernhard Schussek
a74b758ca2 [FrameworkBundle] Fixed validator factory definition when the Validator API is "auto" for PHP < 5.3.9 2014-08-15 10:50:13 +02:00
Bernhard Schussek
8725243a88 Merge branch '2.5'
* 2.5: (37 commits)
  [Validator] Backported constraint validator tests from 2.5
  [Validator] Backported constraint validator tests from 2.5
  [DIC] Fixed: anonymous services are always private
  Fix toolbar vertical alignment.
  [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
  [Validator] Fix little typo in ExecutionContextInterface::buildViolation() method comments
  fix dependencies on HttpFoundation component
  [FrameworkBundle] add missing attribute to XSD
  Allow basic auth in url. Improve regex. Add tests.
  fix typos and syntax in Profiler controller method comments
  resolve parameters before the configs are processed
  add symfony/yaml suggestion to composer.json
  [HttpKernel] added an analyze of environment parameters for built-in server.
  remove volatile tests
  [Console] fixed style creation when providing an unknown tag option
  change command to which available under most unix systems
  add way to test command under windows
  fix shell command injection
  [Form] allowed CallbackTransformer to use callable
  [Process] Added process synchronization to the incremental output tests
  ...

Conflicts:
	src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Validator/Constraints/AllValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Constraints/LegacyAllValidator.php
	src/Symfony/Component/Validator/Constraints/LegacyCollectionValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
2014-08-14 18:37:29 +02:00
Bernhard Schussek
0801a3a8f0 Merge branch '2.4' into 2.5
* 2.4:
  [Validator] Backported constraint validator tests from 2.5
  [Validator] Backported constraint validator tests from 2.5
  Fix toolbar vertical alignment.
  [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
  [FrameworkBundle] add missing attribute to XSD
  Allow basic auth in url. Improve regex. Add tests.
  fix typos and syntax in Profiler controller method comments
  remove volatile tests
  [Console] fixed style creation when providing an unknown tag option
  [Validator] Convert objects to string in comparison validators. Reapplies 6cf5e0812e
  [HttpFoundation] Update QUERY_STRING when overrideGlobals

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
	src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
	src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
	src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
	src/Symfony/Component/Validator/Constraints/AllValidator.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FalseValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/GroupSequenceTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NotNullValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NullValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TrueValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TypeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
	src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
2014-08-14 18:10:54 +02:00
Bernhard Schussek
16c94d29f0 minor #11647 [Validator] Backported constraint validator tests from 2.5 (webmozart)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Backported constraint validator tests from 2.5

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

This PR backports the constraint validator tests from 2.5 to 2.4 to facilitate maintenance. When we adapt a test in 2.4, we can now easily merge the change forward to 2.5.

Commits
-------

845c33c [Validator] Backported constraint validator tests from 2.5
2014-08-14 17:37:35 +02:00
Nicolas Grekas
65862c9947 minor #11667 [HttpFoundation] revert #11510, moved to 2.6 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] revert #11510, moved to 2.6

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

This reverts PR #11510 from 2.3.

Commits
-------

fb120c7 revert #11510, moved to 2.6
2014-08-14 17:05:58 +02:00
Bernhard Schussek
845c33cfaa [Validator] Backported constraint validator tests from 2.5 2014-08-14 16:56:25 +02:00
Bernhard Schussek
054f1b5536 Merge branch '2.3' into 2.4
* 2.3:
  [Validator] Backported constraint validator tests from 2.5
  Fix toolbar vertical alignment.
  [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
  [FrameworkBundle] add missing attribute to XSD
  Allow basic auth in url. Improve regex. Add tests.
  fix typos and syntax in Profiler controller method comments
  remove volatile tests
  [Console] fixed style creation when providing an unknown tag option
  [Validator] Convert objects to string in comparison validators. Reapplies 6cf5e0812e
  [HttpFoundation] Update QUERY_STRING when overrideGlobals

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
	src/Symfony/Component/Validator/Constraints/AllValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
	src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
2014-08-14 16:51:32 +02:00