From c2278062b1a6235fe80d0dba3b2bd1d1735fe11e Mon Sep 17 00:00:00 2001
From: Stephan Vock <stephan.vock@gmail.com>
Date: Sun, 8 Mar 2015 20:32:47 +0100
Subject: [PATCH 1/2] Move AjaxCollector for use without framework bundle

---
 .../DataCollector/AjaxDataCollector.php       | 15 ++-------
 .../Resources/config/collectors.xml           |  2 +-
 .../DataCollector/AjaxDataCollector.php       | 33 +++++++++++++++++++
 3 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php
index 0dff2b2a57..53945eafc8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php
@@ -11,24 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DataCollector;
 
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector as BaseAjaxDataCollector;
 
 /**
  * AjaxDataCollector.
  *
  * @author Bart van den Burg <bart@burgov.nl>
  */
-class AjaxDataCollector extends DataCollector
+class AjaxDataCollector extends BaseAjaxDataCollector
 {
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        // all collecting is done client side
-    }
-
-    public function getName()
-    {
-        return 'ajax';
-    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index 50e4c0a9df..429350ffcf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -26,7 +26,7 @@
             <tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="335" />
         </service>
 
-        <service id="data_collector.ajax" class="Symfony\Bundle\FrameworkBundle\DataCollector\AjaxDataCollector" public="false">
+        <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>
 
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
new file mode 100644
index 0000000000..b8405d5945
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\DataCollector;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * AjaxDataCollector.
+ *
+ * @author Bart van den Burg <bart@burgov.nl>
+ */
+class AjaxDataCollector extends DataCollector
+{
+    public function collect(Request $request, Response $response, \Exception $exception = null)
+    {
+        // all collecting is done client side
+    }
+
+    public function getName()
+    {
+        return 'ajax';
+    }
+}

From 3841f4624d2c1d7fe49d2b62d23bfceedaa34ee3 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 2 Oct 2015 12:23:49 +0200
Subject: [PATCH 2/2] added missing a deprecated notice

---
 .../FrameworkBundle/DataCollector/AjaxDataCollector.php       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php
index 53945eafc8..f44c8f5aaf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php
@@ -13,10 +13,14 @@ namespace Symfony\Bundle\FrameworkBundle\DataCollector;
 
 use Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector as BaseAjaxDataCollector;
 
+@trigger_error('The '.__NAMESPACE__.'\AjaxDataCollector class is deprecated since version 2.8 and will be removed in 3.0. Use Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector instead.', E_USER_DEPRECATED);
+
 /**
  * AjaxDataCollector.
  *
  * @author Bart van den Burg <bart@burgov.nl>
+ *
+ * @deprecated since version 2.8, to be removed in 3.0.
  */
 class AjaxDataCollector extends BaseAjaxDataCollector
 {