[TASK] Introduce ArrayHelper::trimExplode() method

eliashaeussler · Apr 7, 2024 · 308088e · 308088e
1 parent 6e3cf94
commit 308088e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/Config/Adapter/EnvironmentVariablesConfigAdapter.php b/src/Config/Adapter/EnvironmentVariablesConfigAdapter.php
@@ -27,10 +27,8 @@
 use EliasHaeussler\CacheWarmup\Config;
 use EliasHaeussler\CacheWarmup\Crawler;
 use EliasHaeussler\CacheWarmup\Exception;
+use EliasHaeussler\CacheWarmup\Helper;
 
-use function array_filter;
-use function array_map;
-use function explode;
 use function getenv;
 use function gettype;
 use function in_array;
@@ -121,12 +119,7 @@ private function processValue(string $envVarValue, mixed $defaultValue, string $
         return match (gettype($defaultValue)) {
             'array' => match ($name) {
                 'crawlerOptions' => $this->crawlerFactory->parseCrawlerOptions($envVarValue),
-                default => array_filter(
-                    array_map(
-                        'trim',
-                        explode(',', $envVarValue),
-                    ),
-                ),
+                default => Helper\ArrayHelper::trimExplode($envVarValue),
             },
             'boolean' => in_array(trim($envVarValue), self::BOOLEAN_VALUES, true),
             default => $envVarValue,

diff --git a/src/Helper/ArrayHelper.php b/src/Helper/ArrayHelper.php
@@ -25,6 +25,8 @@
 
 use function array_filter;
 use function array_key_exists;
+use function array_map;
+use function array_values;
 use function explode;
 use function is_array;
 use function is_int;
@@ -43,7 +45,7 @@ final class ArrayHelper
      */
     public static function getValueByPath(iterable $subject, string $path, string $delimiter = '/'): mixed
     {
-        $pathSegments = array_filter(explode($delimiter, $path));
+        $pathSegments = self::trimExplode($path, $delimiter);
         $reference = &$subject;
 
         foreach ($pathSegments as $pathSegment) {
@@ -63,7 +65,7 @@ public static function getValueByPath(iterable $subject, string $path, string $d
      */
     public static function setValueByPath(iterable &$subject, string $path, mixed $value, string $delimiter = '/'): void
     {
-        $pathSegments = array_filter(explode($delimiter, $path));
+        $pathSegments = self::trimExplode($path, $delimiter);
         $reference = &$subject;
 
         foreach ($pathSegments as $pathSegment) {
@@ -111,6 +113,24 @@ public static function mergeRecursive(array &$subject, array $other): void
         }
     }
 
+    /**
+     * @param non-empty-string $delimiter
+     *
+     * @return list<non-empty-string>
+     */
+    public static function trimExplode(string $subject, string $delimiter = ','): array
+    {
+        return array_values(
+            array_filter(
+                array_map(
+                    'trim',
+                    explode($delimiter, $subject),
+                ),
+                static fn (string $value) => '' !== $value,
+            ),
+        );
+    }
+
     private static function pathSegmentExists(mixed $subject, string $pathSegment): bool
     {
         return is_array($subject) && array_key_exists($pathSegment, $subject);