CRM-14370 - API Kernel - Extract XDebugSubscriber

diff --git a/Civi/API/Kernel.php b/Civi/API/Kernel.php
index 310fe8a917b18b74b21555ef413bc9707dd9695c..29e41b805d494ebe109c734514e318c0eb8a40c5 100644 (file)
--- a/Civi/API/Kernel.php
+++ b/Civi/API/Kernel.php
@@ -161,16 +161,6 @@ class Kernel {
         _civicrm_api_call_nested_api($apiRequest['params'], $result, $apiRequest['action'], $apiRequest['entity'], $apiRequest['version']);
       }
 
-      if (function_exists('xdebug_time_index')
-        && \CRM_Utils_Array::value('debug', $apiRequest['params'])
-        // result would not be an array for getvalue
-        && is_array($result)
-      ) {
-        $result['xdebug']['peakMemory'] = xdebug_peak_memory_usage();
-        $result['xdebug']['memory'] = xdebug_memory_usage();
-        $result['xdebug']['timeIndex'] = xdebug_time_index();
-      }
-
       $responseEvent = $this->dispatcher->dispatch(Events::RESPOND, new RespondEvent(NULL, $apiRequest, $result));
       $result = $responseEvent->getResponse();
 

diff --git a/Civi/API/Subscriber/XDebugSubscriber.php b/Civi/API/Subscriber/XDebugSubscriber.php
new file mode 100644 (file)
index 0000000..af23ecf
--- /dev/null
+++ b/Civi/API/Subscriber/XDebugSubscriber.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.4                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2013                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+
+namespace Civi\API\Subscriber;
+use Civi\API\Events;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class XDebugSubscriber implements EventSubscriberInterface {
+  public static function getSubscribedEvents() {
+    return array(
+      Events::RESPOND => array('onApiRespond', Events::W_LATE),
+    );
+  }
+
+  function onApiRespond(\Civi\API\Event\RespondEvent $event) {
+    $apiRequest = $event->getApiRequest();
+    $result = $event->getResponse();
+    if (function_exists('xdebug_time_index')
+      && \CRM_Utils_Array::value('debug', $apiRequest['params'])
+      // result would not be an array for getvalue
+      && is_array($result)
+    ) {
+      $result['xdebug']['peakMemory'] = xdebug_peak_memory_usage();
+      $result['xdebug']['memory'] = xdebug_memory_usage();
+      $result['xdebug']['timeIndex'] = xdebug_time_index();
+      $event->setResponse($result);
+    }
+  }
+}
\ No newline at end of file

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index 954c5ef2e5e063c9414b95d2f1874fe62e2df5ba..e849038456b3e97dc8df1b565055a9435be9703d 100644 (file)
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -87,6 +87,7 @@ class Container {
    */
   public function createApiKernel($dispatcher) {
     $dispatcher->addSubscriber(new \Civi\API\Subscriber\TransactionSubscriber());
+    $dispatcher->addSubscriber(new \Civi\API\Subscriber\XDebugSubscriber());
     $dispatcher->addListener(\Civi\API\Events::AUTHORIZE, function($event) {
       // dummy placeholder
       $event->authorize();