File tree Expand file tree Collapse file tree 5 files changed +1
-122
lines changed
Bundle/FrameworkBundle/Templating Expand file tree Collapse file tree 5 files changed +1
-122
lines changed Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -65,15 +65,12 @@ public function load(TemplateReferenceInterface $template)
65
65
if (is_file ($ file = strtr ($ templatePathPattern , $ replacements )) && is_readable ($ file )) {
66
66
if (null !== $ this ->logger ) {
67
67
$ 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 ));
71
68
}
72
69
73
70
return new FileStorage ($ file );
74
71
}
75
72
76
- if (null !== $ this ->logger || null !== $ this -> debugger ) {
73
+ if (null !== $ this ->logger ) {
77
74
$ fileFailures [] = $ file ;
78
75
}
79
76
}
@@ -82,9 +79,6 @@ public function load(TemplateReferenceInterface $template)
82
79
foreach ($ fileFailures as $ file ) {
83
80
if (null !== $ this ->logger ) {
84
81
$ 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 ));
88
82
}
89
83
}
90
84
Original file line number Diff line number Diff line change 12
12
namespace Symfony \Component \Templating \Loader ;
13
13
14
14
use Psr \Log \LoggerInterface ;
15
- use Symfony \Component \Templating \DebuggerInterface ;
16
15
17
16
/**
18
17
* Loader is the base class for all template loader classes.
@@ -26,11 +25,6 @@ abstract class Loader implements LoaderInterface
26
25
*/
27
26
protected $ logger ;
28
27
29
- /**
30
- * @deprecated since version 2.4, to be removed in 3.0. Use $this->logger instead.
31
- */
32
- protected $ debugger ;
33
-
34
28
/**
35
29
* Sets the debug logger to use for this loader.
36
30
*
@@ -40,18 +34,4 @@ public function setLogger(LoggerInterface $logger)
40
34
{
41
35
$ this ->logger = $ logger ;
42
36
}
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
- }
57
37
}
Original file line number Diff line number Diff line change @@ -23,19 +23,6 @@ public function testGetSetLogger()
23
23
$ loader ->setLogger ($ logger );
24
24
$ this ->assertSame ($ logger , $ loader ->getLogger (), '->setLogger() sets the logger instance ' );
25
25
}
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
- }
39
26
}
40
27
41
28
class ProjectTemplateLoader4 extends Loader
You can’t perform that action at this time.
0 commit comments