Skip to content

Commit f202e47

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

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

.github/workflows/grumphp.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ jobs:
3434
run: |
3535
export COMPOSER_IGNORE_PLATFORM_REQ=php+
3636
export BOX_REQUIREMENT_CHECKER=0
37+
- name: Set correct PHP version in composer
38+
if: matrix.composer-deps == 'highest' || matrix.composer-deps == 'lowest'
39+
run: composer config platform.php ${{ matrix.php-versions }}
3740
- name: Get composer cache directory
3841
id: composercache
3942
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

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)