Skip to content

fix: allow resolving from container instead of constructing directly #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: allow resolving from container instead of constructing directly #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1cc24c
fix: allow resolving from container instead of constructing directly
atymic Feb 24, 2021
a08f0db
Merge branch 'geocoder-php:master' into fix/container-resolve
atymic Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Contracts/ResolveFromContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php
declare(strict_types=1);

namespace Geocoder\Laravel\Contracts;

interface ResolveFromContainer
{
}
5 changes: 5 additions & 0 deletions src/ProviderAndDumperAggregator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down