[DI] Add trim env processor

ogizanagi · ogizanagi · commit e226492db78d · 2019-01-05T12:09:07.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 4.3.0
 -----
 
+ * added `%env(trim:...)%` processor to trim a string value
  * added `%env(default:...)%` processor to fallback to a default value
 
 4.2.0
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -45,6 +45,7 @@ public static function getProvidedTypes()
             'resolve' => 'string',
             'default' => 'bool|int|float|string|array',
             'string' => 'string',
+            'trim' => 'string',
         );
     }
 
@@ -195,6 +196,10 @@ public function getEnv($prefix, $name, \Closure $getEnv)
             return str_getcsv($env);
         }
 
+        if ('trim' === $prefix) {
+            return trim($env);
+        }
+
         throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -42,6 +42,7 @@ public function testSimpleProcessor()
             'resolve' => array('string'),
             'default' => array('bool', 'int', 'float', 'string', 'array'),
             'string' => array('string'),
+            'trim' => array('string'),
         );
 
         $this->assertSame($expected, $container->getParameterBag()->getProvidedTypes());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -233,6 +233,19 @@ public function testGetEnvBase64()
         $this->assertSame('hello', $result);
     }
 
+    public function testGetEnvTrim()
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('trim', 'foo', function ($name) {
+            $this->assertSame('foo', $name);
+
+            return " hello\n";
+        });
+
+        $this->assertSame('hello', $result);
+    }
+
     /**
      * @dataProvider validJson
      */

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public static function getProvidedTypes()`
`45`	`45`	`'resolve' => 'string',`
`46`	`46`	`'default' => 'bool\|int\|float\|string\|array',`
`47`	`47`	`'string' => 'string',`
	`48`	`+ 'trim' => 'string',`
`48`	`49`	`);`
`49`	`50`	`}`
`50`	`51`
`@@ -195,6 +196,10 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`195`	`196`	`return str_getcsv($env);`
`196`	`197`	`}`
`197`	`198`
	`199`	`+ if ('trim' === $prefix) {`
	`200`	`+ return trim($env);`
	`201`	`+ }`
	`202`	`+`
`198`	`203`	`throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));`
`199`	`204`	`}`
`200`	`205`	`}`