Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit c4ec3c24f2d7 · 2019-12-19T16:57:49.000+01:00
* 4.3:
  [ProxyManager] fix generating proxies for root-namespaced classes
  [DI] skip looking for config class when the extension class is anonymous
  Fix typo
  [Dotenv] FIX missing getenv
  [HttpClient][Psr18Client] Remove Psr18ExceptionTrait
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -85,6 +85,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
     public function getProxyCode(Definition $definition): string
     {
         $code = $this->classGenerator->generate($this->generateProxyClass($definition));
+        $code = preg_replace('/^(class [^ ]++ extends )([^\\\\])/', '$1\\\\$2', $code);
 
         if (version_compare(self::getProxyManagerVersion(), '2.2', '<')) {
             $code = preg_replace(
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
@@ -21,5 +21,5 @@ class LazyServiceProjectServiceContainer extends Container
     }
 }
 
-class stdClass_%s extends %SstdClass implements \ProxyManager\%s
+class stdClass_%s extends \stdClass implements \ProxyManager\%s
 {%a}%A
diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -80,6 +80,11 @@ public function getAlias()
     public function getConfiguration(array $config, ContainerBuilder $container)
     {
         $class = \get_class($this);
+
+        if (false !== strpos($class, "\0")) {
+            return null; // ignore anonymous classes
+        }
+
         $class = substr_replace($class, '\Configuration', strrpos($class, '\\'));
         $class = $container->getReflectionClass($class);
 
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -463,7 +463,7 @@ private function resolveVariables(string $value, array $loadedVars): string
             } elseif (isset($this->values[$name])) {
                 $value = $this->values[$name];
             } else {
-                $value = '';
+                $value = (string) getenv($name);
             }
 
             if ('' === $value && isset($matches['default_value']) && '' !== $matches['default_value']) {
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -443,6 +443,17 @@ public function testGetVariablesValueFromEnvFirst()
         }
     }
 
+    public function testGetVariablesValueFromGetenv()
+    {
+        putenv('Foo=Bar');
+
+        $dotenv = new Dotenv(true);
+        $values = $dotenv->parse('Foo=${Foo}');
+        $this->assertSame('Bar', $values['Foo']);
+
+        putenv('Foo');
+    }
+
     /**
      * @group legacy
      * @expectedDeprecation The default value of "$usePutenv" argument of "%s" will be changed from "true" to "false" in Symfony 5.0. You should define its value explicitly.
diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php
@@ -190,7 +190,7 @@ public function createUri(string $uri = ''): UriInterface
 /**
  * @internal
  */
-trait Psr18ExceptionTrait
+class Psr18NetworkException extends \RuntimeException implements NetworkExceptionInterface
 {
     private $request;
 
@@ -206,18 +206,21 @@ public function getRequest(): RequestInterface
     }
 }
 
-/**
- * @internal
- */
-class Psr18NetworkException extends \RuntimeException implements NetworkExceptionInterface
-{
-    use Psr18ExceptionTrait;
-}
-
 /**
  * @internal
  */
 class Psr18RequestException extends \InvalidArgumentException implements RequestExceptionInterface
 {
-    use Psr18ExceptionTrait;
+    private $request;
+
+    public function __construct(TransportExceptionInterface $e, RequestInterface $request)
+    {
+        parent::__construct($e->getMessage(), 0, $e);
+        $this->request = $request;
+    }
+
+    public function getRequest(): RequestInterface
+    {
+        return $this->request;
+    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -401,13 +401,11 @@ public function setOptions(array $options)
      *     ini_set('session.save_path', '/tmp');
      *
      * or pass in a \SessionHandler instance which configures session.save_handler in the
-     * constructor, for a template see NativeFileSessionHandler or use handlers in
-     * composer package drak/native-session
+     * constructor, for a template see NativeFileSessionHandler.
      *
      * @see https://php.net/session-set-save-handler
      * @see https://php.net/sessionhandlerinterface
      * @see https://php.net/sessionhandler
-     * @see https://github.com/zikula/NativeSession
      *
      * @param AbstractProxy|\SessionHandlerInterface|null $saveHandler
      *

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =`
`85`	`85`	`public function getProxyCode(Definition $definition): string`
`86`	`86`	`{`
`87`	`87`	`$code = $this->classGenerator->generate($this->generateProxyClass($definition));`
	`88`	`+ $code = preg_replace('/^(class [^ ]++ extends )([^\\\\])/', '$1\\\\$2', $code);`
`88`	`89`
`89`	`90`	`if (version_compare(self::getProxyManagerVersion(), '2.2', '<')) {`
`90`	`91`	`$code = preg_replace(`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ class LazyServiceProjectServiceContainer extends Container`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-class stdClass_%s extends %SstdClass implements \ProxyManager\%s`
	`24`	`+class stdClass_%s extends \stdClass implements \ProxyManager\%s`
`25`	`25`	`{%a}%A`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ private function resolveVariables(string $value, array $loadedVars): string`
`463`	`463`	`} elseif (isset($this->values[$name])) {`
`464`	`464`	`$value = $this->values[$name];`
`465`	`465`	`} else {`
`466`		`- $value = '';`
	`466`	`+ $value = (string) getenv($name);`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`if ('' === $value && isset($matches['default_value']) && '' !== $matches['default_value']) {`
Original file line number	Diff line number	Diff line change
`@@ -401,13 +401,11 @@ public function setOptions(array $options)`
`401`	`401`	`* ini_set('session.save_path', '/tmp');`
`402`	`402`	`*`
`403`	`403`	`* or pass in a \SessionHandler instance which configures session.save_handler in the`
`404`		`- * constructor, for a template see NativeFileSessionHandler or use handlers in`
`405`		`- * composer package drak/native-session`
	`404`	`+ * constructor, for a template see NativeFileSessionHandler.`
`406`	`405`	`*`
`407`	`406`	`* @see https://php.net/session-set-save-handler`
`408`	`407`	`* @see https://php.net/sessionhandlerinterface`
`409`	`408`	`* @see https://php.net/sessionhandler`
`410`		`- * @see https://github.com/zikula/NativeSession`
`411`	`409`	`*`
`412`	`410`	`* @param AbstractProxy\|\SessionHandlerInterface\|null $saveHandler`
`413`	`411`	`*`