added licence file to the new interface. changed collector collectDat…

…a signature to take an instance of profile interface
symfony · yjv · Sep 28, 2016 · Sep 28, 2016 · Nov 6, 2016 · Nov 6, 2016
commit f42468d50dcebc68393fe0de126f798e27e950d0
diff --git a/src/Symfony/Component/Profiler/DataCollector/AjaxDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/AjaxDataCollector.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Profiler\DataCollector;
 
 use Symfony\Component\Profiler\Context\ContextInterface;
-use Symfony\Component\Profiler\Profile;
 use Symfony\Component\Profiler\Context\RequestContext;
+use Symfony\Component\Profiler\ProfileInterface;
 
 /**
  * AjaxDataCollector.
@@ -22,7 +22,7 @@
  */
 class AjaxDataCollector extends DataCollector
 {
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         return $context instanceof RequestContext;
     }

diff --git a/src/Symfony/Component/Profiler/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/ConfigDataCollector.php
@@ -14,7 +14,7 @@
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Profiler\Context\ContextInterface;
-use Symfony\Component\Profiler\Profile;
+use Symfony\Component\Profiler\ProfileInterface;
 
 /**
  * ConfigDataCollector.
@@ -56,7 +56,7 @@ public function setKernel(KernelInterface $kernel = null)
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         $this->data = array(
             'app_name' => $this->name,

diff --git a/src/Symfony/Component/Profiler/DataCollector/DataCollector.php b/src/Symfony/Component/Profiler/DataCollector/DataCollector.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Profiler\DataCollector;
 
-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
 use Symfony\Component\VarDumper\Caster\ClassStub;
 use Symfony\Component\VarDumper\Caster\LinkStub;
 use Symfony\Component\VarDumper\Caster\StubCaster;

diff --git a/src/Symfony/Component/Profiler/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/Profiler/DataCollector/DataCollectorInterface.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Profiler\Context\ContextInterface;
 use Symfony\Component\Profiler\Profile;
+use Symfony\Component\Profiler\ProfileInterface;
 
 /**
  * DataCollectorInterface.
@@ -25,10 +26,10 @@ interface DataCollectorInterface
      * Collects data for the given Request and Response.
      *
      * @param ContextInterface $context
-     * @param Profile $profile
+     * @param ProfileInterface|Profile $profile
      * @return
      */
