Merge pull request #61 from Elao/fix/collector-name

Change the collector name
Elao · Jan 30, 2015 · 8090ced · 8090ced
2 parents 1ce4ba3 + 83eed41
commit 8090ced
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 38 deletions.
diff --git a/DataCollector/AsseticDataCollector.php b/DataCollector/AsseticDataCollector.php
@@ -109,6 +109,6 @@ public function getDisplayInWdt()
      */
     public function getName()
     {
-        return 'assetic';
+        return 'elao_assetic';
     }
 }
diff --git a/DataCollector/ContainerDataCollector.php b/DataCollector/ContainerDataCollector.php
@@ -135,7 +135,7 @@ public function getDisplayInWdt()
      */
     public function getName()
     {
-        return 'container';
+        return 'elao_container';
     }
 
     /**

diff --git a/DataCollector/RoutingDataCollector.php b/DataCollector/RoutingDataCollector.php
@@ -150,6 +150,6 @@ public function getDisplayInWdt()
      */
     public function getName()
     {
-        return 'routing';
+        return 'elao_routing';
     }
 }
diff --git a/DataCollector/TwigDataCollector.php b/DataCollector/TwigDataCollector.php
@@ -58,7 +58,7 @@ public function collect(Request $request, Response $response, \Exception $except
             foreach ($extension->getFilters() as $filterName => $filter) {
                 if ($filter instanceof \Twig_FilterInterface) {
                     $call = $filter->compile();
-                    if(is_array($call) && is_callable($call)) {
+                    if (is_array($call) && is_callable($call)) {
                         $call = 'Method '.$call[1].' of an object '.get_class($call[0]);
                     }
                 } else {
@@ -100,14 +100,15 @@ public function collect(Request $request, Response $response, \Exception $except
                 );
             }
         }
-
-	  $globals = array();
-	  foreach($this->getTwig()->getGlobals() as $globalName => $global) {
-	     $globals[] = array(
-		   'name' => $globalName,
-		   'value' => $this->getVarDump($global),
-	     );
-	  }
+
+        $globals = array();
+
+        foreach ($this->getTwig()->getGlobals() as $globalName => $global) {
+            $globals[] = array(
+                'name' => $globalName,
+                'value' => $this->getVarDump($global),
+            );
+        }
 
         $this->data['globals'] = $globals;
         $this->data['extensions'] = $extensions;
@@ -270,12 +271,12 @@ public function getDisplayInWdt()
      */
     public function getName()
     {
-        return 'twig';
+        return 'elao_twig';
     }
-    
+
     /**
      * Returns var_dump like of a variable but avoiding flood dumping
-     * 
+     *
      * @return string Formated var_dump
      */
     protected function getVarDump($var)
@@ -287,21 +288,19 @@ protected function getVarDump($var)
             case 'double':
             case 'NULL':
             case 'ressource':
-		   return print_r($var, 1);
-		   break;
+                return print_r($var, 1);
             case 'string':
-		   return (250 < strlen($var)) ? substr($var, 0, 250).'...' : $var;
-		   break;
+                return (250 < strlen($var)) ? substr($var, 0, 250).'...' : $var;
             case 'object':
-               return 'Object instance of ' . get_class($var);
-               break;
+                return 'Object instance of ' . get_class($var);
             case 'array':
-               $formated_array = array();
-               foreach ($var as $key => $value) {
-                   $formated_array[$key] = $this->getVarDump($value);
-               }
-               return print_r($formated_array, 1);
-               break;
-	  }
+                $formated_array = array();
+
+                foreach ($var as $key => $value) {
+                    $formated_array[$key] = $this->getVarDump($value);
+                }
+
+                return print_r($formated_array, 1);
+        }
     }
 }
diff --git a/DependencyInjection/WebProfilerExtraExtension.php b/DependencyInjection/WebProfilerExtraExtension.php
@@ -16,10 +16,10 @@
 
 /**
  * ExtraProfilerExtension is an extension to add debug information to the web profiler:
- * assetic:		Information about assetics assets
- * routing:		Information about loaded routes
- * container:	Information about the container configuration & sevices
- * twig:		Information about Twig
+ * assetic:     Information about assetics assets
+ * routing:     Information about loaded routes
+ * container:   Information about the container configuration & sevices
+ * twig:        Information about Twig
  *
  * @author Vincent Bouzeran <vincent.bouzeran@elao.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>

diff --git a/Resources/config/assetic.xml b/Resources/config/assetic.xml
@@ -12,7 +12,7 @@
         <service id="web_profiler_extra.data_collector.assetic" class="%web_profiler_extra.data_collector.assetic.class%" public="false">
             <argument type="service" id="service_container" />
             <argument>%web_profiler_extra.data_collector.assetic.display_in_wdt%</argument>
-            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:assetic" id="assetic" />
+            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:assetic" id="elao_assetic" />
         </service>
     </services>
 </container>
diff --git a/Resources/config/container.xml b/Resources/config/container.xml
@@ -12,7 +12,7 @@
         <service id="web_profiler_extra.data_collector.container" class="%web_profiler_extra.data_collector.container.class%" public="false">
             <argument type="service" id="kernel" />
             <argument>%web_profiler_extra.data_collector.container.display_in_wdt%</argument>
-            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:container" id="container" />
+            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:container" id="elao_container" />
         </service>
     </services>
 </container>
diff --git a/Resources/config/routing.xml b/Resources/config/routing.xml
@@ -12,7 +12,7 @@
         <service id="web_profiler_extra.data_collector.routing" class="%web_profiler_extra.data_collector.routing.class%" public="false">
             <argument type="service" id="router" />
             <argument>%web_profiler_extra.data_collector.routing.display_in_wdt%</argument>
-            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:routing" id="routing" />
+            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:routing" id="elao_routing" />
         </service>
     </services>
 </container>
diff --git a/Resources/config/twig.xml b/Resources/config/twig.xml
@@ -13,7 +13,7 @@
         <service id="web_profiler_extra.data_collector.twig" class="%web_profiler_extra.data_collector.twig.class%" public="false">
             <argument type="service" id="service_container" />
             <argument>%web_profiler_extra.data_collector.twig.display_in_wdt%</argument>
-            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:twig" id="twig" />
+            <tag name="data_collector" template="WebProfilerExtraBundle:Collector:twig" id="elao_twig" />
         </service>
     </services>
 </container>
diff --git a/Resources/meta/LICENCE b/Resources/meta/LICENCE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Elao - http://www.elao.com
+Copyright (c) 2015 Elao - http://www.elao.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.