Loosen up validation

Nyholm · Nyholm · commit 13c6ec6f5f3b · 2018-02-01T10:25:35.000+01:00
This will fix #167
diff --git a/DependencyInjection/BazingaGeocoderExtension.php b/DependencyInjection/BazingaGeocoderExtension.php
@@ -65,10 +65,9 @@ private function loadProviders(ContainerBuilder $container, array $config)
             if (!$this->implementsPoviderFactory($factoryClass)) {
                 throw new \LogicException(sprintf('Provider factory "%s" must implement ProviderFactoryInterface', $providerConfig['factory']));
             }
-            $factoryClass::validate($providerConfig['options'], $providerName);
-
             // See if any option has a service reference
             $providerConfig['options'] = $this->findReferences($providerConfig['options']);
+            $factoryClass::validate($providerConfig['options'], $providerName);
 
             $serviceId = 'bazinga_geocoder.provider.'.$providerName;
             $plugins = $this->configureProviderPlugins($container, $providerConfig, $serviceId);
diff --git a/ProviderFactory/ArcGISOnlineFactory.php b/ProviderFactory/ArcGISOnlineFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'source_country' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('source_country', ['string', 'null']);
     }
 }
diff --git a/ProviderFactory/BingMapsFactory.php b/ProviderFactory/BingMapsFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }
diff --git a/ProviderFactory/FreeGeoIpFactory.php b/ProviderFactory/FreeGeoIpFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'base_url' => 'https://freegeoip.net/json/%s',
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('base_url', ['string']);
     }
 }
diff --git a/ProviderFactory/GeoIP2Factory.php b/ProviderFactory/GeoIP2Factory.php
@@ -56,7 +56,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
 
         $resolver->setRequired('provider');
         $resolver->setAllowedTypes('provider', ['string']);
-        $resolver->setAllowedTypes('provider_service', [ProviderInterface::class, 'null']);
+        $resolver->setAllowedTypes('provider_service', ['object', 'null']);
         $resolver->setAllowedTypes('model', ['string']);
         $resolver->setAllowedTypes('user_id', ['string', 'null']);
         $resolver->setAllowedTypes('license_key', ['string', 'null']);
diff --git a/ProviderFactory/GeoIPsFactory.php b/ProviderFactory/GeoIPsFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }
diff --git a/ProviderFactory/GeoPluginFactory.php b/ProviderFactory/GeoPluginFactory.php
@@ -37,6 +37,6 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'httplug_client' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
     }
 }
diff --git a/ProviderFactory/GeonamesFactory.php b/ProviderFactory/GeonamesFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('username');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('username', ['string']);
     }
 }
diff --git a/ProviderFactory/GoogleMapsFactory.php b/ProviderFactory/GoogleMapsFactory.php
@@ -39,7 +39,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'api_key' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('region', ['string', 'null']);
         $resolver->setAllowedTypes('api_key', ['string', 'null']);
     }
diff --git a/ProviderFactory/HostIpFactory.php b/ProviderFactory/HostIpFactory.php
@@ -37,6 +37,6 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'httplug_client' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
     }
 }
diff --git a/ProviderFactory/IpInfoDbFactory.php b/ProviderFactory/IpInfoDbFactory.php
@@ -39,7 +39,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
         $resolver->setAllowedTypes('precision', ['string']);
     }
diff --git a/ProviderFactory/IpInfoFactory.php b/ProviderFactory/IpInfoFactory.php
@@ -37,6 +37,6 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'httplug_client' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
     }
 }
diff --git a/ProviderFactory/MapQuestFactory.php b/ProviderFactory/MapQuestFactory.php
@@ -39,7 +39,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
         $resolver->setAllowedTypes('licensed', ['boolean']);
     }
diff --git a/ProviderFactory/MapzenFactory.php b/ProviderFactory/MapzenFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }
diff --git a/ProviderFactory/MaxMindFactory.php b/ProviderFactory/MaxMindFactory.php
@@ -39,7 +39,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
         $resolver->setAllowedValues('endpoint', [MaxMind::CITY_EXTENDED_SERVICE, MaxMind::OMNI_SERVICE]);
     }
diff --git a/ProviderFactory/NominatimFactory.php b/ProviderFactory/NominatimFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'root_url' => 'https://nominatim.openstreetmap.org',
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('root_url', ['string']);
     }
 }
diff --git a/ProviderFactory/OpenCageFactory.php b/ProviderFactory/OpenCageFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }
diff --git a/ProviderFactory/PickPointFactory.php b/ProviderFactory/PickPointFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }
diff --git a/ProviderFactory/TomTomFactory.php b/ProviderFactory/TomTomFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }
diff --git a/ProviderFactory/YandexFactory.php b/ProviderFactory/YandexFactory.php
@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'toponym' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
         $resolver->setAllowedTypes('toponym', ['string', 'null']);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)`
`38`	`38`	`'source_country' => null,`
`39`	`39`	`]);`
`40`	`40`
`41`		`- $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);`
	`41`	`+ $resolver->setAllowedTypes('httplug_client', ['object', 'null']);`
`42`	`42`	`$resolver->setAllowedTypes('source_country', ['string', 'null']);`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ protected static function configureOptionResolver(OptionsResolver $resolver)`
`37`	`37`	`'httplug_client' => null,`
`38`	`38`	`]);`
`39`	`39`
`40`		`- $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);`
	`40`	`+ $resolver->setAllowedTypes('httplug_client', ['object', 'null']);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)`
`39`	`39`	`'api_key' => null,`
`40`	`40`	`]);`
`41`	`41`
`42`		`- $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);`
	`42`	`+ $resolver->setAllowedTypes('httplug_client', ['object', 'null']);`
`43`	`43`	`$resolver->setAllowedTypes('region', ['string', 'null']);`
`44`	`44`	`$resolver->setAllowedTypes('api_key', ['string', 'null']);`
`45`	`45`	`}`