Remove unnecessary test and fix code style

Signed-off-by: Alexander Schranz <[email protected]>

Author: alexander-schranz

src/TwigRendererFactory.php

@@ -15,9 +15,6 @@
 use function is_array;
 use function is_object;
 use function sprintf;
-use function trigger_error;
-
-use const E_USER_DEPRECATED;
 
 /**
  * Create and return a Twig template instance.
@@ -30,8 +27,8 @@ class TwigRendererFactory
      */
     public function __invoke(ContainerInterface $container): TwigRenderer
     {
-        $config      = $container->has('config') ? $container->get('config') : [];
-        $config      = self::mergeConfig($config);
+        $config = $container->has('config') ? $container->get('config') : [];
+        $config = self::mergeConfig($config);
         /** @var Environment */
         $environment = $container->get(Environment::class);
 

test/TwigRendererFactoryTest.php

@@ -17,11 +17,8 @@
 use Twig\Environment;
 
 use function restore_error_handler;
-use function set_error_handler;
 use function sprintf;
 
-use const E_USER_DEPRECATED;
-
 class TwigRendererFactoryTest extends TestCase
 {
     /** @var MockObject&ContainerInterface */
@@ -230,24 +227,6 @@ public function assertPathNamespaceContains(
         $this->assertContains($expected, $found, $message);
     }
 
-    public function testCallingFactoryWithoutTwigEnvironmentServiceEmitsDeprecationNotice(): void
-    {
-        $this->container->expects(self::exactly(4))->method('has')->willReturn(false);
-
-        $factory = new TwigRendererFactory();
-
-        $this->errorHandler = set_error_handler(
-            function ($errno, $errstr): bool {
-                $this->assertStringContainsString(Environment::class, $errstr);
-                return true;
-            },
-            E_USER_DEPRECATED
-        );
-
-        $twig = $factory($this->container);
-        $this->assertInstanceOf(TwigRenderer::class, $twig);
-    }
-
     public function testMergeConfigRaisesExceptionForInvalidConfig(): void
     {
         $this->expectException(InvalidConfigException::class);