Allow set configs as int or string instead of enums

aplus-framework · May 8, 2022 · 4adb3bb · 4adb3bb
1 parent a8518ff
commit 4adb3bb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/App.php b/src/App.php
@@ -30,6 +30,7 @@
 use Framework\HTTP\Request;
 use Framework\HTTP\Response;
 use Framework\Language\Debug\LanguageCollector;
+use Framework\Language\FallbackLevel;
 use Framework\Language\Language;
 use Framework\Log\Debug\LogCollector;
 use Framework\Log\Logger;
@@ -316,10 +317,14 @@ protected static function setCache(string $instance) : Cache
         if (isset($config['logger_instance'])) {
             $logger = static::logger($config['logger_instance']);
         }
+        $config['serializer'] ??= Serializer::PHP;
+        if (\is_string($config['serializer'])) {
+            $config['serializer'] = Serializer::from($config['serializer']);
+        }
         $service = new $config['class'](
             $config['configs'] ?? [],
             $config['prefix'] ?? null,
-            $config['serializer'] ?? Serializer::PHP,
+            $config['serializer'],
             $logger
         );
         return static::setService('cache', $service, $instance);
@@ -659,6 +664,9 @@ protected static function setLanguage(string $instance) : Language
             );
         }
         if (isset($config['fallback_level'])) {
+            if (\is_int($config['fallback_level'])) {
+                $config['fallback_level'] = FallbackLevel::from($config['fallback_level']);
+            }
             $service->setFallbackLevel($config['fallback_level']);
         }
         $config['directories'] ??= [];
@@ -773,11 +781,15 @@ protected static function setLogger(string $instance) : Logger
     {
         $config = static::config()->get('logger', $instance);
         $class = $config['class'] ?? MultiFileLogger::class;
+        $config['level'] ??= LogLevel::DEBUG;
+        if (\is_int($config['level'])) {
+            $config['level'] = LogLevel::from($config['level']);
+        }
         return static::setService(
             'logger',
             new $class(
                 $config['destination'],
-                $config['level'] ?? LogLevel::DEBUG,
+                $config['level'],
                 $config['config'] ?? [],
             ),
             $instance

diff --git a/tests/configs/cache.config.php b/tests/configs/cache.config.php
@@ -17,7 +17,7 @@
             'directory' => getenv('GITHUB_ACTION') ? getenv('RUNNER_TEMP') : sys_get_temp_dir(),
         ],
         'prefix' => null,
-        'serializer' => Serializer::PHP,
+        'serializer' => 'php', //Serializer::PHP,
         'logger_instance' => 'default',
     ],
 ];
diff --git a/tests/configs/language.config.php b/tests/configs/language.config.php
@@ -17,7 +17,7 @@
             'es',
             'pt-br',
         ],
-        'fallback_level' => FallbackLevel::default,
+        'fallback_level' => 2, //FallbackLevel::default,
         'directories' => null,
         'negotiate' => true,
         'find_in_namespaces' => true,

diff --git a/tests/configs/logger.config.php b/tests/configs/logger.config.php
@@ -14,6 +14,6 @@
     'default' => [
         'class' => MultiFileLogger::class,
         'destination' => sys_get_temp_dir(),
-        'level' => LogLevel::DEBUG,
+        'level' => 0, //LogLevel::DEBUG,
     ],
 ];