Update panel and menu template (#8)

* remove odd call from profiler panel template * pin upper phpunit dependency
scaytrase · Jun 19, 2016 · 24672bc · 24672bc
1 parent 696ea3a
commit 24672bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,8 @@ env:
   - SYMFONY_VERSION='2.7.*' deps='no'
   - SYMFONY_VERSION='2.8.*' deps='no'
   - SYMFONY_VERSION='3.0.*' deps='no'
-  - SYMFONY_VERSION='~3.0@dev' deps='no'
+  - SYMFONY_VERSION='3.1.*' deps='no'
+  - SYMFONY_VERSION='~3.2@dev' deps='no'
 
 matrix:
     include:
@@ -28,10 +29,10 @@ before_install:
   - travis_retry composer self-update
 
 install:
-    - composer require --no-update symfony/symfony=${SYMFONY_VERSION}
-    - if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
-    - if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest --prefer-stable update; fi;
+  - composer require --no-update symfony/symfony=${SYMFONY_VERSION}
+  - if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
+  - if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest --prefer-stable update; fi;
 
 script:
   - mkdir -p build
-  - phpunit --colors -c phpunit.xml --coverage-text
+  - phpunit
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
   },
   "require-dev": {
     "scaytrase/symfony-test-utils": "~1.1",
-    "phpunit/phpunit": "~4.6@stable|~5.0@stable",
+    "phpunit/phpunit": "~5.0 <5.4 || ~4.6 ",
     "symfony/framework-bundle": "~2.3|~3.0"
   },
   "suggest": {

diff --git a/src/ScayTrase/SmsDeliveryBundle/Resources/views/DataCollector/data_collector.html.twig b/src/ScayTrase/SmsDeliveryBundle/Resources/views/DataCollector/data_collector.html.twig
@@ -1,7 +1,6 @@
 {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 
-
 {% block toolbar %}
     {% set success = true %}
     {% set good = 0 %}
@@ -50,12 +49,18 @@
 {% endblock %}
 
 {% block menu %}
+    {% set success = true %}
+    {% for key,row in collector.data %}
+        {% if row.status == 'fail' %}
+            {% set success = false %}
+        {% endif %}
+    {% endfor %}
     <span class="label">
         <span class="icon">
             <img alt="Short messages"
                  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAeCAYAAABaKIzgAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsSAAALEgHS3X78AAAAGHRFWHRTb2Z0d2FyZQBwYWludC5uZXQgNC4wLjOM5pdQAAABvElEQVRYR+3Xv0sCYRzHcU/vPMU7RAfbbYmmftAQtRRtDa39Ga0t/QENjdF/EEEQBFFruBbU6hYEDVkUZWVq9f5CBw/Hk5X6eBZ+4YXHfTU/Pr/oYv+pPIxjypAROOiosijhDe+GvGIDFtquCZgMGajARdslU6P7w912j0HQ7zTS6fRKMpnc0fTCoh3ReDx+lc1mJ3m90fUVZoMmEolrRkxOhWa4F0ilUmuu667regqzQQm5ncvlpi3LetT1BT/mnFGd57oe7inMBiVgnWm91fUCvKeSz+dHuX4K9xS9W6O2bR96njeLmUwmM0fAstxnRGuFQqHI60P4M4qebqYaZHQDDUjQKlNfbLU80NOgWiyNS4KOcf0c7inMBnUcZ/dzM1V1fcGIHrMclrj+8mSA2aCMVpmdvyWbStfnfpP1uszxtK/rK6Kdekaz5Pv+IoFfdH1FdEFlNBntI1mjun5I9Jvph/5M0Dt0FHQYrY6VbjmDjbYrjlXI1Oi+oBsusICulDzP/IY8rG1CfYyRxw25H35v5JXCHoKwErSj6TVZPg7Q90GlhnCCvg8qJafHKfo+qJT88yynyKD6oGKxD/dgDJY6o7ruAAAAAElFTkSuQmCC"/>
         </span>
-        <strong>Short messages</strong>
+        <strong>SMS</strong>
 
         <span class="count {% if not success %}sf-toolbar-status-red{% endif %}">
             <span>{{ collector.data | length }}</span>
@@ -67,8 +72,6 @@
 {% block panel %}
     <h2>Short Messages</h2>
 
-    <h3>{{ collector.service }}</h3>
-
     {% if not (collector.data | length) %}
         <p>
             <em>No message sent.</em>
@@ -80,10 +83,8 @@
                 <th scope="col">#</th>
                 <th scope="col">Delivery Status</th>
                 <th scope="col">Delivery Reason</th>
-                {#<th scope="col">Delivery Transport</th>#}
                 <th scope="col">Message Recipient</th>
                 <th scope="col">Message Body</th>
-                {#<th scope="col">Message Class</th>#}
             </tr>
             </thead>
             <tbody>
@@ -92,10 +93,8 @@
                     <td>{{ key }}</td>
                     <td>{{ package.status }}</td>
                     <td>{{ package.reason }}</td>
-                    {#<td>{{ package.record.transport }}</td>#}
-                    <td>{{ package.record.message.recipient }}</td>
+                    <td>{{ package.message.recipient }}</td>
                     <td>{{ package.message.body }}</td>
-                    {#<td>{{ package.message_class }}</td>#}
                 </tr>
             {% endfor %}
             </tbody>