Remove configuration from XML, use PhpFileLoader for the container configuration (#318)

Co-authored-by: Bart Brouwer <bbrouwer@symphonit.com>

Author: bartbrouwer

composer.json

@@ -32,7 +32,6 @@
         "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "ext-simplexml": "*",
         "friendsofphp/php-cs-fixer": "^3.51",
         "league/flysystem-async-aws-s3": "^2.0 || ^3.0",
         "league/flysystem-aws-s3-v3": "^2.0 || ^3.0",

src/DependencyInjection/OneupFlysystemExtension.php

@@ -21,23 +21,17 @@ class OneupFlysystemExtension extends Extension
 
     public function load(array $configs, ContainerBuilder $container): void
     {
-        if (class_exists(Loader\XmlFileLoader::class)) {
-            $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-            $loaderExt = '.xml';
-        } else {
-            $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-            $loaderExt = '.php';
-        }
+        $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
 
-        $loader->load('factories' . $loaderExt);
+        $loader->load('factories.php');
 
         $adapterFactories = $this->getFactories($container);
 
         $configuration = new Configuration($adapterFactories);
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader->load('adapters' . $loaderExt);
-        $loader->load('flysystem' . $loaderExt);
+        $loader->load('adapters.php');
+        $loader->load('flysystem.php');
 
         $adapters = [];
 
@@ -52,13 +46,8 @@ public function load(array $configs, ContainerBuilder $container): void
 
     public function getConfiguration(array $config, ContainerBuilder $container): Configuration
     {
-        if (class_exists(Loader\XmlFileLoader::class)) {
-            $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-            $loader->load('factories.xml');
-        } else {
-            $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-            $loader->load(resource: 'factories.php');
-        }
+        $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load('factories.php');
 
         $adapterFactories = $this->getFactories($container);
 

src/Resources/config/adapters.xml

@@ -89,24 +89,6 @@ public function testDirectoryVisibilitySettings(): void
         self::assertSame(Visibility::PUBLIC, $directory6Attributes->visibility());
     }
 
-    public function testAdapterAvailability(): void
-    {
-        /** @var \SimpleXMLElement $adapters */
-        $adapters = simplexml_load_string((string) file_get_contents(__DIR__ . '/../../src/Resources/config/adapters.xml'));
-
-        foreach ($adapters->children()->children() as $service) {
-            if (null === $service->attributes()) {
-                continue;
-            }
-
-            foreach ($service->attributes() as $key => $attribute) {
-                if ('class' === (string) $key) {
-                    self::assertTrue(class_exists((string) $attribute), 'Could not load class: ' . $attribute);
-                }
-            }
-        }
-    }
-
     public function testGetConfiguration(): void
     {
         $extension = new OneupFlysystemExtension();