Skip to content

Commit a38d748

Browse files
committed
Improve SF 8.0 support
1 parent 35fcd33 commit a38d748

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

.github/workflows/grumphp.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,14 @@ jobs:
4545
restore-keys: ${{ runner.os }}-composer-
4646
- name: Install dependencies (highest)
4747
if: matrix.composer-deps == 'highest'
48-
run: composer update --prefer-dist --no-progress --no-suggest
48+
run: |
49+
composer config platform.php ${{ matrix.php-versions }}
50+
composer update --prefer-dist --no-progress --no-suggest --ignore-platform-req=php+
4951
- name: Install dependencies (lowest)
5052
if: matrix.composer-deps == 'lowest'
51-
run: composer update --prefer-dist --no-progress --no-suggest --prefer-lowest
53+
run: |
54+
composer config platform.php ${{ matrix.php-versions }}
55+
composer update --prefer-dist --no-progress --no-suggest --prefer-lowest --ignore-platform-req=php+
5256
- name: Install dependencies (lock)
5357
if: matrix.composer-deps == 'lock'
5458
run: |

src/Configuration/LoaderFactory.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,22 @@ final class LoaderFactory
2626
public static function createLoader(ContainerBuilder $container, array $paths = []): DelegatingLoader
2727
{
2828
$locator = new FileLocator($paths);
29-
$resolver = new LoaderResolver([
30-
$xmlLoader = new XmlFileLoader($container, $locator, self::ENV),
29+
30+
/** @Deprecated - Remove in a future version of PHP where SF > 7.4 */
31+
$xmlLoader = class_exists(XmlFileLoader::class)
32+
? new XmlFileLoader($container, $locator, self::ENV)
33+
: null;
34+
35+
$resolver = new LoaderResolver(array_filter([
36+
$xmlLoader,
3137
$yamlLoader = new YamlFileLoader($container, $locator, self::ENV),
3238
$iniLoader = new IniFileLoader($container, $locator, self::ENV),
3339
new GlobFileLoader($container, $locator, self::ENV),
3440
new DirectoryLoader($container, $locator, self::ENV),
35-
new DistFileLoader($xmlLoader),
41+
$xmlLoader ? new DistFileLoader($xmlLoader) : null,
3642
new DistFileLoader($yamlLoader),
3743
new DistFileLoader($iniLoader),
38-
]);
44+
]));
3945

4046
return new DelegatingLoader($resolver);
4147
}

0 commit comments

Comments
 (0)