Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c936361

Browse filesBrowse files
dostenfabpot
authored andcommitted
Removed deprecations in Templating component
1 parent ac1465e commit c936361
Copy full SHA for c936361

File tree

5 files changed

+1
-122
lines changed
Filter options

5 files changed

+1
-122
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
-52Lines changed: 0 additions & 52 deletions
This file was deleted.

‎src/Symfony/Component/Templating/DebuggerInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Templating/DebuggerInterface.php
-30Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/Symfony/Component/Templating/Loader/FilesystemLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Templating/Loader/FilesystemLoader.php
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,12 @@ public function load(TemplateReferenceInterface $template)
6565
if (is_file($file = strtr($templatePathPattern, $replacements)) && is_readable($file)) {
6666
if (null !== $this->logger) {
6767
$this->logger->debug('Loaded template file.', array('file' => $file));
68-
} elseif (null !== $this->debugger) {
69-
// just for BC, to be removed in 3.0
70-
$this->debugger->log(sprintf('Loaded template file "%s".', $file));
7168
}
7269

7370
return new FileStorage($file);
7471
}
7572

76-
if (null !== $this->logger || null !== $this->debugger) {
73+
if (null !== $this->logger) {
7774
$fileFailures[] = $file;
7875
}
7976
}
@@ -82,9 +79,6 @@ public function load(TemplateReferenceInterface $template)
8279
foreach ($fileFailures as $file) {
8380
if (null !== $this->logger) {
8481
$this->logger->debug('Failed loading template file.', array('file' => $file));
85-
} elseif (null !== $this->debugger) {
86-
// just for BC, to be removed in 3.0
87-
$this->debugger->log(sprintf('Failed loading template file "%s".', $file));
8882
}
8983
}
9084

‎src/Symfony/Component/Templating/Loader/Loader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Templating/Loader/Loader.php
-20Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Templating\Loader;
1313

1414
use Psr\Log\LoggerInterface;
15-
use Symfony\Component\Templating\DebuggerInterface;
1615

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

29-
/**
30-
* @deprecated since version 2.4, to be removed in 3.0. Use $this->logger instead.
31-
*/
32-
protected $debugger;
33-
3428
/**
3529
* Sets the debug logger to use for this loader.
3630
*
@@ -40,18 +34,4 @@ public function setLogger(LoggerInterface $logger)
4034
{
4135
$this->logger = $logger;
4236
}
43-
44-
/**
45-
* Sets the debugger to use for this loader.
46-
*
47-
* @param DebuggerInterface $debugger A debugger instance
48-
*
49-
* @deprecated since version 2.4, to be removed in 3.0. Use $this->setLogger() instead.
50-
*/
51-
public function setDebugger(DebuggerInterface $debugger)
52-
{
53-
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);
54-
55-
$this->debugger = $debugger;
56-
}
5737
}

‎src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,6 @@ public function testGetSetLogger()
2323
$loader->setLogger($logger);
2424
$this->assertSame($logger, $loader->getLogger(), '->setLogger() sets the logger instance');
2525
}
26-
27-
/**
28-
* @group legacy
29-
*/
30-
public function testLegacyGetSetDebugger()
31-
{
32-
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
33-
34-
$loader = new ProjectTemplateLoader4();
35-
$debugger = $this->getMock('Symfony\Component\Templating\DebuggerInterface');
36-
$loader->setDebugger($debugger);
37-
$this->assertSame($debugger, $loader->getDebugger(), '->setDebugger() sets the debugger instance');
38-
}
3926
}
4027

4128
class ProjectTemplateLoader4 extends Loader

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.