Merge pull request FriendsOfSymfony#2028 from alexander-schranz/patch-1

Use twig as templating engine when available
mossotech · Oct 31, 2019 · 7705fa0 · 7705fa0
2 parents 4a5b6f8 + 2eafea5
commit 7705fa0
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 12 deletions.
diff --git a/DependencyInjection/Compiler/ConfigurationCheckPass.php b/DependencyInjection/Compiler/ConfigurationCheckPass.php
@@ -38,7 +38,11 @@ public function process(ContainerBuilder $container)
         }
 
         if (!$container->has((string) $container->getAlias('fos_rest.templating'))) {
-            $container->removeAlias('fos_rest.templating');
+            if ($container->has('twig')) {
+                $container->setAlias('fos_rest.templating', 'twig');
+            } else {
+                $container->removeAlias('fos_rest.templating');
+            }
         }
     }
 }
diff --git a/Tests/Functional/ConfigurationTest.php b/Tests/Functional/ConfigurationTest.php
@@ -24,9 +24,17 @@ public function testDisabledTemplating()
         $this->assertFalse($container->has('fos_rest.templating'));
     }
 
+    public function testEnabledTemplatingWithTwig()
+    {
+        $kernel = self::bootKernel(['test_case' => 'ConfigurationWithTwig']);
+        $container = $kernel->getContainer();
+
+        $this->assertTrue($container->has('fos_rest.templating'));
+    }
+
     public function testToolbar()
     {
-        $client = $this->createClient(['test_case' => 'Configuration']);
+        $client = $this->createClient(['test_case' => 'ConfigurationWithTwig']);
         $client->request(
                 'GET',
                 '/_profiler/empty/search/results?limit=10',

diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
@@ -40,6 +40,7 @@
 
 use Psr\Log\NullLogger;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Kernel;
@@ -49,7 +50,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class AppKernel extends Kernel
+class AppKernel extends Kernel implements CompilerPassInterface
 {
     private $testCase;
     private $rootConfig;
@@ -121,4 +122,12 @@ protected function getKernelParameters()
 
         return $parameters;
     }
+
+    public function process(ContainerBuilder $container)
+    {
+        // Avoid inlining of fos_rest.templating service to test if service really exist
+        if ($container->has('fos_rest.templating')) {
+            $container->getAlias('fos_rest.templating')->setPublic(true);
+        }
+    }
 }
diff --git a/Tests/Functional/app/Configuration/bundles.php b/Tests/Functional/app/Configuration/bundles.php
@@ -11,8 +11,6 @@
 
 return [
     new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-    new \Symfony\Bundle\TwigBundle\TwigBundle(),
-    new \Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(),
     new \Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
     new \FOS\RestBundle\FOSRestBundle(),

diff --git a/Tests/Functional/app/Configuration/config.yml b/Tests/Functional/app/Configuration/config.yml
@@ -12,7 +12,7 @@ framework:
 fos_rest:
     view:
         mime_types: true
-        view_response_listener: true
+        view_response_listener: false
     param_fetcher_listener: true
     disable_csrf_role: foo
     allowed_methods_listener: true
@@ -26,9 +26,3 @@ fos_rest:
         rules:
             - { path: '^/', priorities: ['xml'], fallback_format: ~ }
     versioning: true
-
-web_profiler:
-    toolbar: true
-
-twig:
-    strict_variables: '%kernel.debug%'
diff --git a/Tests/Functional/app/ConfigurationWithTwig/bundles.php b/Tests/Functional/app/ConfigurationWithTwig/bundles.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+    new \Symfony\Bundle\TwigBundle\TwigBundle(),
+    new \Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(),
+    new \Symfony\Bundle\SecurityBundle\SecurityBundle(),
+    new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+    new \FOS\RestBundle\FOSRestBundle(),
+    new \FOS\RestBundle\Tests\Functional\Bundle\TestBundle\TestBundle(),
+];
diff --git a/Tests/Functional/app/ConfigurationWithTwig/config.yml b/Tests/Functional/app/ConfigurationWithTwig/config.yml
@@ -0,0 +1,12 @@
+imports:
+    - { resource: ../Configuration/config.yml }
+
+fos_rest:
+    view:
+        view_response_listener: true
+
+web_profiler:
+    toolbar: false
+
+twig:
+    strict_variables: '%kernel.debug%'
diff --git a/Tests/Functional/app/ConfigurationWithTwig/routing.yml b/Tests/Functional/app/ConfigurationWithTwig/routing.yml
@@ -0,0 +1,7 @@
+_wdt:
+    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
+    prefix:   /_wdt
+
+_profiler:
+    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
+    prefix:   /_profiler
diff --git a/Tests/Functional/app/ConfigurationWithTwig/security.php b/Tests/Functional/app/ConfigurationWithTwig/security.php
@@ -0,0 +1,23 @@
+<?php
+
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Http\Controller\UserValueResolver;
+
+$defaultFirewall = [
+    'anonymous' => null,
+];
+
+if (method_exists(Security::class, 'getUser') && !class_exists(UserValueResolver::class)) {
+    $defaultFirewall['logout_on_user_change'] = true;
+}
+
+$container->loadFromExtension('security', [
+    'providers' => [
+        'in_memory' => [
+            'memory' => null,
+        ],
+    ],
+    'firewalls' => [
+        'default' => $defaultFirewall,
+    ],
+]);