Merge branch 'dev'

composer.json

@@ -2,7 +2,7 @@
     "name":         "eole/sandstone",
     "license":      "MIT",
     "type":         "library",
-    "description":  "Extends Silex to easily mount a RestApi working together with a Websocket server through a Push server.",
+    "description":  "Silex RestApi with Websockets.",
     "homepage":     "https://eole-io.github.io/sandstone/",
     "keywords":     ["php", "symfony", "silex", "websocket", "push", "reactphp"],
     "authors": [
@@ -17,7 +17,7 @@
         "ext-zmq": "*",
         "psr/log": "~1.0",
         "react/zmq": "0.2.*|0.3.*",
-        "cboden/ratchet": "~0.3",
+        "cboden/ratchet": "0.3.*",
         "league/oauth2-server": "4.1.x",
         "symfony/event-dispatcher": "~3.0",
         "symfony/security": "~2.8|~3.0",

doc/.gitignore

@@ -1,3 +1,4 @@
 _site
 .sass-cache
 .jekyll-metadata
+Gemfile.lock

doc/_layouts/page.html

@@ -5,7 +5,7 @@
 <div class="jumbotron">
     <div class="container">
         <h1>Sandstone</h1>
-        <p>Extends Silex PHP to easily mount a Websocket server working together with a RestApi.</p>
+        <p>Silex RestApi with Websockets.</p>
         <a href="{{ site.baseurl }}/examples/full.html" class="btn btn-lg btn-primary">Get started</a>
     </div>
 </div>

src/Push/Debug/DataCollector/views/push-messages.html.twig

@@ -1,7 +1,25 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block toolbar %}
-    yo
+    {% set icon %}
+        <span class="sf-toolbar-value">
+            {{ collector.data.messages_count }}
+            Push
+        </span>
+    {% endset %}
+    {% set text %}
+        {% spaceless %}
+        <div class="sf-toolbar-info-piece">
+            <b>Push messages</b>
+            <span class="sf-toolbar-status">{{ collector.data.messages_count }}</span>
+        </div>
+        <div class="sf-toolbar-info-piece">
+            <b>Total size</b>
+            <span class="sf-toolbar-status">{{ collector.data.messages_size }} bytes</span>
+        </div>
+        {% endspaceless %}
+    {% endset %}
+    {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
 {% endblock %}
 
 {% block menu %}