Skip to content

Commit 874735a

Browse files
Merge branch '4.4' into 5.1
* 4.4: fix merge Remove branch-version (keep them for contracts only) [HttpClient] relax auth bearer format requirements [PHPUnitBridge] Silence errors from mkdir() [DependencyInjection] Preload classes with union types correctly. [Serializer] fix decoding float XML attributes starting with 0 add missing dutch translations Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill Add missing exporter function for PHPUnit 7 [Validator] Add missing romanian translations [Cache] Use correct expiry in ChainAdapter do not translate null placeholders or titles
2 parents 248f5ef + 841c46c commit 874735a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Resources/views/Form/form_div_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
{%- for attrname, attrvalue in attr -%}
467467
{{- " " -}}
468468
{%- if attrname in ['placeholder', 'title'] -%}
469-
{{- attrname }}="{{ translation_domain is same as(false) ? attrvalue : attrvalue|trans(attr_translation_parameters, translation_domain) }}"
469+
{{- attrname }}="{{ translation_domain is same as(false) or attrvalue is null ? attrvalue : attrvalue|trans(attr_translation_parameters, translation_domain) }}"
470470
{%- elseif attrvalue is same as(true) -%}
471471
{{- attrname }}="{{ attrname }}"
472472
{%- elseif attrvalue is not same as(false) -%}

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,5 @@
7777
"/Tests/"
7878
]
7979
},
80-
"minimum-stability": "dev",
81-
"extra": {
82-
"branch-version": "5.1"
83-
}
80+
"minimum-stability": "dev"
8481
}

0 commit comments

Comments
 (0)