Merge branch '3.4' into 4.0
* 3.4: [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 Replace .initialism with .text-uppercase.
This commit is contained in:
commit
72141443ad
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -25,3 +25,5 @@
|
|||||||
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
|
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
|
||||||
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
|
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
|
||||||
/src/Symfony/Component/Workflow/* @lyrixx
|
/src/Symfony/Component/Workflow/* @lyrixx
|
||||||
|
# Yaml
|
||||||
|
/src/Symfony/Component/Yaml/* @xabbuh
|
||||||
|
@ -187,7 +187,7 @@
|
|||||||
{%- set element = 'legend' -%}
|
{%- set element = 'legend' -%}
|
||||||
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
|
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
|
{%- set label_attr = label_attr|merge({for: id}) -%}
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
{% if required -%}
|
{% if required -%}
|
||||||
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
|
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
|
||||||
@ -268,8 +268,8 @@
|
|||||||
{%- if errors|length > 0 -%}
|
{%- if errors|length > 0 -%}
|
||||||
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
|
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
|
||||||
{%- for error in errors -%}
|
{%- for error in errors -%}
|
||||||
<span class="mb-0 d-block">
|
<span class="d-block">
|
||||||
<span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
|
<span class="form-error-icon badge badge-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
|
||||||
</span>
|
</span>
|
||||||
{%- endfor -%}
|
{%- endfor -%}
|
||||||
</span>
|
</span>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
"symfony/asset": "~3.4|~4.0",
|
"symfony/asset": "~3.4|~4.0",
|
||||||
"symfony/dependency-injection": "~3.4|~4.0",
|
"symfony/dependency-injection": "~3.4|~4.0",
|
||||||
"symfony/finder": "~3.4|~4.0",
|
"symfony/finder": "~3.4|~4.0",
|
||||||
"symfony/form": "^3.4.9|^4.0.9",
|
"symfony/form": "^3.4.13|~4.0.13|^4.1.2",
|
||||||
"symfony/http-foundation": "~3.4|~4.0",
|
"symfony/http-foundation": "~3.4|~4.0",
|
||||||
"symfony/http-kernel": "~3.4|~4.0",
|
"symfony/http-kernel": "~3.4|~4.0",
|
||||||
"symfony/polyfill-intl-icu": "~1.0",
|
"symfony/polyfill-intl-icu": "~1.0",
|
||||||
@ -41,7 +41,7 @@
|
|||||||
"symfony/workflow": "~3.4|~4.0"
|
"symfony/workflow": "~3.4|~4.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/form": "<3.4.9|<4.0.9,>=4.0",
|
"symfony/form": "<3.4.13|>=4.0,<4.0.13|>=4.1,<4.1.2",
|
||||||
"symfony/console": "<3.4"
|
"symfony/console": "<3.4"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
|
@ -33,7 +33,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
|
|||||||
./label[@for="name"]
|
./label[@for="name"]
|
||||||
[
|
[
|
||||||
./span[@class="alert alert-danger d-block"]
|
./span[@class="alert alert-danger d-block"]
|
||||||
[./span[@class="mb-0 d-block"]
|
[./span[@class="d-block"]
|
||||||
[./span[.="[trans]Error[/trans]"]]
|
[./span[.="[trans]Error[/trans]"]]
|
||||||
[./span[.="[trans]Error![/trans]"]]
|
[./span[.="[trans]Error![/trans]"]]
|
||||||
]
|
]
|
||||||
@ -72,7 +72,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="col-form-label col-sm-2 form-control-label required"]
|
[@class="col-form-label col-sm-2 required"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -89,7 +89,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="my&class col-form-label col-sm-2 form-control-label required"]
|
[@class="my&class col-form-label col-sm-2 required"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -106,7 +106,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="my&class col-form-label col-sm-2 form-control-label required"]
|
[@class="my&class col-form-label col-sm-2 required"]
|
||||||
[.="[trans]Custom label[/trans]"]
|
[.="[trans]Custom label[/trans]"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
@ -126,7 +126,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="my&class col-form-label col-sm-2 form-control-label required"]
|
[@class="my&class col-form-label col-sm-2 required"]
|
||||||
[.="[trans]Custom label[/trans]"]
|
[.="[trans]Custom label[/trans]"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
|
@ -42,7 +42,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
|
|||||||
./label[@for="name"]
|
./label[@for="name"]
|
||||||
[
|
[
|
||||||
./span[@class="alert alert-danger d-block"]
|
./span[@class="alert alert-danger d-block"]
|
||||||
[./span[@class="mb-0 d-block"]
|
[./span[@class="d-block"]
|
||||||
[./span[.="[trans]Error[/trans]"]]
|
[./span[.="[trans]Error[/trans]"]]
|
||||||
[./span[.="[trans]Error![/trans]"]]
|
[./span[.="[trans]Error![/trans]"]]
|
||||||
]
|
]
|
||||||
@ -81,7 +81,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="form-control-label required"]
|
[@class="required"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -98,7 +98,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="my&class form-control-label required"]
|
[@class="my&class required"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -115,7 +115,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="my&class form-control-label required"]
|
[@class="my&class required"]
|
||||||
[.="[trans]Custom label[/trans]"]
|
[.="[trans]Custom label[/trans]"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
@ -135,7 +135,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
|
|||||||
$this->assertMatchesXpath($html,
|
$this->assertMatchesXpath($html,
|
||||||
'/label
|
'/label
|
||||||
[@for="name"]
|
[@for="name"]
|
||||||
[@class="my&class form-control-label required"]
|
[@class="my&class required"]
|
||||||
[.="[trans]Custom label[/trans]"]
|
[.="[trans]Custom label[/trans]"]
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
@ -172,11 +172,11 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
|
|||||||
'/span
|
'/span
|
||||||
[@class="alert alert-danger d-block"]
|
[@class="alert alert-danger d-block"]
|
||||||
[
|
[
|
||||||
./span[@class="mb-0 d-block"]
|
./span[@class="d-block"]
|
||||||
[./span[.="[trans]Error[/trans]"]]
|
[./span[.="[trans]Error[/trans]"]]
|
||||||
[./span[.="[trans]Error 1[/trans]"]]
|
[./span[.="[trans]Error 1[/trans]"]]
|
||||||
|
|
||||||
/following-sibling::span[@class="mb-0 d-block"]
|
/following-sibling::span[@class="d-block"]
|
||||||
[./span[.="[trans]Error[/trans]"]]
|
[./span[.="[trans]Error[/trans]"]]
|
||||||
[./span[.="[trans]Error 2[/trans]"]]
|
[./span[.="[trans]Error 2[/trans]"]]
|
||||||
]
|
]
|
||||||
|
@ -81,7 +81,7 @@ class FlockStore implements StoreInterface
|
|||||||
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
|
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
|
||||||
if (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
|
if (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
|
||||||
if ($handle = fopen($fileName, 'x')) {
|
if ($handle = fopen($fileName, 'x')) {
|
||||||
chmod($fileName, 0444);
|
chmod($fileName, 0644);
|
||||||
} elseif (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
|
} elseif (!$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r')) {
|
||||||
usleep(100); // Give some time for chmod() to complete
|
usleep(100); // Give some time for chmod() to complete
|
||||||
$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r');
|
$handle = fopen($fileName, 'r+') ?: fopen($fileName, 'r');
|
||||||
|
Reference in New Issue
Block a user