diff --git a/DependencyInjection/MisdPhoneNumberExtension.php b/DependencyInjection/MisdPhoneNumberExtension.php
index e0bc6a0e..58862ef3 100644
--- a/DependencyInjection/MisdPhoneNumberExtension.php
+++ b/DependencyInjection/MisdPhoneNumberExtension.php
@@ -13,7 +13,6 @@
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -38,31 +37,5 @@ public function load(array $configs, ContainerBuilder $container)
if (interface_exists('Symfony\Component\Serializer\Normalizer\NormalizerInterface')) {
$loader->load('serializer.xml');
}
-
- $this->setFactory($container->getDefinition('libphonenumber.phone_number_util'));
- $this->setFactory($container->getDefinition('libphonenumber.phone_number_offline_geocoder'));
- $this->setFactory($container->getDefinition('libphonenumber.short_number_info'));
- $this->setFactory($container->getDefinition('libphonenumber.phone_number_to_carrier_mapper'));
- $this->setFactory($container->getDefinition('libphonenumber.phone_number_to_time_zones_mapper'));
- }
-
- /**
- * Set Factory of FactoryClass & FactoryMethod based on Symfony version.
- *
- * to be removed when dependency on Symfony DependencyInjection is bumped to 2.6 and
- * services inlined in services.xml
- *
- * @param $def
- */
- private function setFactory(Definition $def)
- {
- if (method_exists($def, 'setFactory')) {
- // to be inlined in services.xml when dependency on Symfony DependencyInjection is bumped to 2.6
- $def->setFactory([$def->getClass(), 'getInstance']);
- } else {
- // to be removed when dependency on Symfony DependencyInjection is bumped to 2.6
- $def->setFactoryClass($def->getClass());
- $def->setFactoryMethod('getInstance');
- }
}
}
diff --git a/Resources/config/form.xml b/Resources/config/form.xml
index 7e86fc6b..39c70a4d 100644
--- a/Resources/config/form.xml
+++ b/Resources/config/form.xml
@@ -4,16 +4,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-
- Misd\PhoneNumberBundle\Form\Type\PhoneNumberType
-
-
-
+
-
diff --git a/Resources/config/serializer.xml b/Resources/config/serializer.xml
index 6738e0b9..d30bc00f 100644
--- a/Resources/config/serializer.xml
+++ b/Resources/config/serializer.xml
@@ -5,11 +5,10 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
+
-
+
-
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index f66c7ffb..d249c758 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -4,31 +4,27 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-
- libphonenumber\PhoneNumberUtil
- libphonenumber\geocoding\PhoneNumberOfflineGeocoder
- libphonenumber\ShortNumberInfo
- libphonenumber\PhoneNumberToCarrierMapper
- libphonenumber\PhoneNumberToTimeZonesMapper
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
diff --git a/Resources/config/twig.xml b/Resources/config/twig.xml
index ed38d455..13d8a556 100644
--- a/Resources/config/twig.xml
+++ b/Resources/config/twig.xml
@@ -4,27 +4,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-
- Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper
- %misd_phone_number.templating.helper.class%
- Misd\PhoneNumberBundle\Twig\Extension\PhoneNumberHelperExtension
- %misd_phone_number.twig.extension.class%
-
-
-
-
+
+
-
-
+
-
+
-
diff --git a/Tests/DependencyInjection/MisdPhoneNumberExtensionTest.php b/Tests/DependencyInjection/MisdPhoneNumberExtensionTest.php
index 3242e33a..e3e11628 100644
--- a/Tests/DependencyInjection/MisdPhoneNumberExtensionTest.php
+++ b/Tests/DependencyInjection/MisdPhoneNumberExtensionTest.php
@@ -33,61 +33,24 @@ public function testLoad()
$extension->load([], $this->container);
- $this->assertHasService(
- 'libphonenumber.phone_number_util',
- 'libphonenumber\PhoneNumberUtil'
- );
+ $this->assertTrue($this->container->has('libphonenumber\PhoneNumberUtil'));
if (class_exists('libphonenumber\geocoding\PhoneNumberOfflineGeocoder') && extension_loaded('intl')) {
- $this->assertHasService(
- 'libphonenumber.phone_number_offline_geocoder',
- 'libphonenumber\geocoding\PhoneNumberOfflineGeocoder'
- );
+ $this->assertTrue($this->container->has('libphonenumber\geocoding\PhoneNumberOfflineGeocoder'));
}
if (class_exists('libphonenumber\ShortNumberInfo')) {
- $this->assertHasService(
- 'libphonenumber.short_number_info',
- 'libphonenumber\ShortNumberInfo'
- );
+ $this->assertTrue($this->container->has('libphonenumber\ShortNumberInfo'));
}
if (class_exists('libphonenumber\PhoneNumberToCarrierMapper') && extension_loaded('intl')) {
- $this->assertHasService(
- 'libphonenumber.phone_number_to_carrier_mapper',
- 'libphonenumber\PhoneNumberToCarrierMapper'
- );
+ $this->assertTrue($this->container->has('libphonenumber\PhoneNumberToCarrierMapper'));
}
if (class_exists('libphonenumber\PhoneNumberToTimeZonesMapper')) {
- $this->assertHasService(
- 'libphonenumber.phone_number_to_time_zones_mapper',
- 'libphonenumber\PhoneNumberToTimeZonesMapper'
- );
+ $this->assertTrue($this->container->has('libphonenumber\PhoneNumberToTimeZonesMapper'));
}
- $this->assertHasService(
- 'misd_phone_number.templating.helper',
- 'Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper'
- );
+ $this->assertTrue($this->container->has('Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper'));
+ $this->assertTrue($this->container->has('Misd\PhoneNumberBundle\Form\Type\PhoneNumberType'));
- $this->assertHasService(
- 'misd_phone_number.form.type',
- 'Misd\PhoneNumberBundle\Form\Type\PhoneNumberType'
- );
- $this->assertServiceHasTag(
- 'misd_phone_number.form.type',
- 'form.type',
- ['alias' => 'phone_number']
- );
- }
-
- protected function assertHasService($id, $instanceOf)
- {
- $this->assertTrue($this->container->has($id));
- $this->assertInstanceOf($instanceOf, $this->container->get($id));
- }
-
- protected function assertServiceHasTag($id, $tag, $attributes = [])
- {
- $services = $this->container->findTaggedServiceIds($tag);
-
- $this->assertArrayHasKey($id, $services);
- $this->assertContains($attributes, $services[$id]);
+ $services = $this->container->findTaggedServiceIds('form.type');
+ $this->assertArrayHasKey('Misd\PhoneNumberBundle\Form\Type\PhoneNumberType', $services);
+ $this->assertContains(['alias' => 'phone_number'], $services['Misd\PhoneNumberBundle\Form\Type\PhoneNumberType']);
}
}