Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 451d44b

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.8' into 3.4
* 2.8: {% if label is not same as(false) and required %} Shorten ternary operator Fix wrong usage in custom authenticator checking if password is invalid 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 df3e2d1 + 13d481e commit 451d44b
Copy full SHA for 451d44b

File tree

Expand file treeCollapse file tree

8 files changed

+17
-7
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+17
-7
lines changed

‎components/finder.rst

Copy file name to clipboardExpand all lines: components/finder.rst
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,14 @@ Sort the result by name or by type (directories first, then files)::
171171

172172
$finder->sortByType();
173173

174+
Sort the files and directories by the last accessed, changed or modified time::
175+
176+
$finder->sortByAccessedTime();
177+
178+
$finder->sortByChangedTime();
179+
180+
$finder->sortByModifiedTime();
181+
174182
.. note::
175183

176184
Notice that the ``sort*`` methods need to get all matching elements to do

‎contributing/code/bugs.rst

Copy file name to clipboardExpand all lines: contributing/code/bugs.rst
+1-1Lines 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

Copy file name to clipboardExpand all lines: create_framework/front_controller.rst
+1-1Lines 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

Copy file name to clipboardExpand all lines: form/action_method.rst
+2Lines 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 newAction()
2929
{
30+
// ...
31+
3032
$form = $this->createFormBuilder($task)
3133
->setAction($this->generateUrl('target_route'))
3234
->setMethod('GET')

‎form/form_customization.rst

Copy file name to clipboardExpand all lines: form/form_customization.rst
+2-2Lines 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

Copy file name to clipboardExpand all lines: reference/forms/twig_reference.rst
+1-1Lines 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

Copy file name to clipboardExpand all lines: security/custom_password_authenticator.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ 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
}

‎setup/homestead.rst

Copy file name to clipboardExpand all lines: setup/homestead.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ developing your Symfony application!
7272
.. _Homestead: https://laravel.com/docs/homestead
7373
.. _Vagrant: https://www.vagrantup.com/
7474
.. _the Homestead documentation: https://laravel.com/docs/homestead#installation-and-setup
75-
.. _Daily Usage: https://laravel.com/docs/5.1/homestead#daily-usage
75+
.. _Daily Usage: https://laravel.com/docs/homestead#daily-usage
7676
.. _this blog post: https://www.whitewashing.de/2013/08/19/speedup_symfony2_on_vagrant_boxes.html

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.