From cb2090eaf09513667f5fd4c8f1c85b93f6617679 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@manomano.com>
Date: Wed, 2 Jan 2019 14:42:09 +0100
Subject: [PATCH 1/2] Add extension to slugify client name for selectors

Update Changelog

Rename extension from slugify to httplug_slugify

Rename extension from slugify to httplug_slugify

Rename extension from slugify to httplug_slugify
---
 CHANGELOG.md                                |  6 ++++
 Collector/Twig/HttpPlugSlugifyExtension.php | 36 +++++++++++++++++++++
 Resources/config/data-collector.xml         |  4 +++
 Resources/views/stack.html.twig             | 10 +++---
 4 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 Collector/Twig/HttpPlugSlugifyExtension.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4c9c9cb..1c35fe87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+## 1.14.1
+
+### Fixed
+
+- Profiler does not display stack when client name contains dots
+
 ## 1.14.0
 
 ### Added
diff --git a/Collector/Twig/HttpPlugSlugifyExtension.php b/Collector/Twig/HttpPlugSlugifyExtension.php
new file mode 100644
index 00000000..1127a881
--- /dev/null
+++ b/Collector/Twig/HttpPlugSlugifyExtension.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Http\HttplugBundle\Collector\Twig;
+
+/**
+ * @author Ibrahima SOW <sowbiba@hotmail.com>
+ */
+class HttpPlugSlugifyExtension extends \Twig_Extension
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getFilters()
+    {
+        return [
+            new \Twig_SimpleFilter('httplug_slugify', [$this, 'slugify'], ['is_safe' => ['html']]),
+        ];
+    }
+
+    /**
+     * @param $string
+     *
+     * @return string
+     */
+    public function slugify($string)
+    {
+        return preg_replace('/[^a-zA-Z0-9_-]/u', '_', $string);
+    }
+
+    public function getName()
+    {
+        return 'httplug_slugify';
+    }
+}
diff --git a/Resources/config/data-collector.xml b/Resources/config/data-collector.xml
index dd3f3b85..5337003a 100644
--- a/Resources/config/data-collector.xml
+++ b/Resources/config/data-collector.xml
@@ -26,6 +26,10 @@
             <tag name="twig.extension" />
         </service>
 
+        <service id="httplug.collector.twig.httplug_slugify" class="Http\HttplugBundle\Collector\Twig\HttpPlugSlugifyExtension" public="false">
+            <tag name="twig.extension" />
+        </service>
+
         <!-- Discovered clients -->
         <service id="httplug.collector.auto_discovered_client" class="Http\HttplugBundle\Collector\ProfileClient" decorates="httplug.auto_discovery.auto_discovered_client" public="false">
             <argument type="service" id="httplug.collector.auto_discovered_client.inner"/>
diff --git a/Resources/views/stack.html.twig b/Resources/views/stack.html.twig
index 92fba7ff..59ab66b9 100644
--- a/Resources/views/stack.html.twig
+++ b/Resources/views/stack.html.twig
@@ -1,4 +1,4 @@
-<div class="httplug-stack-header httplug-toggle" data-toggle="#httplug-{{ client }}-{{ id }}-details">
+<div class="httplug-stack-header httplug-toggle" data-toggle="#httplug-{{ client|httplug_slugify }}-{{ id }}-details">
     <div>
         {% if stack.failed %}
             <span class="httplug-stack-failed">✘</span>
@@ -23,14 +23,14 @@
         {% endif %}
     </div>
 </div>
-<div id="httplug-{{ client }}-{{ id }}-details" class="httplug-hidden">
+<div id="httplug-{{ client|httplug_slugify }}-{{ id }}-details" class="httplug-hidden">
     <div class="httplug-toolbar">
         <div class="httplug-copy-as-curl">
             <input readonly="readonly" type="text" value="{{ stack.curlCommand }}" />
             <button class="btn tooltip-toggle" aria-label="Copy to clipboard">Copy to clipboard</button>
         </div>
-        <button data-toggle="#httplug-{{ client }}-{{ id }}-stack" class="httplug-toggle btn" >Toggle plugin stack</button>
-        <button data-toggle="#httplug-{{ client }}-{{ id }}-details .httplug-http-body" class="httplug-toggle btn">Toggle body</button>
+        <button data-toggle="#httplug-{{ client|httplug_slugify }}-{{ id }}-stack" class="httplug-toggle btn" >Toggle plugin stack</button>
+        <button data-toggle="#httplug-{{ client|httplug_slugify }}-{{ id }}-details .httplug-http-body" class="httplug-toggle btn">Toggle body</button>
     </div>
     <div class="httplug-messages">
         <div class="httplug-message card">
@@ -43,7 +43,7 @@
         </div>
     </div>
     {% if stack.profiles %}
-        <div id="httplug-{{ client }}-{{ id }}-stack" class="httplug-hidden card">
+        <div id="httplug-{{ client|httplug_slugify }}-{{ id }}-stack" class="httplug-hidden card">
             {% for profile in stack.profiles %}
                 <h3 class="httplug-plugin-name">{{ profile.plugin }}</h3>
                 <div class="httplug-messages">

From 9dd2636590fc4718685d95b9311b1ff9720866e8 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@manomano.com>
Date: Thu, 3 Jan 2019 09:43:46 +0100
Subject: [PATCH 2/2] Add stack.getClientSlug, remove slugify extension

