From 5749a32b3d29ffd460ab836d929f6687994f18f5 Mon Sep 17 00:00:00 2001 From: Greg Ziborov Date: Tue, 15 Nov 2022 16:10:58 +1030 Subject: [PATCH 1/3] Oro version updated to 5.0 --- README.md | 2 +- composer.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f34b1fa..87c755a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ OroCommerce Geo Detection Bundle Facts ----- -- version: 4.2.0 +- version: 5.0.0 - composer name: aligent/oro-geo-detection Description diff --git a/composer.json b/composer.json index dfa29a2..ba6552a 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": "~7.4.14 || ~8.0.0", - "oro/commerce": "^4.2", + "oro/commerce": "5.0.*", "geoip2/geoip2": "~2.0", "guzzlehttp/guzzle": "^7.2" }, From 76091cb61ba19091dc7e18b77dc044cbb4661a00 Mon Sep 17 00:00:00 2001 From: Greg Ziborov Date: Tue, 15 Nov 2022 16:41:30 +1030 Subject: [PATCH 2/3] Updated dependency injection tree builder --- src/DependencyInjection/Configuration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 7ad21be..4c104fd 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -36,8 +36,8 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root(AligentGeoDetectionExtension::ALIAS); + $treeBuilder = new TreeBuilder(AligentGeoDetectionExtension::ALIAS); + $rootNode = $treeBuilder->getRootNode(); SettingsBuilder::append( $rootNode, From c927fbc0b9c88a35e43ee06610ec44320c0c8915 Mon Sep 17 00:00:00 2001 From: Greg Ziborov Date: Tue, 15 Nov 2022 16:50:40 +1030 Subject: [PATCH 3/3] Add WarmUp function return type --- src/Cache/GeoIpCacheWarmer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cache/GeoIpCacheWarmer.php b/src/Cache/GeoIpCacheWarmer.php index 438ae56..7d67b38 100644 --- a/src/Cache/GeoIpCacheWarmer.php +++ b/src/Cache/GeoIpCacheWarmer.php @@ -78,9 +78,9 @@ public function isOptional() /** * Warms up the cache. * - * @param string $cacheDir The cache directory + * {@inheritdoc} */ - public function warmUp($cacheDir) + public function warmUp($cacheDir): void { //avoid downloading if db is up to date if ($this->isGeoDatabaseUpToDate()) {