change: rename Internal to Support

Author: rpander93

src/DependencyInjection/CompilerPass/RegisterDataLoadersFromTagsPass.php

@@ -13,7 +13,7 @@
 
 use Overblog\DataLoader\DataLoader;
 use Overblog\DataLoader\Option;
-use Overblog\DataLoaderBundle\DependencyInjection\Internal;
+use Overblog\DataLoaderBundle\DependencyInjection\Support;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -26,7 +26,7 @@ public function process(ContainerBuilder $container)
             foreach ($tags as $attributes) {
                 $batchLoadFn = isset($attributes['method'])
                     ? [new Reference($serviceId), $attributes['method']]
-                    : Internal::buildCallableFromScalar($attributes['batch_load_fn']);
+                    : Support::buildCallableFromScalar($attributes['batch_load_fn']);
 
                 $this->registerDataLoader($container, $attributes, $batchLoadFn);
             }
@@ -35,12 +35,12 @@ public function process(ContainerBuilder $container)
 
     private function registerDataLoader(ContainerBuilder $container, array $loaderConfig, mixed $batchLoadFn): void
     {
-        $dataLoaderServiceID = Internal::generateDataLoaderServiceIDFromName($loaderConfig['name'], $container);
-        $optionServiceID = Internal::generateDataLoaderOptionServiceIDFromName($loaderConfig['name'], $container);
+        $dataLoaderServiceID = Support::generateDataLoaderServiceIDFromName($loaderConfig['name'], $container);
+        $optionServiceID = Support::generateDataLoaderOptionServiceIDFromName($loaderConfig['name'], $container);
 
         $container->register($optionServiceID, Option::class)
             ->setPublic(false)
-            ->setArguments([$this->buildOptionsParams($loaderConfig['options'])]);
+            ->setArguments([Support::buildOptionsParams($loaderConfig['options'])]);
 
         $definition = $container->register($dataLoaderServiceID, DataLoader::class)
             ->setPublic(true)
@@ -52,7 +52,7 @@ private function registerDataLoader(ContainerBuilder $container, array $loaderCo
             ]);
 
         if (isset($loaderConfig['factory'])) {
-            $definition->setFactory(Internal::buildCallableFromScalar($loaderConfig['factory']));
+            $definition->setFactory(Support::buildCallableFromScalar($loaderConfig['factory']));
         }
 
         if (isset($loaderConfig['alias'])) {
@@ -61,17 +61,4 @@ private function registerDataLoader(ContainerBuilder $container, array $loaderCo
                 ->setPublic(true);
         }
     }
-
-    private function buildOptionsParams(array $options): array
-    {
-        $optionsParams = [];
-
-        $optionsParams['batch'] = $options['batch'];
-        $optionsParams['cache'] = $options['cache'];
-        $optionsParams['maxBatchSize'] = $options['max_batch_size'];
-        $optionsParams['cacheMap'] = new Reference($options['cache_map']);
-        $optionsParams['cacheKeyFn'] = Internal::buildCallableFromScalar($options['cache_key_fn']);
-
-        return $optionsParams;
-    }
 }

src/DependencyInjection/OverblogDataLoaderExtension.php

@@ -39,7 +39,7 @@ public function load(array $configs, ContainerBuilder $container): void
         });
 
         foreach ($config['loaders'] as $name => $loaderConfig) {
-            $container->register(Internal::generateDataLoaderServiceIDFromName($name, $container), DataLoader::class)
+            $container->register(Support::generateDataLoaderServiceIDFromName($name, $container), DataLoader::class)
                 ->addTag('overblog.dataloader', array_merge($config['defaults'], [
                     'name' => $name,
                     'alias' => $loaderConfig['alias'] ?? null,
@@ -51,6 +51,6 @@ public function load(array $configs, ContainerBuilder $container): void
 
     public function getAlias(): string
     {
-        return Internal::getAlias();
+        return Support::getAlias();
     }
 }

src/DependencyInjection/Internal.php renamed to src/DependencyInjection/Support.php

@@ -14,7 +14,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class Internal
+/** @internal */
+class Support
 {
     private static string $alias = 'overblog_dataloader';
 
@@ -59,4 +60,17 @@ public static function buildCallableFromScalar($scalar): mixed
 
         return null;
     }
+
+    public static function buildOptionsParams(array $options): array
+    {
+        $optionsParams = [];
+
+        $optionsParams['batch'] = $options['batch'];
+        $optionsParams['cache'] = $options['cache'];
+        $optionsParams['maxBatchSize'] = $options['max_batch_size'];
+        $optionsParams['cacheMap'] = new Reference($options['cache_map']);
+        $optionsParams['cacheKeyFn'] = self::buildCallableFromScalar($options['cache_key_fn']);
+
+        return $optionsParams;
+    }
 }