From b1cc24c25128b0635903390b10b60099cc7d68c1 Mon Sep 17 00:00:00 2001
From: atymic <atymicq@gmail.com>
Date: Wed, 24 Feb 2021 12:42:38 +1100
Subject: [PATCH] fix: allow resolving from container instead of constructing
 directly

---
 src/Contracts/ResolveFromContainer.php | 8 ++++++++
 src/ProviderAndDumperAggregator.php    | 5 +++++
 2 files changed, 13 insertions(+)
 create mode 100644 src/Contracts/ResolveFromContainer.php

diff --git a/src/Contracts/ResolveFromContainer.php b/src/Contracts/ResolveFromContainer.php
new file mode 100644
index 0000000..eae7693
--- /dev/null
+++ b/src/Contracts/ResolveFromContainer.php
@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+
+namespace Geocoder\Laravel\Contracts;
+
+interface ResolveFromContainer
+{
+}
diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php
index a1909c0..28792a5 100644
--- a/src/ProviderAndDumperAggregator.php
+++ b/src/ProviderAndDumperAggregator.php
@@ -14,6 +14,7 @@
 use Geocoder\Dumper\Kml;
 use Geocoder\Dumper\Wkb;
 use Geocoder\Dumper\Wkt;
+use Geocoder\Laravel\Contracts\ResolveFromContainer;
 use Geocoder\Laravel\Exceptions\InvalidDumperException;
 use Geocoder\ProviderAggregator;
 use Geocoder\Query\GeocodeQuery;
@@ -277,6 +278,10 @@ protected function getArguments(array $arguments, string $provider) : array
     protected function getProvidersFromConfiguration(Collection $providers) : array
     {
         $providers = $providers->map(function ($arguments, $provider) {
+            if (is_string($arguments) && $arguments === ResolveFromContainer::class) {
+                return app($provider);
+            }
+
             $arguments = $this->getArguments($arguments, $provider);
             $reflection = new ReflectionClass($provider);