Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 6 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,19 @@ jobs:
max-parallel: 10
fail-fast: false
matrix:
php: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
sf_version: [ '6.4.*', '7.3.*', '7.4.*', '8.0.*' ]
php: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6' ]
sf_version: [ '6.4.*', '7.4.*', '8.1.*' ]
exclude:
- php: '8.0'
sf_version: '6.4.*'
- php: '8.0'
sf_version: '7.3.*'
sf_version: '8.1.*'
- php: '8.1'
sf_version: '7.3.*'
- php: '8.0'
sf_version: '8.0.*'
- php: '8.1'
sf_version: '8.0.*'
sf_version: '8.1.*'
- php: '8.2'
sf_version: '8.0.*'
sf_version: '8.1.*'
- php: '8.3'
sf_version: '8.0.*'
sf_version: '8.1.*'
- php: '8.0'
sf_version: '7.4.*'
- php: '8.1'
Expand Down
115 changes: 0 additions & 115 deletions phpstan-baseline.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,108 +33,18 @@
'count' => 1,
'path' => __DIR__.'/src/DataCollector/GeocoderDataCollector.php',
];
$ignoreErrors[] = [
'message' => '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#',
'identifier' => 'foreach.nonIterable',
'count' => 3,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Binary operation "\\." between \'bazinga_geocoder…\' and mixed results in an error\\.$#',
'identifier' => 'binaryOp.invalid',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot access offset \'aliases\' on mixed\\.$#',
'identifier' => 'offsetAccess.nonOffsetAccessible',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot access offset \'enabled\' on mixed\\.$#',
'identifier' => 'offsetAccess.nonOffsetAccessible',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot access offset \'factory\' on mixed\\.$#',
'identifier' => 'offsetAccess.nonOffsetAccessible',
'count' => 5,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot access offset \'id\' on mixed\\.$#',
'identifier' => 'offsetAccess.nonOffsetAccessible',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot access offset \'options\' on mixed\\.$#',
'identifier' => 'offsetAccess.nonOffsetAccessible',
'count' => 4,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot access offset \'reference\' on mixed\\.$#',
'identifier' => 'offsetAccess.nonOffsetAccessible',
'count' => 2,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot call static method validate\\(\\) on mixed\\.$#',
'identifier' => 'staticMethod.nonObject',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot cast mixed to string\\.$#',
'identifier' => 'cast.string',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$alias of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder\\:\\:setAlias\\(\\) expects string, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: Symfony\\\\Component\\\\DependencyInjection\\\\Reference given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$factoryServiceId of static method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\Compiler\\\\FactoryValidatorPass\\:\\:addFactoryServiceId\\(\\) expects non\\-empty\\-string, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$id of class Symfony\\\\Component\\\\DependencyInjection\\\\Reference constructor expects string, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$id of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder\\:\\:getDefinition\\(\\) expects string, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$object_or_class of function class_implements expects object\\|string, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$options of method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\BazingaGeocoderExtension\\:\\:findReferences\\(\\) expects array\\<mixed\\>, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 2,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#',
'identifier' => 'argument.type',
Expand All @@ -147,24 +57,6 @@
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#2 \\$config of method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\BazingaGeocoderExtension\\:\\:configureProviderPlugins\\(\\) expects array\\<mixed\\>, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Part \\$providerName \\(mixed\\) of encapsed string cannot be cast to string\\.$#',
'identifier' => 'encapsedStringPart.nonString',
'count' => 1,
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot call method getLatitude\\(\\) on Geocoder\\\\Model\\\\Coordinates\\|null\\.$#',
'identifier' => 'method.nonObject',
Expand Down Expand Up @@ -207,12 +99,5 @@
'count' => 1,
'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php',
];
// See https://github.com/phpstan/phpstan/issues/14067
$ignoreErrors[] = [
'message' => '#^Parameter \\#1 \\$provider of class Bazinga\\\\GeocoderBundle\\\\Mapping\\\\ClassMetadata constructor expects non-empty-string, ReflectionMethod\\|ReflectionProperty\\|non-empty-string given\\.$#',
'identifier' => 'argument.type',
'count' => 1,
'path' => __DIR__.'/src/Mapping/Driver/AttributeDriver.php',
];

return ['parameters' => ['ignoreErrors' => $ignoreErrors]];
25 changes: 23 additions & 2 deletions src/DependencyInjection/BazingaGeocoderExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,26 @@

/**
* @author William Durand <william.durand1@gmail.com>.
*
* @phpstan-type PluginConfig array{reference: array{enabled: bool, id: non-empty-string}}
* @phpstan-type ProviderConfig array{
* factory: non-empty-string,
* options: array<mixed>,
* cache: string|null,
* cache_lifetime: int|string|null,
* cache_precision: int|string|null,
* limit: int|string|null,
* locale: string|null,
* logger: string|null,
* aliases: list<string>,
* plugins: list<PluginConfig>,
* }
* @phpstan-type BundleConfig array{
* providers: array<string, ProviderConfig>,
* profiling: array{enabled: bool},
* fake_ip: array{enabled: bool, local_ip: string|null, ip: string|null, use_faker: bool},
* orm: array{enabled: bool},
* }
*/
class BazingaGeocoderExtension extends Extension
{
Expand All @@ -46,6 +66,7 @@ public function load(array $configs, ContainerBuilder $container): void
{
$processor = new Processor();
$configuration = $this->getConfiguration($configs, $container);
/** @var BundleConfig $config */
$config = $processor->processConfiguration($configuration, $configs);

$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
Expand Down Expand Up @@ -83,7 +104,7 @@ public function load(array $configs, ContainerBuilder $container): void
}

/**
* @param array<mixed, mixed> $config
* @param BundleConfig $config
*/
private function loadProviders(ContainerBuilder $container, array $config): void
{
Expand Down Expand Up @@ -124,7 +145,7 @@ private function loadProviders(ContainerBuilder $container, array $config): void
/**
* Configure plugins for a client.
*
* @param array<mixed> $config
* @param ProviderConfig $config
*
* @return list<Reference>
*/
Expand Down
11 changes: 11 additions & 0 deletions tests/Functional/GeocodeEntityListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Bazinga\GeocoderBundle\Tests\Functional\Fixtures\Entity\StringableAddress;
use Composer\InstalledVersions;
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\ORM\Configuration;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Tools\SchemaTool;
Expand Down Expand Up @@ -71,6 +72,16 @@ public function process(ContainerBuilder $container): void
$container
->getDefinition('http_client')
->setPublic(true);

// doctrine/doctrine-bundle < 3.4 has no "use_schema_editor_api" option
if (method_exists(Configuration::class, 'setUseSchemaEditorApi')
&& method_exists(Schema::class, 'edit')
) {
$container
->getDefinition('doctrine.orm.default_configuration')
->removeMethodCall('setUseSchemaEditorApi')
->addMethodCall('setUseSchemaEditorApi', [true]);
}
}
});
$kernel->addTestConfig(static function (ContainerBuilder $container) {
Expand Down
1 change: 0 additions & 1 deletion tests/Functional/config/listener.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ doctrine:
type: attribute
dir: '%kernel.project_dir%/tests/Functional/Fixtures/Entity'
prefix: 'Bazinga\GeocoderBundle\Tests\Functional\Fixtures\Entity'
alias: App

bazinga_geocoder:
profiling:
Expand Down
Loading