Add compatibility with sf 3.4 (#173)

* Fixes layout path * Removes "humanize" filter usage. * Fixes for StyleCI analysis
geocoder-php · Dec 6, 2017 · 7984226 · 7984226
1 parent d7d88be
commit 7984226
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/DependencyInjection/BazingaGeocoderExtension.php b/DependencyInjection/BazingaGeocoderExtension.php
@@ -171,7 +171,7 @@ private function findReferences(array $options): array
         foreach ($options as $key => $value) {
             if (is_array($value)) {
                 $options[$key] = $this->findReferences($value);
-            } elseif (substr((string) $key, -8) === '_service' || strpos((string) $value, '@') === 0 || $key === 'service') {
+            } elseif ('_service' === substr((string) $key, -8) || 0 === strpos((string) $value, '@') || 'service' === $key) {
                 $options[$key] = new Reference(ltrim($value, '@'));
             }
         }

diff --git a/ProviderFactory/GeoIP2Factory.php b/ProviderFactory/GeoIP2Factory.php
@@ -29,9 +29,9 @@ final class GeoIP2Factory extends AbstractFactory
     protected function getProvider(array $config): Provider
     {
         $provider = $config['provider'];
-        if ($provider === 'webservice') {
+        if ('webservice' === $provider) {
             $provider = new Client($config['user_id'], $config['license_key'], $config['locales'], $config['webservice_options']);
-        } elseif ($provider === 'database') {
+        } elseif ('database' === $provider) {
             $provider = new Reader($config['database_filename'], $config['locales']);
         } else {
             $provider = $config['provider_service'];

diff --git a/Resources/views/Collector/geocoder.html.twig b/Resources/views/Collector/geocoder.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block toolbar %}
     {% set queryLabel = collector.queries|length == 1 ? 'query' : 'queries' %}
@@ -26,7 +26,7 @@
                     <tbody class="sf-toolbar-ajax-request-list">
                     {% for query in collector.queries %}
                         <tr>
-                            <td>{{ query.providerName|humanize }}</td>
+                            <td>{{ query.providerName }}</td>
                             <td>{{ query.queryString }}</td>
                             <td>{{ query.duration == 0 ? 'n/a' : query.duration|number_format ~ ' ms'}}</td>
                         </tr>
@@ -61,7 +61,7 @@
     <div class="sf-tabs">
         {% for provider in collector.providers %}
         <div class="tab">
-            <h3 class="tab-title">{{ provider|humanize }} <span class="badge">{{ collector.providerQueries(provider)|length }}</span></h3>
+            <h3 class="tab-title">{{ provider }} <span class="badge">{{ collector.providerQueries(provider)|length }}</span></h3>
 
             <div class="tab-content">
                 <p class="help">