Skip to content

Commit 856dbe6

Browse files
committed
fix: correct rebase
1 parent 2a6dd83 commit 856dbe6

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/Adapter/Builder/UnixPermissionTrait.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,26 @@
1616
use Symfony\Component\OptionsResolver\OptionsResolver;
1717

1818
/**
19+
* @internal
20+
*
1921
* @author Maxime Hélias <[email protected]>
2022
*/
2123
trait UnixPermissionTrait
2224
{
2325
protected function configureUnixOptions(OptionsResolver $resolver): void
2426
{
25-
$resolver->setDefault('permissions', function (OptionsResolver $subResolver) {
26-
$subResolver->setDefault('file', function (OptionsResolver $permsResolver) {
27+
$method = method_exists($resolver, 'setOptions') ? 'setOptions' : 'setDefault';
28+
29+
$resolver->$method('permissions', function (OptionsResolver $subResolver) use ($method) {
30+
$subResolver->$method('file', function (OptionsResolver $permsResolver) {
2731
$permsResolver->setDefault('public', 0644);
2832
$permsResolver->setAllowedTypes('public', 'scalar');
2933

3034
$permsResolver->setDefault('private', 0600);
3135
$permsResolver->setAllowedTypes('private', 'scalar');
3236
});
3337

34-
$subResolver->setDefault('dir', function (OptionsResolver $permsResolver) {
38+
$subResolver->$method('dir', function (OptionsResolver $permsResolver) {
3539
$permsResolver->setDefault('public', 0755);
3640
$permsResolver->setAllowedTypes('public', 'scalar');
3741

0 commit comments

Comments
 (0)