---
 CHANGELOG.md                                |  7 +---
 Collector/Stack.php                         |  8 +++++
 Collector/Twig/HttpPlugSlugifyExtension.php | 36 ---------------------
 Resources/config/data-collector.xml         |  4 ---
 Resources/views/stack.html.twig             | 10 +++---
 5 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 Collector/Twig/HttpPlugSlugifyExtension.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c35fe87..f1c84d58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,6 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
-## 1.14.1
-
-### Fixed
-
-- Profiler does not display stack when client name contains dots
-
 ## 1.14.0
 
 ### Added
@@ -21,6 +15,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 ### Fixed
 
 - Fix deprecated notice when using symfony/config > 4.2
+- Profiler does not display stack when client name contains dots
 
 ## 1.13.1 - 2018-11-28
 
diff --git a/Collector/Stack.php b/Collector/Stack.php
index 815b1239..755e9487 100644
--- a/Collector/Stack.php
+++ b/Collector/Stack.php
@@ -340,4 +340,12 @@ public function setCurlCommand($curlCommand)
     {
         $this->curlCommand = $curlCommand;
     }
+
+    /**
+     * @return string
+     */
+    public function getClientSlug()
+    {
+        return preg_replace('/[^a-zA-Z0-9_-]/u', '_', $this->client);
+    }
 }
diff --git a/Collector/Twig/HttpPlugSlugifyExtension.php b/Collector/Twig/HttpPlugSlugifyExtension.php
deleted file mode 100644
index 1127a881..00000000
--- a/Collector/Twig/HttpPlugSlugifyExtension.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Http\HttplugBundle\Collector\Twig;
-
-/**
- * @author Ibrahima SOW <sowbiba@hotmail.com>
- */
-class HttpPlugSlugifyExtension extends \Twig_Extension
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @return array
-     */
-    public function getFilters()
-    {
-        return [
-            new \Twig_SimpleFilter('httplug_slugify', [$this, 'slugify'], ['is_safe' => ['html']]),
-        ];
-    }
-
-    /**
-     * @param $string
-     *
-     * @return string
-     */
-    public function slugify($string)
-    {
-        return preg_replace('/[^a-zA-Z0-9_-]/u', '_', $string);
-    }
-
-    public function getName()
-    {
-        return 'httplug_slugify';
-    }
-}
diff --git a/Resources/config/data-collector.xml b/Resources/config/data-collector.xml
index 5337003a..dd3f3b85 100644
--- a/Resources/config/data-collector.xml
+++ b/Resources/config/data-collector.xml
@@ -26,10 +26,6 @@
             <tag name="twig.extension" />
         </service>
 
-        <service id="httplug.collector.twig.httplug_slugify" class="Http\HttplugBundle\Collector\Twig\HttpPlugSlugifyExtension" public="false">
-            <tag name="twig.extension" />
-        </service>
-
         <!-- Discovered clients -->
         <service id="httplug.collector.auto_discovered_client" class="Http\HttplugBundle\Collector\ProfileClient" decorates="httplug.auto_discovery.auto_discovered_client" public="false">
             <argument type="service" id="httplug.collector.auto_discovered_client.inner"/>
diff --git a/Resources/views/stack.html.twig b/Resources/views/stack.html.twig
index 59ab66b9..207f1486 100644
--- a/Resources/views/stack.html.twig
+++ b/Resources/views/stack.html.twig
@@ -1,4 +1,4 @@
-<div class="httplug-stack-header httplug-toggle" data-toggle="#httplug-{{ client|httplug_slugify }}-{{ id }}-details">
+<div class="httplug-stack-header httplug-toggle" data-toggle="#httplug-{{ stack.clientSlug }}-{{ id }}-details">
     <div>
         {% if stack.failed %}
             <span class="httplug-stack-failed">✘</span>
@@ -23,14 +23,14 @@
         {% endif %}
     </div>
 </div>
-<div id="httplug-{{ client|httplug_slugify }}-{{ id }}-details" class="httplug-hidden">
+<div id="httplug-{{ stack.clientSlug }}-{{ id }}-details" class="httplug-hidden">
     <div class="httplug-toolbar">
         <div class="httplug-copy-as-curl">
             <input readonly="readonly" type="text" value="{{ stack.curlCommand }}" />
             <button class="btn tooltip-toggle" aria-label="Copy to clipboard">Copy to clipboard</button>
         </div>
-        <button data-toggle="#httplug-{{ client|httplug_slugify }}-{{ id }}-stack" class="httplug-toggle btn" >Toggle plugin stack</button>
-        <button data-toggle="#httplug-{{ client|httplug_slugify }}-{{ id }}-details .httplug-http-body" class="httplug-toggle btn">Toggle body</button>
+        <button data-toggle="#httplug-{{ stack.clientSlug }}-{{ id }}-stack" class="httplug-toggle btn" >Toggle plugin stack</button>
+        <button data-toggle="#httplug-{{ stack.clientSlug }}-{{ id }}-details .httplug-http-body" class="httplug-toggle btn">Toggle body</button>
     </div>
     <div class="httplug-messages">
         <div class="httplug-message card">
@@ -43,7 +43,7 @@
         </div>
     </div>
     {% if stack.profiles %}
-        <div id="httplug-{{ client|httplug_slugify }}-{{ id }}-stack" class="httplug-hidden card">
+        <div id="httplug-{{ stack.clientSlug }}-{{ id }}-stack" class="httplug-hidden card">
             {% for profile in stack.profiles %}
                 <h3 class="httplug-plugin-name">{{ profile.plugin }}</h3>
                 <div class="httplug-messages">