removed deprecated class

silexphp · Jan 20, 2015 · 29013a9 · 29013a9
1 parent 4c01a36
commit 29013a9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 59 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 1.3.0 (2015-XX-XX)
 ------------------
 
+* removed deprecated TwigCoreExtension class (register the new HttpFragmentServiceProvider instead)
 * bumped minimum version of PHP to 5.3.9
 
 1.2.3 (2015-01-20)

diff --git a/src/Silex/Provider/TwigCoreExtension.php b/src/Silex/Provider/TwigCoreExtension.php
diff --git a/src/Silex/Provider/TwigServiceProvider.php b/src/Silex/Provider/TwigServiceProvider.php
@@ -68,9 +68,6 @@ public function register(Application $app)
                     $app['fragment.renderer.hinclude']->setTemplating($twig);
 
                     $twig->addExtension(new HttpKernelExtension($app['fragment.handler']));
-                } else {
-                    // fallback for BC, to be removed in 1.3
-                    $twig->addExtension(new TwigCoreExtension());
                 }
 
                 if (isset($app['form.factory'])) {

diff --git a/tests/Silex/Tests/Provider/TwigServiceProviderTest.php b/tests/Silex/Tests/Provider/TwigServiceProviderTest.php
@@ -13,6 +13,7 @@
 
 use Silex\Application;
 use Silex\Provider\TwigServiceProvider;
+use Silex\Provider\HttpFragmentServiceProvider;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -41,8 +42,13 @@ public function testRegisterAndRender()
 
     public function testRenderFunction()
     {
+        if (!class_exists('Symfony\Component\HttpFoundation\RequestStack')) {
+            $this->markTestSkipped();
+        }
+
         $app = new Application();
 
+        $app->register(new HttpFragmentServiceProvider());
         $app->register(new TwigServiceProvider(), array(
             'twig.templates'    => array(
                 'hello' => '{{ render("/foo") }}',