Skip to content

Commit 7984226

Browse files
DamienHarperNyholm
authored andcommitted
Add compatibility with sf 3.4 (#173)
* Fixes layout path * Removes "humanize" filter usage. * Fixes for StyleCI analysis
1 parent d7d88be commit 7984226

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

DependencyInjection/BazingaGeocoderExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private function findReferences(array $options): array
171171
foreach ($options as $key => $value) {
172172
if (is_array($value)) {
173173
$options[$key] = $this->findReferences($value);
174-
} elseif (substr((string) $key, -8) === '_service' || strpos((string) $value, '@') === 0 || $key === 'service') {
174+
} elseif ('_service' === substr((string) $key, -8) || 0 === strpos((string) $value, '@') || 'service' === $key) {
175175
$options[$key] = new Reference(ltrim($value, '@'));
176176
}
177177
}

ProviderFactory/GeoIP2Factory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ final class GeoIP2Factory extends AbstractFactory
2929
protected function getProvider(array $config): Provider
3030
{
3131
$provider = $config['provider'];
32-
if ($provider === 'webservice') {
32+
if ('webservice' === $provider) {
3333
$provider = new Client($config['user_id'], $config['license_key'], $config['locales'], $config['webservice_options']);
34-
} elseif ($provider === 'database') {
34+
} elseif ('database' === $provider) {
3535
$provider = new Reader($config['database_filename'], $config['locales']);
3636
} else {
3737
$provider = $config['provider_service'];

Resources/views/Collector/geocoder.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
44
{% set queryLabel = collector.queries|length == 1 ? 'query' : 'queries' %}
@@ -26,7 +26,7 @@
2626
<tbody class="sf-toolbar-ajax-request-list">
2727
{% for query in collector.queries %}
2828
<tr>
29-
<td>{{ query.providerName|humanize }}</td>
29+
<td>{{ query.providerName }}</td>
3030
<td>{{ query.queryString }}</td>
3131
<td>{{ query.duration == 0 ? 'n/a' : query.duration|number_format ~ ' ms'}}</td>
3232
</tr>
@@ -61,7 +61,7 @@
6161
<div class="sf-tabs">
6262
{% for provider in collector.providers %}
6363
<div class="tab">
64-
<h3 class="tab-title">{{ provider|humanize }} <span class="badge">{{ collector.providerQueries(provider)|length }}</span></h3>
64+
<h3 class="tab-title">{{ provider }} <span class="badge">{{ collector.providerQueries(provider)|length }}</span></h3>
6565

6666
<div class="tab-content">
6767
<p class="help">

0 commit comments

Comments
 (0)