symfony · dosten · Mar 31, 2015 · Mar 31, 2015 · Apr 1, 2015
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
diff --git a/src/Symfony/Component/Templating/DebuggerInterface.php b/src/Symfony/Component/Templating/DebuggerInterface.php
diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
@@ -65,15 +65,12 @@ public function load(TemplateReferenceInterface $template)
            if (is_file($file = strtr($templatePathPattern, $replacements)) && is_readable($file)) {
                if (null !== $this->logger) {
                    $this->logger->debug('Loaded template file.', array('file' => $file));
-                } elseif (null !== $this->debugger) {
-                    // just for BC, to be removed in 3.0
-                    $this->debugger->log(sprintf('Loaded template file "%s".', $file));
                }

                return new FileStorage($file);
            }

-            if (null !== $this->logger || null !== $this->debugger) {
+            if (null !== $this->logger) {
                $fileFailures[] = $file;
            }
        }
@@ -82,9 +79,6 @@ public function load(TemplateReferenceInterface $template)
        foreach ($fileFailures as $file) {
            if (null !== $this->logger) {
                $this->logger->debug('Failed loading template file.', array('file' => $file));
-            } elseif (null !== $this->debugger) {
-                // just for BC, to be removed in 3.0
-                $this->debugger->log(sprintf('Failed loading template file "%s".', $file));
            }
        }


diff --git a/src/Symfony/Component/Templating/Loader/Loader.php b/src/Symfony/Component/Templating/Loader/Loader.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Templating\Loader;

 use Psr\Log\LoggerInterface;
-use Symfony\Component\Templating\DebuggerInterface;

 /**
 * Loader is the base class for all template loader classes.
@@ -26,11 +25,6 @@ abstract class Loader implements LoaderInterface
     */
    protected $logger;

-    /**
-     * @deprecated since version 2.4, to be removed in 3.0. Use $this->logger instead.
-     */
-    protected $debugger;
-
    /**
     * Sets the debug logger to use for this loader.
     *
@@ -40,18 +34,4 @@ public function setLogger(LoggerInterface $logger)
    {
        $this->logger = $logger;
    }
-
-    /**
-     * Sets the debugger to use for this loader.
-     *
-     * @param DebuggerInterface $debugger A debugger instance
-     *
-     * @deprecated since version 2.4, to be removed in 3.0. Use $this->setLogger() instead.
-     */
-    public function setDebugger(DebuggerInterface $debugger)
-    {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. Use the setLogger() method instead.', E_USER_DEPRECATED);
-
-        $this->debugger = $debugger;
-    }
 }
diff --git a/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php b/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
@@ -23,19 +23,6 @@ public function testGetSetLogger()
        $loader->setLogger($logger);
        $this->assertSame($logger, $loader->getLogger(), '->setLogger() sets the logger instance');
    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyGetSetDebugger()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
-        $loader = new ProjectTemplateLoader4();
-        $debugger = $this->getMock('Symfony\Component\Templating\DebuggerInterface');
-        $loader->setDebugger($debugger);
-        $this->assertSame($debugger, $loader->getDebugger(), '->setDebugger() sets the debugger instance');
-    }
 }

 class ProjectTemplateLoader4 extends Loader