Skip to content

Commit 152ac71

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Update authorization.rst Update filesystem.rst
2 parents 9a88524 + e5a151c commit 152ac71

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

components/filesystem.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ of a single file or directory::
193193
$filesystem->rename('/tmp/processed_video.ogg', '/path/to/store/video_647.ogg');
194194
// renames a directory
195195
$filesystem->rename('/tmp/files', '/path/to/store/files');
196+
// if the target already exists, a third boolean argument is available to overwrite.
197+
$filesystem->rename('/tmp/processed_video2.ogg', '/path/to/store/video_647.ogg', true);
196198

197199
``symlink``
198200
~~~~~~~~~~~

components/security/authorization.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ recognizes several strategies:
4747
grant access if there are more voters granting access than there are denying;
4848

4949
``unanimous``
50-
only grant access if none of the voters has denied access;
50+
only grant access if none of the voters has denied access. If all voters
51+
abstained from voting, the decision is based on the ``allow_if_all_abstain``
52+
config option (which defaults to ``false``).
5153

5254
Usage of the available options in detail::
5355

0 commit comments

Comments
 (0)