Skip to content
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

Create services only if dependency is available #169

Merged
merged 4 commits into from
Oct 3, 2018
Merged

Create services only if dependency is available #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8aa041
Create services only if dependency is available
ossinkine Mar 5, 2018
f534d22
Changelog: Add services only when available
rh389 Oct 2, 2018
26c43c3
Merge branch 'master' into issue-169
rh389 Oct 2, 2018
124e63f
Revert double-addition to changelog
rh389 Oct 2, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Upcoming release
* Add support for Symfony 3.4+
* Drop support for PHP 5.3
* Rename `tel_widget` to `phone_number_widget`
* Add services only if relevant (optional) dependencies are available

1.3.1
-----
Expand Down
15 changes: 15 additions & 0 deletions DependencyInjection/MisdPhoneNumberExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,21 @@ public function load(array $configs, ContainerBuilder $container)
{
$loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.xml');
if (interface_exists('Symfony\Component\Templating\Helper\HelperInterface')) {
$loader->load('templating.xml');
if (class_exists('Symfony\Bundle\TwigBundle\TwigBundle')) {
$loader->load('twig.xml');
}
}
if (interface_exists('Symfony\Component\Form\FormTypeInterface')) {
$loader->load('form.xml');
}
if (interface_exists('Symfony\Component\Serializer\Normalizer\NormalizerInterface')) {
$loader->load('serializer.xml');
}
if (class_exists('JMS\SerializerBundle\JMSSerializerBundle')) {
$loader->load('jms_serializer.xml');
}

$this->setFactory($container->getDefinition('libphonenumber.phone_number_util'));
$this->setFactory($container->getDefinition('libphonenumber.phone_number_offline_geocoder'));
Expand Down
19 changes: 19 additions & 0 deletions Resources/config/form.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
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">

<parameters>
<!-- .class parameters are deprecated and will be removed in 2.0 -->
<parameter key="misd_phone_number.form.type.class">Misd\PhoneNumberBundle\Form\Type\PhoneNumberType</parameter>
</parameters>

<services>
<service id="misd_phone_number.form.type" class="Misd\PhoneNumberBundle\Form\Type\PhoneNumberType">
<tag name="form.type" alias="tel"/>
</service>
<service id="Misd\PhoneNumberBundle\Form\Type\PhoneNumberType" alias="misd_phone_number.form.type"/>
</services>

</container>
29 changes: 29 additions & 0 deletions Resources/config/jms_serializer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
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">

<parameters>
<!-- .class parameters are deprecated and will be removed in 2.0 -->
<parameter key="misd_phone_number.serializer.handler.class">Misd\PhoneNumberBundle\Serializer\Handler\PhoneNumberHandler</parameter>
</parameters>

<services>
<service id="misd_phone_number.serializer.handler" class="Misd\PhoneNumberBundle\Serializer\Handler\PhoneNumberHandler">
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="serialization"
format="json" method="serializePhoneNumber"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="deserialization"
format="json" method="deserializePhoneNumberFromJson"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="serialization"
format="xml" method="serializePhoneNumber"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="deserialization"
format="xml" method="deserializePhoneNumberFromXml"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="serialization"
format="yml" method="serializePhoneNumber"/>
<argument type="service" id="libphonenumber.phone_number_util"/>
</service>
<service id="Misd\PhoneNumberBundle\Serializer\Handler\PhoneNumberHandler" alias="misd_phone_number.serializer.handler"/>
</services>

</container>
15 changes: 15 additions & 0 deletions Resources/config/serializer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
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">

<services>
<service id="misd_phone_number.serializer.normalizer" class="Misd\PhoneNumberBundle\Serializer\Normalizer\PhoneNumberNormalizer">
<tag name="serializer.normalizer" />
<argument type="service" id="libphonenumber.phone_number_util" />
</service>
<service id="Misd\PhoneNumberBundle\Serializer\Normalizer\PhoneNumberNormalizer" alias="misd_phone_number.serializer.normalizer"/>
</services>

</container>
47 changes: 0 additions & 47 deletions Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
<parameter key="libphonenumber.short_number_info.class">libphonenumber\ShortNumberInfo</parameter>
<parameter key="libphonenumber.phone_number_to_carrier_mapper.class">libphonenumber\PhoneNumberToCarrierMapper</parameter>
<parameter key="libphonenumber.phone_number_to_time_zones_mapper.class">libphonenumber\PhoneNumberToTimeZonesMapper</parameter>
<parameter key="misd_phone_number.templating.helper.class">Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper</parameter>
<parameter key="misd_phone_number.templating.helper.format.class">%misd_phone_number.templating.helper.class%</parameter>
<parameter key="misd_phone_number.twig.extension.class">Misd\PhoneNumberBundle\Twig\Extension\PhoneNumberHelperExtension</parameter>
<parameter key="misd_phone_number.twig.extension.format.class">%misd_phone_number.twig.extension.class%</parameter>
<parameter key="misd_phone_number.form.type.class">Misd\PhoneNumberBundle\Form\Type\PhoneNumberType</parameter>
<parameter key="misd_phone_number.serializer.handler.class">Misd\PhoneNumberBundle\Serializer\Handler\PhoneNumberHandler</parameter>
</parameters>

<services>
Expand All @@ -36,47 +30,6 @@
<service id="libphonenumber.phone_number_to_time_zones_mapper" class="libphonenumber\PhoneNumberToTimeZonesMapper"/>
<service id="libphonenumber\PhoneNumberToTimeZonesMapper" alias="libphonenumber.phone_number_to_time_zones_mapper"/>

<service id="misd_phone_number.templating.helper"
class="Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper">
<tag name="templating.helper" alias="phone_number_helper"/>
<!-- phone_number_format is deprecated and will be removed in 2.0 (use phone_number_helper instead) -->
<tag name="templating.helper" alias="phone_number_format"/>
<argument type="service" id="libphonenumber.phone_number_util"/>
</service>
<service id="Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper" alias="misd_phone_number.templating.helper"/>

<service id="misd_phone_number.twig.extension.format" class="Misd\PhoneNumberBundle\Twig\Extension\PhoneNumberHelperExtension"
public="false">
<tag name="twig.extension"/>
<argument type="service" id="misd_phone_number.templating.helper"/>
</service>
<service id="Misd\PhoneNumberBundle\Twig\Extension\PhoneNumberHelperExtension" alias="misd_phone_number.twig.extension.format"/>

<service id="misd_phone_number.form.type" class="Misd\PhoneNumberBundle\Form\Type\PhoneNumberType">
<tag name="form.type" alias="tel"/>
</service>
<service id="Misd\PhoneNumberBundle\Form\Type\PhoneNumberType" alias="misd_phone_number.form.type"/>

<service id="misd_phone_number.serializer.handler" class="Misd\PhoneNumberBundle\Serializer\Handler\PhoneNumberHandler">
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="serialization"
format="json" method="serializePhoneNumber"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="deserialization"
format="json" method="deserializePhoneNumberFromJson"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="serialization"
format="xml" method="serializePhoneNumber"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="deserialization"
format="xml" method="deserializePhoneNumberFromXml"/>
<tag name="jms_serializer.handler" type="libphonenumber\PhoneNumber" direction="serialization"
format="yml" method="serializePhoneNumber"/>
<argument type="service" id="libphonenumber.phone_number_util"/>
</service>
<service id="Misd\PhoneNumberBundle\Serializer\Handler\PhoneNumberHandler" alias="misd_phone_number.serializer.handler"/>

<service id="misd_phone_number.serializer.normalizer" class="Misd\PhoneNumberBundle\Serializer\Normalizer\PhoneNumberNormalizer">
<tag name="serializer.normalizer" />
<argument type="service" id="libphonenumber.phone_number_util" />
</service>
<service id="Misd\PhoneNumberBundle\Serializer\Normalizer\PhoneNumberNormalizer" alias="misd_phone_number.serializer.normalizer"/>
</services>

</container>
24 changes: 24 additions & 0 deletions Resources/config/templating.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
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">

<parameters>
<!-- .class parameters are deprecated and will be removed in 2.0 -->
<parameter key="misd_phone_number.templating.helper.class">Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper</parameter>
<parameter key="misd_phone_number.templating.helper.format.class">%misd_phone_number.templating.helper.class%</parameter>
</parameters>

<services>
<service id="misd_phone_number.templating.helper"
class="Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper">
<tag name="templating.helper" alias="phone_number_helper"/>
<!-- phone_number_format is deprecated and will be removed in 2.0 (use phone_number_helper instead) -->
<tag name="templating.helper" alias="phone_number_format"/>
<argument type="service" id="libphonenumber.phone_number_util"/>
</service>
<service id="Misd\PhoneNumberBundle\Templating\Helper\PhoneNumberHelper" alias="misd_phone_number.templating.helper"/>
</services>

</container>
22 changes: 22 additions & 0 deletions Resources/config/twig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
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">

<parameters>
<!-- .class parameters are deprecated and will be removed in 2.0 -->
<parameter key="misd_phone_number.twig.extension.class">Misd\PhoneNumberBundle\Twig\Extension\PhoneNumberHelperExtension</parameter>
<parameter key="misd_phone_number.twig.extension.format.class">%misd_phone_number.twig.extension.class%</parameter>
</parameters>

<services>
<service id="misd_phone_number.twig.extension.format" class="Misd\PhoneNumberBundle\Twig\Extension\PhoneNumberHelperExtension"
public="false">
<tag name="twig.extension"/>
<argument type="service" id="misd_phone_number.templating.helper"/>
</service>
<service id="Misd\PhoneNumberBundle\Twig\Extension\PhoneNumberHelperExtension" alias="misd_phone_number.twig.extension.format"/>
</services>

</container>