Merge branch '3.0'

symfony · Dec 15, 2015 · ba82f61 · ba82f61
2 parents 132afe6 + a3366c2
commit ba82f61
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Client.php b/Client.php
@@ -185,7 +185,7 @@ protected function getScript($request)
         $code = <<<EOF
 <?php
 
-error_reporting($errorReporting & ~E_USER_DEPRECATED);
+error_reporting($errorReporting);
 
 if ('$autoloader') {
     require_once '$autoloader';

diff --git a/Command/ContainerDebugCommand.php b/Command/ContainerDebugCommand.php
@@ -118,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $helper = new DescriptorHelper();
         $options['format'] = $input->getOption('format');
         $options['raw_text'] = $input->getOption('raw');
-        $options['output'] = $output;
+        $options['output'] = $io;
         $helper->describe($output, $object, $options);
 
         if (!$input->getArgument('name') && $input->isInteractive()) {

diff --git a/Resources/config/collectors.xml b/Resources/config/collectors.xml
@@ -15,6 +15,10 @@
             <tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="335" />
         </service>
 
+        <service id="data_collector.ajax" class="Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector" public="false">
+            <tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="315" />
+        </service>
+
         <service id="data_collector.exception" class="Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="305" />
         </service>

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -13,7 +13,6 @@
             <argument type="service" id="event_dispatcher" />
             <argument type="service" id="controller_resolver" />
             <argument type="service" id="request_stack" />
-            <argument>false</argument>
         </service>
 
         <service id="request_stack" class="Symfony\Component\HttpFoundation\RequestStack" />