10000 Merge branch '3.4' into 4.1 · symfony/symfony-docs@2828795 · GitHub
[go: up one dir, main page]

Skip to content

Commit 2828795

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: {% if label is not same as(false) and required %} Update service_container.rst Shorten ternary operator Fix wrong usage in custom authenticator checking if password is invalid [Process] Fix typo in Process object initialization update hardcoded 5.1 version link Add undocumented sortByAccessedTime, sortByChangedTime and sortByModifiedTime methods in finder component Update bugs.rst [#10200] remove trailing spaces action_method is missing $task variable Fix bad link
2 parents 73f8755 + 451d44b commit 2828795

File tree

10 files changed

+19
-9
lines changed

10 files changed

+19
-9
lines changed

components/finder.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,14 @@ Sort the result by name or by type (directories first, then files)::
178178
.. versionadded:: 4.2
179179
The option to use the natural sort order was introduced in Symfony 4.2.
180180

181+
Sort the files and directories by the last accessed, changed or modified time::
182+
183+
$finder->sortByAccessedTime();
184+
185+
$finder->sortByChangedTime();
186+
187+
$finder->sortByModifiedTime();
188+
181189
You can also define your own sorting algorithm with ``sort()`` method::
182190

183191
$finder->sort(function (\SplFileInfo $a, \SplFileInfo $b) {

components/process.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Before a process is started, you can specify its standard input using either the
241241
of the constructor. The provided input can be a string, a stream resource or a
242242
Traversable object::
243243

244-
$process = new Process('cat']);
244+
$process = new Process('cat');
245245
$process->setInput('foobar');
246246
$process->run();
247247

contributing/code/bugs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If your problem definitely looks like a bug, report it using the official bug
4444

4545
* *(optional)* Attach a :doc:`patch <patches>`.
4646

47-
.. _`Stack Overflow`: https://stackoverflow.com/questions/tagged/symfony2
47+
.. _`Stack Overflow`: https://stackoverflow.com/questions/tagged/symfony
4848
.. _IRC channel: https://symfony.com/irc
4949
.. _the Symfony Slack: https://symfony.com/slack-invite
5050
.. _tracker: https://github.com/symfony/symfony/issues

create_framework/front_controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ web root directory:
153153
Now, configure your web server root directory to point to ``web/`` and all
154154
other files won't be accessible from the client anymore.
155155

156-
To test your changes in a browser (``http://localhost:4321/hello/?name=Fabien``), run
156+
To test your changes in a browser (``http://localhost:4321/hello?name=Fabien``), run
157157
the PHP built-in server:
158158

159159
.. code-block:: terminal

form/action_method.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ form, you can use ``setAction()`` and ``setMethod()``:
2727
{
2828
public function new()
2929
{
30+
// ...
31+
3032
$form = $this->createFormBuilder($task)
3133
->setAction($this->generateUrl('target_route'))
3234
->setMethod('GET')

form/form_customization.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ form, modify the ``use`` tag and add the following:
755755
{% block form_label %}
756756
{{ block('base_form_label') }}
757757

758-
{% if required %}
758+
{% if label is not same as(false) and required %}
759759
<span class="required" title="This field is required">*</span>
760760
{% endif %}
761761
{% endblock %}
@@ -770,7 +770,7 @@ the following:
770770
{% block form_label %}
771771
{{ parent() }}
772772

773-
{% if required %}
773+
{% if label is not same as(false) and required %}
774774
<span class="required" title="This field is required">*</span>
775775
{% endif %}
776776
{% endblock %}

reference/forms/twig_reference.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ done by using a public ``vars`` property on the
322322
.. code-block:: html+twig
323323

324324
<label for="{{ form.name.vars.id }}"
325-
class="{{ form.name.vars.required ? 'required' : '' }}">
325+
class="{{ form.name.vars.required ? 'required' }}">
326326
{{ form.name.vars.label }}
327327
</label>
328328

security/custom_password_authenticator.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ FFA1 the user::
6363
if ('' === ($givenPassword = $token->getCredentials())) {
6464
throw new BadCredentialsException('The given password cannot be empty.');
6565
}
66-
if (!$this->encoder->isPasswordValid($user->getPassword(), $givenPassword, $user->getSalt())) {
66+
if (!$this->encoder->isPasswordValid($user, $givenPassword)) {
6767
throw new BadCredentialsException('The given password is invalid.');
6868
}
6969
}

service_container.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ But, with ``autoconfigure: true``, you don't need the tag. In fact, if you're us
772772
the :ref:`default services.yaml config <service-container-services-load-example>`,
773773
you don't need to do *anything*: the service will be automatically loaded. Then,
774774
``autoconfigure`` will add the ``twig.extension`` tag *for* you, because your class
775-
implements ``Twig\\Extension\\ExtensionInterface``. And thanks to ``autowire``, you can even add
775+
implements ``Twig\Extension\ExtensionInterface``. And thanks to ``autowire``, you can even add
776776
constructor arguments without any configuration.
777777

778778
.. _container-public:

setup/homestead.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ developing your Symfony application!
7575
.. _Homestead: https://laravel.com/docs/homestead
7676
.. _Vagrant: https://www.vagrantup.com/
7777
.. _the Homestead documentation: https://laravel.com/docs/homestead#installation-and-setup
78-
.. _Daily Usage: https://laravel.com/docs/5.1/homestead#daily-usage
78+
.. _Daily Usage: https://laravel.com/docs/homestead#daily-usage
7979
.. _this blog post: https://www.whitewashing.de/2013/08/19/speedup_symfony2_on_vagrant_boxes.html

0 commit comments

Comments
 (0)
0