-    public function collectData(ContextInterface $context, Profile $profile);
+    public function collectData(ContextInterface $context, ProfileInterface $profile);
 
     /**
      * Returns the name of the collector.

diff --git a/src/Symfony/Component/Profiler/DataCollector/DumpDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/DumpDataCollector.php
@@ -13,8 +13,8 @@
 
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Profiler\Context\ContextInterface;
-use Symfony\Component\Profiler\Profile;
 use Symfony\Component\Profiler\Context\RequestContext;
+use Symfony\Component\Profiler\ProfileInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
@@ -140,7 +140,7 @@ public function dump(Data $data)
         }
     }
 
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         // Sub-requests and programmatic calls stay in the collected profile.
         if ($this->dumper) {

diff --git a/src/Symfony/Component/Profiler/DataCollector/EventDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/EventDataCollector.php
@@ -14,7 +14,6 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
 use Symfony\Component\Profiler\Context\ContextInterface;
-use Symfony\Component\Profiler\Profile;
 use Symfony\Component\Profiler\ProfileInterface;
 
 /**
@@ -34,7 +33,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null)
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         $this->data = array(
             'called_listeners' => array(),

diff --git a/src/Symfony/Component/Profiler/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/ExceptionDataCollector.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\Profiler\Context\ContextInterface;
-use Symfony\Component\Profiler\Profile;
+use Symfony\Component\Profiler\ProfileInterface;
 
 /**
  * ExceptionDataCollector.
@@ -25,7 +25,7 @@ class ExceptionDataCollector extends DataCollector
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         if (null !== $context->getException()) {
             $this->data = array(

diff --git a/src/Symfony/Component/Profiler/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/LoggerDataCollector.php
@@ -36,7 +36,7 @@ public function __construct($logger = null)
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         return true;
     }

diff --git a/src/Symfony/Component/Profiler/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/MemoryDataCollector.php
@@ -33,7 +33,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         $this->updateMemoryUsage();
         return true;

diff --git a/src/Symfony/Component/Profiler/DataCollector/RequestDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/RequestDataCollector.php
@@ -23,6 +23,7 @@
 use Symfony\Component\Profiler\Context\ContextInterface;
 use Symfony\Component\Profiler\Profile;
 use Symfony\Component\Profiler\Context\RequestContext;
+use Symfony\Component\Profiler\ProfileInterface;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -43,7 +44,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         if (!$context instanceof RequestContext) {
             return false;

diff --git a/src/Symfony/Component/Profiler/DataCollector/RouterDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/RouterDataCollector.php
@@ -15,8 +15,8 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\Profiler\Context\ContextInterface;
-use Symfony\Component\Profiler\Profile;
 use Symfony\Component\Profiler\Context\RequestContext;
+use Symfony\Component\Profiler\ProfileInterface;
 
 /**
  * RouterDataCollector.
@@ -41,7 +41,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         if (!$context instanceof RequestContext) {
             return false;

diff --git a/src/Symfony/Component/Profiler/DataCollector/TimeDataCollector.php b/src/Symfony/Component/Profiler/DataCollector/TimeDataCollector.php
@@ -14,7 +14,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Profiler\Context\ContextInterface;
-use Symfony\Component\Profiler\Profile;
 use Symfony\Component\Profiler\Context\RequestContext;
 use Symfony\Component\Profiler\ProfileInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -38,7 +37,7 @@ public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch
     /**
      * {@inheritdoc}
      */
-    public function collectData(ContextInterface $context, Profile $profile)
+    public function collectData(ContextInterface $context, ProfileInterface $profile)
     {
         if (null !== $this->kernel) {
             $startTime = $this->kernel->getStartTime();

diff --git a/src/Symfony/Component/Profiler/Profile.php b/src/Symfony/Component/Profiler/Profile.php
@@ -35,12 +35,12 @@ class Profile implements ProfileInterface
     private $type;
 
     /**
-     * @var Profile
+     * @var ProfileInterface
      */
     private $parent;
 
     /**
-     * @var Profile[]
+     * @var ProfileInterface[]
      */
     private $children = array();
 
@@ -77,9 +77,9 @@ public function getToken()
     /**
      * Sets the parent token.
      *
-     * @param Profile $parent The parent Profile
+     * @param ProfileInterface $parent The parent Profile
      */
-    public function setParent(Profile $parent)
+    public function setParent(ProfileInterface $parent)
     {
         $this->parent = $parent;
     }

diff --git a/src/Symfony/Component/Profiler/ProfileInterface.php b/src/Symfony/Component/Profiler/ProfileInterface.php
@@ -1,10 +1,13 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: yosefderay
- * Date: 11/12/16
- * Time: 7:41 PM
+/*
+ * 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\Profiler;
 
 use Symfony\Component\Profiler\DataCollector\DataCollectorInterface;
@@ -13,7 +16,7 @@
 /**
  * Profile.
  *
- * @author Fabien Potencier <fabien@symfony.com>
+ * @author Yosef Deray <yderay@gmail.com>
  */
 interface ProfileInterface
 {
@@ -24,27 +27,13 @@ interface ProfileInterface
      */
     public function getToken();
 
-    /**
-     * Sets the parent token.
-     *
-     * @param Profile $parent The parent Profile
-     */
-    public function setParent(Profile $parent);
-
     /**
      * Returns the parent profile.
      *
      * @return Profile The parent profile
      */
     public function getParent();
 
-    /**
-     * Returns the parent token.
-     *
-     * @return null|string The parent token
-     */
-    public function getParentToken();
-
     /**
      * Returns the name.
      *