Skip to content

Commit 8397416

Browse files
maxheliasGromNaN
authored andcommitted
Merge pull request #187 from maxhelias/deprecation
fix: remove deprecation
2 parents 5dd3f3e + 77c7bc5 commit 8397416

File tree

3 files changed

+30
-22
lines changed

3 files changed

+30
-22
lines changed

.github/workflows/test.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v3
1616
- uses: shivammathur/setup-php@v2
1717
with:
18-
php-version: '8.0'
18+
php-version: '8.4'
1919
coverage: none
2020
- name: php-cs-fixer
2121
run: |
@@ -31,22 +31,27 @@ jobs:
3131
strategy:
3232
matrix:
3333
php-version:
34-
- '8.1'
35-
- '8.2'
36-
- '8.3'
34+
- '8.4'
3735
symfony-version:
3836
- '5.4.*'
39-
- '6.0.*'
40-
- '6.1.*'
41-
- '6.2.*'
42-
- '6.3.*'
37+
- '6.4.*'
38+
- '7.4.*'
39+
- '8.0.*'
40+
dependency-versions:
41+
- stable
4342
include:
4443
- php-version: '8.0'
4544
symfony-version: '5.4.*'
45+
stability: stable
4646
- php-version: '8.2'
4747
symfony-version: '6.4.*'
48+
stability: stable
4849
- php-version: '8.2'
49-
symfony-version: '7.0.*'
50+
symfony-version: '7.4.*'
51+
stability: stable
52+
- php-version: '8.4'
53+
symfony-version: '8.0.*'
54+
stability: dev
5055

5156
steps:
5257
- name: Checkout code

composer.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"require": {
2929
"php": ">=8.0",
3030
"league/flysystem": "^3.0",
31-
"symfony/config": "^5.4 || ^6.0 || ^7.0",
31+
"symfony/config": "^5.4 || ^6.4 || ^7.0 || 8.0",
3232
"symfony/deprecation-contracts": "^2.1 || ^3",
33-
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
34-
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
35-
"symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
33+
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0 || 8.0",
34+
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0 || 8.0",
35+
"symfony/options-resolver": "^5.4 || ^6.4 || ^7.0 || 8.0"
3636
},
3737
"require-dev": {
3838
"doctrine/mongodb-odm": "^2.0",
@@ -47,17 +47,18 @@
4747
"league/flysystem-sftp-v3": "^3.1",
4848
"league/flysystem-webdav": "^3.29",
4949
"platformcommunity/flysystem-bunnycdn": "^3.3",
50-
"symfony/dotenv": "^5.4 || ^6.0 || ^7.0",
51-
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
52-
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0",
53-
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
54-
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
50+
"symfony/dotenv": "^5.4 || ^6.4 || ^7.0 || ^8.0",
51+
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0",
52+
"symfony/phpunit-bridge": "^5.4 || ^6.4 || ^7.0 || ^8.0",
53+
"symfony/var-dumper": "^5.4 || ^6.4 || ^7.0 || ^8.0",
54+
"symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0"
5555
},
5656
"config": {
5757
"preferred-install": {
5858
"*": "dist"
5959
},
6060
"sort-packages": true
6161
},
62-
"minimum-stability": "beta"
62+
"minimum-stability": "dev",
63+
"prefer-stable": true
6364
}

src/Adapter/Builder/AbstractAdapterDefinitionBuilder.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,18 @@ abstract protected function configureDefinition(Definition $definition, array $o
4545

4646
protected function configureUnixOptions(OptionsResolver $resolver): void
4747
{
48-
$resolver->setDefault('permissions', function (OptionsResolver $subResolver) {
49-
$subResolver->setDefault('file', function (OptionsResolver $permsResolver) {
48+
$method = method_exists($resolver, 'setOptions') ? 'setOptions' : 'setDefault';
49+
50+
$resolver->$method('permissions', function (OptionsResolver $subResolver) use ($method) {
51+
$subResolver->$method('file', function (OptionsResolver $permsResolver) {
5052
$permsResolver->setDefault('public', 0644);
5153
$permsResolver->setAllowedTypes('public', 'scalar');
5254

5355
$permsResolver->setDefault('private', 0600);
5456
$permsResolver->setAllowedTypes('private', 'scalar');
5557
});
5658

57-
$subResolver->setDefault('dir', function (OptionsResolver $permsResolver) {
59+
$subResolver->$method('dir', function (OptionsResolver $permsResolver) {
5860
$permsResolver->setDefault('public', 0755);
5961
$permsResolver->setAllowedTypes('public', 'scalar');
6062

0 commit comments

Comments
 (0)