diff --git a/GifExceptionBundle.php b/GifExceptionBundle.php index 26def08..d3e601a 100644 --- a/GifExceptionBundle.php +++ b/GifExceptionBundle.php @@ -21,4 +21,9 @@ public function build(ContainerBuilder $container) $container->addCompilerPass(new PrepareTwigPass(), PassConfig::TYPE_BEFORE_REMOVING); } + + public function getParent() + { + return 'TwigBundle'; + } } diff --git a/Tests/app/AppKernel.php b/Tests/app/AppKernel.php index 8cde8f5..e008550 100644 --- a/Tests/app/AppKernel.php +++ b/Tests/app/AppKernel.php @@ -35,6 +35,12 @@ public function registerBundles() */ public function registerContainerConfiguration(LoaderInterface $loader) { + if (version_compare(self::VERSION, '2.7.0', '>=')) { + $loader->load($this->getRootDir() . '/config/config_27.yml'); + + return; + } + $loader->load($this->getRootDir() . '/config/config.yml'); } } diff --git a/Tests/app/config/config.yml b/Tests/app/config/config.yml index f88c658..0ff52ee 100644 --- a/Tests/app/config/config.yml +++ b/Tests/app/config/config.yml @@ -1,2 +1,6 @@ framework: + templating: { engines: ['twig'] } + router: + resource: "%kernel.root_dir%/config/routing.yml" + strict_requirements: ~ secret: "ThisTokenIsEnoughSecretForOurTests" diff --git a/Tests/app/config/config_27.yml b/Tests/app/config/config_27.yml new file mode 100644 index 0000000..6ae2bfc --- /dev/null +++ b/Tests/app/config/config_27.yml @@ -0,0 +1,3 @@ +framework: + secret: "ThisTokenIsEnoughSecretForOurTests" + assets: ~ diff --git a/Tests/app/config/routing.yml b/Tests/app/config/routing.yml new file mode 100644 index 0000000..e69de29