8000 Merge branch '4.0' into 4.1 · fancyweb/symfony@cfe319c · GitHub
[go: up one dir, main page]
Skip to content

Commit cfe319c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.0' into 4.1
* 4.0: [Filesystem] fix lock file permissions [Lock] fix lock file permissions [Form] Removed .form-control-label class. Removed .mb-0 in errors. Fix the detection of the Process new argument add @xabbuh as a code owner of the Yaml component improve deprecation messages Replace .initialism with .text-uppercase.
2 parents 88f7046 + 7214144 commit cfe319c

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@
2525
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
2626
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
2727
/src/Symfony/Component/Workflow/* @lyrixx
28+
# Yaml
29+
/src/Symfony/Component/Yaml/* @xabbuh

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
{% elseif type is defined and type == 'file' %}
190190
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' custom-file-label')|trim}) -%}
191191
{%- else -%}
192-
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
192+
{%- set label_attr = label_attr|merge({for: id}) -%}
193193
{%- endif -%}
194194
{% if required -%}
195195
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
@@ -284,8 +284,8 @@
284284
{%- if errors|length > 0 -%}
285285
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
286286
{%- for error in errors -%}
287-
<span class="mb-0 d-block">
288-
<span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
287+
<span class="d-block">
288+
<span class="form-error-icon badge badge-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
289289
</span>
290290
{%- endfor -%}
291291
</span>

‎src/Symfony/Bridge/Twig/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/asset": "~3.4|~4.0",
2424
"symfony/dependency-injection": "~3.4|~4.0",
2525
"symfony/finder": "~3.4|~4.0",
26-
"symfony/form": "^4.1",
26+
"symfony/form": "^4.1.2",
2727
"symfony/http-foundation": "~3.4|~4.0",
2828
"symfony/http-kernel": "~3.4|~4.0",
2929
"symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +41,7 @@
4141
"symfony/workflow": "~3.4|~4.0"
4242
},
4343
"conflict": {
44-
"symfony/form": "<4.1",
44+
"symfony/form": "<4.1.2",
4545
"symfony/console": "<3.4"
4646
},
4747
"suggest": {

‎src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testRow()
3333
./label[@for="name"]
3434
[
3535
./span[@class="alert alert-danger d-block"]
36-
[./span[@class="mb-0 d-block"]
36+
[./span[@class="d-block"]
3737
[./span[.="[trans]Error[/trans]"]]
3838
[./span[.="[trans]Error![/trans]"]]
3939
]
@@ -72,7 +72,7 @@ public function testLabelDoesNotRenderFieldAttributes()
7272
$this->assertMatchesXpath($html,
7373
'/label
7474
[@for="name"]
75-
[@class="col-form-label col-sm-2 form-control-label required"]
75+
[@class="col-form-label col-sm-2 required"]
7676
'
7777
);
7878
}
@@ -89,7 +89,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
8989
$this->assertMatchesXpath($html,
9090
'/label
9191
[@for="name"]
92-
[@class="my&class col-form-label col-sm-2 form-control-label required"]
92+
[@class="my&class col-form-label col-sm-2 required"]
9393
'
9494
);
9595
}
@@ -106,7 +106,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
106106
$this->assertMatchesXpath($html,
107107
'/label
108108
[@for="name"]
109-
[@class="my&class col-form-label col-sm-2 form-control-label required"]
109+
[@class="my&class col-form-label col-sm-2 required"]
110110
[.="[trans]Custom label[/trans]"]
111111
'
112112
);
@@ -126,7 +126,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
126126
$this->assertMatchesXpath($html,
127127
'/label
128128
[@for="name"]
129-
[@class="my&class col-form-label col-sm-2 form-control-label required"]
129+
[@class="my&class col-form-label col-sm-2 required"]
130130
[.="[trans]Custom label[/trans]"]
131131
'
132132
);

‎src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testRow()
4242
./label[@for="name"]
4343
[
4444
./span[@class="alert alert-danger d-block"]
45-
[./span[@class="mb-0 d-block"]
45+
[./span[@class="d-block"]
4646
[./span[.="[trans]Error[/trans]"]]
4747
[./span[.="[trans]Error![/trans]"]]
4848
]
@@ -81,7 +81,7 @@ public function testLabelDoesNotRenderFieldAttributes()
8181
$this->assertMatchesXpath($html,
8282
'/label
8383
[@for="name"]
84-
[@class="form-control-label required"]
84+
[@class="required"]
8585
'
8686
);
8787
}
@@ -98,7 +98,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
9898
$this->assertMatchesXpath($html,
9999
'/label
100100
[@for="name"]
101-
[@class="my&class form-control-label required"]
101+
[@class="my&class required"]
102102
'
103103
);
104104
}
@@ -115,7 +115,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
115115
$this->assertMatchesXpath($html,
116116
'/label
117117
[@for="name"]
118-
[@class="my&class form-control-label required"]
11 3582 8+
[@class="my&class required"]
119119
[.="[trans]Custom label[/trans]"]
120120
'
121121
);
@@ -135,7 +135,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
135135
$this->assertMatchesXpath($html,
136136
'/label
137137
[@for="name"]
138-
[@class="my&class form-control-label required"]
138+
[@class="my&class required"]
139139
[.="[trans]Custom label[/trans]"]
140140
'
141141
);
@@ -189,11 +189,11 @@ public function testErrors()
189189
'/span
190190
[@class="alert alert-danger d-block"]
191191
[
192-
./span[@class="mb-0 d-block"]
192+
./span[@class="d-block"]
193193
[./span[.="[trans]Error[/trans]"]]
194194
[./span[.="[trans]Error 1[/trans]"]]
195195
196-
/following-sibling::span[@class="mb-0 d-block"]
196+
/following-sibling::span[@class="d-block"]
197197
[./span[.="[trans]Error[/trans]"]]
198198
[./span[.="[trans]Error 2[/trans]"]]
199199
]

‎src/Symfony/Component/Lock/Store/FlockStore.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private function lock(Key $key, $blocking)
8181
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
8282
if (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
8383
if ($handle = fopen($fileName, 'x')) {
84-
chmod($fileName, 0444);
84+
chmod($fileName, 0644);
8585
} elseif (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
8686
usleep(100); // Give some time for chmod() to complete
8787
$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r');

0 commit comments

Comments
 (0)
0