Skip to content

Commit ade3fbf

Browse files
committed
Remove profiler hack for 2.3, fix requirements to make things releasable, fixes #37
1 parent 4cf0263 commit ade3fbf

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

DependencyInjection/Compiler/DebugHandlerPass.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1717
use Symfony\Component\DependencyInjection\Definition;
18+
use Symfony\Component\HttpKernel\Kernel;
1819
use Monolog\Logger;
1920

2021
/**
@@ -38,19 +39,6 @@ public function process(ContainerBuilder $container)
3839
return;
3940
}
4041

41-
// detect if the profiler is present but will be disabled
42-
$enabled = true;
43-
foreach ($container->getDefinition('profiler')->getMethodCalls() as $call) {
44-
if ($call[0] === 'disable') {
45-
$enabled = false;
46-
} elseif ($call[0] === 'enable') {
47-
$enabled = true;
48-
}
49-
}
50-
if (!$enabled) {
51-
return;
52-
}
53-
5442
$debugHandler = new Definition('%monolog.handler.debug.class%', array(Logger::DEBUG, true));
5543
$container->setDefinition('monolog.handler.debug', $debugHandler);
5644

DependencyInjection/MonologExtension.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Symfony\Component\Config\FileLocator;
1818
use Symfony\Component\DependencyInjection\Definition;
1919
use Symfony\Component\DependencyInjection\Reference;
20+
use Symfony\Component\HttpKernel\Kernel;
2021

2122
/**
2223
* MonologExtension is an extension for the Monolog library.
@@ -123,6 +124,10 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
123124
break;
124125

125126
case 'console':
127+
if (Kernel::VERSION_ID < 20400) {
128+
throw new \RuntimeException('The console handler requires Symfony 2.4+');
129+
}
130+
126131
$definition->setArguments(array(
127132
null,
128133
$handler['bubble'],

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.2",
20-
"symfony/monolog-bridge": "~2.4-dev",
21-
"symfony/dependency-injection": "~2.2",
22-
"symfony/config": "~2.2",
23-
"symfony/http-kernel": "~2.2",
20+
"symfony/monolog-bridge": "~2.3",
21+
"symfony/dependency-injection": "~2.3",
22+
"symfony/config": "~2.3",
23+
"symfony/http-kernel": "~2.3",
2424
"monolog/monolog": "~1.3"
2525
},
2626
"require-dev": {
27-
"symfony/yaml": "~2.2",
27+
"symfony/yaml": "~2.3",
2828
"symfony/console": "~2.3"
2929
},
3030
"autoload": {

0 commit comments

Comments
 (0)