symfony
diff --git a/‎UPGRADE-4.4.md
Lines changed: 1 addition & 0 deletions b/‎UPGRADE-4.4.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎UPGRADE-5.0.md
Lines changed: 1 addition & 0 deletions b/‎UPGRADE-5.0.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Extension/Extension.php
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Extension/Extension.php
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
Lines changed: 9 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
Lines changed: 9 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedArgumentsDummy.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedArgumentsDummy.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Dotenv/Dotenv.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Dotenv/Dotenv.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Dotenv/Tests/DotenvTest.php
Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Component/Dotenv/Tests/DotenvTest.php
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Psr18Client.php
Copy file name to clipboard
Lines changed: 13 additions & 10 deletions b/‎src/Symfony/Component/HttpClient/Psr18Client.php
Copy file name to clipboard
Lines changed: 13 additions & 10 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Lines changed: 1 addition & 3 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Kernel.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/Kernel.php
Lines changed: 1 addition & 1 deletion
@@ -19,6 +19,7 @@ Debug
 -----
  * Deprecated the component in favor of the `ErrorHandler` component
+ * Replace uses of `Symfony\Component\Debug\Debug` by `Symfony\Component\ErrorHandler\Debug`
 
 Config
 ------
 
@@ -60,6 +60,7 @@ Debug
 -----
 
  * Removed the component in favor of the `ErrorHandler` component
+ * Replace uses of `Symfony\Component\Debug\Debug` by `Symfony\Component\ErrorHandler\Debug`
 
 DependencyInjection
 -------------------
 
@@ -81,6 +81,7 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
     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(
 
@@ -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
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -126,8 +127,8 @@ protected function processValue($value, bool $isRoot = false)
                 continue;
             }
 
-            if (null !== $bindingValue && !$bindingValue instanceof Reference && !$bindingValue instanceof Definition && !$bindingValue instanceof TaggedIteratorArgument) {
-                throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, an instance of %s or an instance of %s or an instance of %s, %s given.', $key, $this->currentId, Reference::class, Definition::class, TaggedIteratorArgument::class, \gettype($bindingValue)));
+            if (null !== $bindingValue && !$bindingValue instanceof Reference && !$bindingValue instanceof Definition && !$bindingValue instanceof TaggedIteratorArgument && !$bindingValue instanceof ServiceLocatorArgument) {
+                throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, %s, %s, %s or ServiceLocatorArgument, %s given.', $key, $this->currentId, Reference::class, Definition::class, TaggedIteratorArgument::class, \gettype($bindingValue)));
             }
         }
 
 
@@ -81,6 +81,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);
 
 
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\DefinitionErrorExceptionPass;
@@ -35,6 +36,7 @@ public function testProcess()
 
         $bindings = [
             CaseSensitiveClass::class => new BoundArgument(new Reference('foo')),
+            'Psr\Container\ContainerInterface $container' => new BoundArgument(new ServiceLocatorArgument([]), true, BoundArgument::INSTANCEOF_BINDING),
             'iterable $objects' => new BoundArgument(new TaggedIteratorArgument('tag.name'), true, BoundArgument::INSTANCEOF_BINDING),
         ];
 
@@ -49,7 +51,13 @@ public function testProcess()
         $pass = new ResolveBindingsPass();
         $pass->process($container);
 
-        $this->assertEquals([0 => new Reference('foo'), 1 => '123', 4 => new TaggedIteratorArgument('tag.name')], $definition->getArguments());
+        $expected = [
+            0 => new Reference('foo'),
+            1 => '123',
+            3 => new ServiceLocatorArgument([]),
+            4 => new TaggedIteratorArgument('tag.name'),
+        ];
+        $this->assertEquals($expected, $definition->getArguments());
         $this->assertEquals([['setSensitiveClass', [new Reference('foo')]]], $definition->getMethodCalls());
     }
 
 
@@ -9,7 +9,7 @@
  */
 class NamedArgumentsDummy
 {
-    public function __construct(CaseSensitiveClass $c, $apiKey, $hostName, ContainerInterface $interface, iterable $objects)
+    public function __construct(CaseSensitiveClass $c, $apiKey, $hostName, ContainerInterface $container, iterable $objects)
     {
     }
 
 
@@ -458,7 +458,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']) {
 
@@ -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');
+    }
+
     public function testNoDeprecationWarning()
     {
         $dotenv = new Dotenv(true);
 
@@ -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;
+    }
 }
@@ -869,10 +869,10 @@ private function getMergeStatement(string $sessionId, string $data, int $maxlife
             $mergeStmt->bindParam(2, $sessionId, \PDO::PARAM_STR);
             $mergeStmt->bindParam(3, $data, \PDO::PARAM_LOB);
             $mergeStmt->bindValue(4, time() + $maxlifetime, \PDO::PARAM_INT);
-            $mergeStmt->bindValue(4, time(), \PDO::PARAM_INT);
-            $mergeStmt->bindParam(5, $data, \PDO::PARAM_LOB);
-            $mergeStmt->bindValue(6, time() + $maxlifetime, \PDO::PARAM_INT);
-            $mergeStmt->bindValue(6, time(), \PDO::PARAM_INT);
+            $mergeStmt->bindValue(5, time(), \PDO::PARAM_INT);
+            $mergeStmt->bindParam(6, $data, \PDO::PARAM_LOB);
+            $mergeStmt->bindValue(7, time() + $maxlifetime, \PDO::PARAM_INT);
+            $mergeStmt->bindValue(8, time(), \PDO::PARAM_INT);
         } else {
             $mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
             $mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
 
@@ -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
      *
 
@@ -471,7 +471,7 @@ public function write(string $content, array $metadata = null)
                             }
 
                             if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {
-                                opcache_invalidate($this->getPath(), true);
+                                @opcache_invalidate($this->getPath(), true);
                             }
                         }