Merge pull request #327 from php-http/forward-compatible-twig

also check for new twig environment class for when they remove the non-namespaced layer

Author: dbu

src/DependencyInjection/HttplugExtension.php

@@ -26,6 +26,7 @@
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Twig\Environment as TwigEnvironment;
 
 /**
  * @author David Buchmann <[email protected]>
@@ -79,7 +80,7 @@ public function load(array $configs, ContainerBuilder $container)
                 ->addArgument($config['profiling']['captured_body_length'])
             ;
 
-            if (!class_exists(\Twig_Environment::class)) {
+            if (!class_exists(TwigEnvironment::class) && !class_exists(\Twig_Environment::class)) {
                 $container->removeDefinition('httplug.collector.twig.http_message');
             }
         }