8000 Merge branch '2.1' · symfony/symfony@b126664 · GitHub
[go: up one dir, main page]
Skip to content

Commit b126664

Browse files
fabpotfabpot
committed
Merge branch '2.1'
* 2.1: (24 commits) forced Travis to use source to workaround their not-up-to-date Composer on PHP 5.3.3 [Routing] removed irrelevant string cast in Route Fixed typo Make YamlFileLoader and XmlFileLoader file loading extensible [HttpKernel] fix typo Fixed singularization of "prices" [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc. [HttpKernel] fixed Client when using StreamedResponses (closes #5370) fixed PDO session handler for Oracle (closes #5829) [HttpFoundation] fixed PDO session handler for Oracle (closes #5829) [Locale] removed a check that is done too early (and it is done twice anyways) Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf Adding new localized strings for farsi validation. [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937) [Form] Fixed forms not to be marked invalid if their children are already marked invalid [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8 added missing tests from previous merge [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible Fix export-ignore on Windows Show correct class name InputArgument in error message ... Conflicts: .travis.yml src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
2 parents 83de4c2 + 2fa9bd0 commit b126664

File tree

62 files changed

+412
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+412
-76
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ php:
66
- 5.4
77

88
before_script:
9-
- COMPOSER_ROOT_VERSION=dev-master composer --dev install
9+
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
1010
- php src/Symfony/Component/Locale/Resources/data/build-data.php
11-
- export USE_INTL_ICU_DATA_VERSION=1
11+
- export USE_INTL_ICU_DATA_VERSION=1

‎src/Symfony/Bridge/Doctrine/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function validate($entity, Constraint $constraint)
7070
$criteria = array();
7171
foreach ($fields as $fieldName) {
7272
if (!$class->hasField($fieldName) && !$class->hasAssociation($fieldName)) {
73-
throw new ConstraintDefinitionException("Only field names mapped by Doctrine can be validated for uniqueness.");
73+
throw new ConstraintDefinitionException(sprintf("The field '%s' is not mapped by Doctrine, so it cannot be validated for uniqueness.", $fieldName));
7474
}
7575

7676
$criteria[$fieldName] = $class->reflFields[$fieldName]->getValue($entity);

‎src/Symfony/Bridge/Monolog/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

‎src/Symfony/Bridge/Propel1/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

‎src/Symfony/Bridge/Swiftmailer/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

‎src/Symfony/Bridge/Twig/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

‎src/Symfony/Bundle/FrameworkBundle/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

‎src/Symfony/Bundle/SecurityBundle/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

‎src/Symfony/Bundle/TwigBundle/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tests/ export-ignore
1+
/Tests export-ignore
22
phpunit.xml.dist export-ignore

0 commit comments

Comments
 (0)
0