symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+7-2Lines changed: 7 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+7-2Lines changed: 7 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+28Lines changed: 28 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+28Lines changed: 28 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/return_foo_string.php
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/return_foo_string.php
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
@@ -15,6 +15,7 @@ CHANGELOG
  * added ability to define an index for services in an injected service locator argument
  * made `ServiceLocator` implement `ServiceProviderInterface`
  * deprecated support for non-string default env() parameters
+ * added `%env(require:...)%` processor to `require()` a PHP file and use the value returned from it
 
 4.2.0
 -----
 
@@ -47,6 +47,7 @@ public static function getProvidedTypes()
             'default' => 'bool|int|float|string|array',
             'string' => 'string',
             'trim' => 'string',
+            'require' => 'bool|int|float|string|array',
         ];
     }
 
@@ -102,15 +103,19 @@ public function getEnv($prefix, $name, \Closure $getEnv)
             return '' === $default ? null : $this->container->getParameter($default);
         }
 
-        if ('file' === $prefix) {
+        if ('file' === $prefix || 'require' === $prefix) {
             if (!is_scalar($file = $getEnv($name))) {
                 throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));
             }
             if (!file_exists($file)) {
                 throw new EnvNotFoundException(sprintf('File "%s" not found (resolved from "%s").', $file, $name));
             }
 
-            return file_get_contents($file);
+            if ('file' === $prefix) {
+                return file_get_contents($file);
+            } else {
+                return require $file;
+            }
         }
 
         if (false !== $i || 'string' !== $prefix) {
 
@@ -45,6 +45,7 @@ public function testSimpleProcessor()
             'default' => ['bool', 'int', 'float', 'string', 'array'],
             'string' => ['string'],
             'trim' => ['string'],
+            'require' => ['bool', 'int', 'float', 'string', 'array'],
         ];
 
         $this->assertSame($expected, $container->getParameterBag()->getProvidedTypes());
 
@@ -458,4 +458,32 @@ public function validNullables()
             ['NULL', 'NULL'],
          ];
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvNotFoundException
+     * @expectedExceptionMessage missing-file
+     */
+    public function testRequireMissingFile()
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('require', '/missing-file', function ($name) {
+            return $name;
+        });
+    }
+
+    public function testRequireFile()
+    {
+        $path = __DIR__.'/Fixtures/php/return_foo_string.php';
+
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('require', $path, function ($name) use ($path) {
+            $this->assertSame($path, $name);
+
+            return $path;
+        });
+
+        $this->assertEquals('foo', $result);
+    }
 }
@@ -0,0 +1,2 @@
+<?php
+    return 'foo';
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public static function getProvidedTypes()`
`47`	`47`	`'default' => 'bool\|int\|float\|string\|array',`
`48`	`48`	`'string' => 'string',`
`49`	`49`	`'trim' => 'string',`
	`50`	`+ 'require' => 'bool\|int\|float\|string\|array',`
`50`	`51`	`];`
`51`	`52`	`}`
`52`	`53`
`@@ -102,15 +103,19 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`102`	`103`	`return '' === $default ? null : $this->container->getParameter($default);`
`103`	`104`	`}`
`104`	`105`
`105`		`- if ('file' === $prefix) {`
	`106`	`+ if ('file' === $prefix \|\| 'require' === $prefix) {`
`106`	`107`	`if (!is_scalar($file = $getEnv($name))) {`
`107`	`108`	`throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));`
`108`	`109`	`}`
`109`	`110`	`if (!file_exists($file)) {`
`110`	`111`	`throw new EnvNotFoundException(sprintf('File "%s" not found (resolved from "%s").', $file, $name));`
`111`	`112`	`}`
`112`	`113`
`113`		`- return file_get_contents($file);`
	`114`	`+ if ('file' === $prefix) {`
	`115`	`+ return file_get_contents($file);`
	`116`	`+ } else {`
	`117`	`+ return require $file;`
	`118`	`+ }`
`114`	`119`	`}`
`115`	`120`
`116`	`121`	`if (false !== $i \|\| 'string' !== $prefix) {`