Symfony 4 support

javer · Jun 7, 2018 · bc7df5f · bc7df5f
1 parent 35b25ab
commit bc7df5f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/DataCollector/SphinxDataCollector.php b/DataCollector/SphinxDataCollector.php
@@ -87,7 +87,9 @@ public function getQueriesTime(): float
      */
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
+
+        $this->logger->reset();
     }
 
     /**

diff --git a/Logger/SphinxLogger.php b/Logger/SphinxLogger.php
@@ -109,4 +109,15 @@ public function getQueriesTime(): float
     {
         return $this->queriesTime;
     }
+
+    /**
+     * Resets internal state.
+     */
+    public function reset()
+    {
+        $this->queries = [];
+        $this->queriesCount = 0;
+        $this->queriesRows = 0;
+        $this->queriesTime = 0;
+    }
 }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -16,6 +16,7 @@ parameters:
 services:
     sphinx:
         class: "%sphinx.manager.class%"
+        public: true
         arguments:
             - "@sphinx.logger"
             - "%javer_sphinx.host%"
@@ -38,7 +39,7 @@ services:
         arguments:
             - "@sphinx.logger"
         tags:
-            - { name: data_collector, template: "JaverSphinxBundle:Collector:sphinx.html.twig", id: sphinx }
+            - { name: data_collector, template: "@JaverSphinx/Collector/sphinx.html.twig", id: sphinx }
 
     sphinx.daemon:
         class: "%sphinx.daemon.class%"

diff --git a/Resources/views/Collector/sphinx.html.twig b/Resources/views/Collector/sphinx.html.twig
@@ -1,11 +1,11 @@
-{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block toolbar %}
     {% set profiler_markup_version = profiler_markup_version|default(1) %}
 
     {% if profiler_markup_version == 1 %}
         {% set icon %}
-            {{ include('JaverSphinxBundle:Collector:icon.html.twig') }}
+            {{ include('@JaverSphinx/Collector/icon.html.twig') }}
 
             <span class="sf-toolbar-status">{{ collector.queriesCount }}</span>
         {% endset %}
@@ -22,10 +22,10 @@
             </div>
         {% endset %}
 
-        {% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url, status: '' } %}
+        {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, status: '' } %}
     {% elseif collector.queriesCount > 0 %}
         {% set icon %}
-            {{ include('JaverSphinxBundle:Collector:icon.html.twig') }}
+            {{ include('@JaverSphinx/Collector/icon.html.twig') }}
 
             <span class="sf-toolbar-value">{{ collector.queriesCount }}</span>
             <span class="sf-toolbar-info-piece-additional-detail">
@@ -47,7 +47,7 @@
             </div>
         {% endset %}
 
-        {% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url, status: '' } %}
+        {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, status: '' } %}
     {% endif %}
 {% endblock %}
 
@@ -56,7 +56,7 @@
 
     {% if profiler_markup_version == 1 %}
         <span class="label">
-            <span class="icon">{{ include('JaverSphinxBundle:Collector:icon.html.twig') }}</span>
+            <span class="icon">{{ include('@JaverSphinx/Collector/icon.html.twig') }}</span>
             <strong>Sphinx</strong>
             <span class="count">
                 <span>{{ collector.queriesCount }}</span>
@@ -65,7 +65,7 @@
         </span>
     {% else %}
         <span class="label {{ collector.queriesCount == 0 ? 'disabled' }}">
-            <span class="icon">{{ include('JaverSphinxBundle:Collector:icon.html.twig') }}</span>
+            <span class="icon">{{ include('@JaverSphinx/Collector/icon.html.twig') }}</span>
             <strong>Sphinx</strong>
             <span class="count">
                 <span>{{ collector.queriesCount }}</span>