Skip to content

Commit 57809fb

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: Fixes unclear sentence in finder.rst Fix lock.invoice.retry_till_save.store decoration
2 parents c88b899 + 3e8fcc3 commit 57809fb

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

components/finder.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ And it also works with user-defined streams::
119119
Files or Directories
120120
~~~~~~~~~~~~~~~~~~~~
121121

122-
By default, the Finder returns files and directories; but the
123-
:method:`Symfony\\Component\\Finder\\Finder::files` and
124-
:method:`Symfony\\Component\\Finder\\Finder::directories` methods control that::
122+
By default, the Finder returns both files and directories. If you need to find either files or directories only, use the :method:`Symfony\\Component\\Finder\\Finder::files` and :method:`Symfony\\Component\\Finder\\Finder::directories` methods::
125123

126124
// look for files only; ignore directories
127125
$finder->files();

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2869,7 +2869,7 @@ Name of the lock you want to create.
28692869
lock.invoice.retry_till_save.store:
28702870
class: Symfony\Component\Lock\Store\RetryTillSaveStore
28712871
decorates: lock.invoice.store
2872-
arguments: ['@lock.invoice.retry.till.save.store.inner', 100, 50]
2872+
arguments: ['@lock.invoice.retry_till_save.store.inner', 100, 50]
28732873
28742874
workflows
28752875
~~~~~~~~~

0 commit comments

Comments
 (0)