From 0c320ba628b8dfd0aee423e1c75416675402cf24 Mon Sep 17 00:00:00 2001
From: fbuchlak <30214087+fbuchlak@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:34:09 +0100
Subject: [PATCH 1/3] fix: [profiler] don't use dump/profiler_dump for number
of results
---
templates/Collector/geocoder.html.twig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/Collector/geocoder.html.twig b/templates/Collector/geocoder.html.twig
index 9ec3c1f..44aad0b 100644
--- a/templates/Collector/geocoder.html.twig
+++ b/templates/Collector/geocoder.html.twig
@@ -99,7 +99,7 @@
{% if query.result.message is defined %}
Exception
{% else %}
- {{ profiler_dump(query.resultCount) }} Result(s)
+ {{ query.resultCount }} Result(s)
{% endif %}
From b322a40d00b425a26fc4ac72cf20c057f475a531 Mon Sep 17 00:00:00 2001
From: fbuchlak <30214087+fbuchlak@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:13:25 +0100
Subject: [PATCH 2/3] fix: [profiler] highlight result count as number
---
templates/Collector/geocoder.html.twig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/Collector/geocoder.html.twig b/templates/Collector/geocoder.html.twig
index 44aad0b..3618d96 100644
--- a/templates/Collector/geocoder.html.twig
+++ b/templates/Collector/geocoder.html.twig
@@ -99,7 +99,7 @@
{% if query.result.message is defined %}
Exception
{% else %}
- {{ query.resultCount }} Result(s)
+ {{ query.resultCount }} Result(s)
{% endif %}
From b0fa6aad87aeafc7acc075eed6d58101bc463712 Mon Sep 17 00:00:00 2001
From: Tomas
Date: Wed, 30 Apr 2025 19:07:00 +0300
Subject: [PATCH 3/3] Allow `willdurand/geocoder` v5
---
composer.json | 2 +-
src/ProviderFactory/GeoIP2Factory.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/composer.json b/composer.json
index be2d037..0cf72da 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
"symfony/console": "^5.4 || ^6.4 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
"symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
- "willdurand/geocoder": "^4.6"
+ "willdurand/geocoder": "^4.6|^5.0"
},
"require-dev": {
"doctrine/annotations": "^1.11.1 || ^2.0",
diff --git a/src/ProviderFactory/GeoIP2Factory.php b/src/ProviderFactory/GeoIP2Factory.php
index c0f39ec..77dfdbc 100644
--- a/src/ProviderFactory/GeoIP2Factory.php
+++ b/src/ProviderFactory/GeoIP2Factory.php
@@ -27,7 +27,7 @@ final class GeoIP2Factory extends AbstractFactory
];
/**
- * @param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string|int|null, license_key: string|null, locales: list, webservice_options: array, database_filename: ?string} $config
+ * @param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string|int|null, license_key: string|null, locales: list, webservice_options: array, database_filename: ?string} $config
*/
protected function getProvider(array $config): Provider
{