Merge pull request #79 from ker0x/feature/issue-75

Add support for Bootstrap 5

README.md

@@ -98,7 +98,7 @@ Note that if you're putting the `phone_number` type on an already-existing schem
 
 ### Twig Templating
 
-If any of the `form_div_layout`, `bootstrap_3_*` or `bootstrap_4_*` layouts are registered in your twig configuration, the bundle will automatically register the template used to render the `Misd\PhoneNumberBundle\Form\Type` form type. 
+If any of the `form_div_layout`, `bootstrap_3_*`, `bootstrap_4_*` or `bootstrap_5_*` layouts are registered in your twig configuration, the bundle will automatically register the template used to render the `Misd\PhoneNumberBundle\Form\Type` form type. 
 #### phone_number_format
 
 The `phone_number_format` filter can be used to format a phone number object. A `libphonenumber\PhoneNumberFormat` constant can be passed as argument to specify in which format the number should be printed.

composer.json

@@ -14,7 +14,8 @@
     "require": {
         "php": ">7.2.5",
         "giggsey/libphonenumber-for-php": "^8.0",
-        "symfony/framework-bundle": "^3.4|^4.3|^5.0"
+        "symfony/framework-bundle": "^3.4|^4.3|^5.0",
+        "symfony/intl": "^3.4|^4.3|^5.0"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.12|^2.0",

src/DependencyInjection/Compiler/FormTwigTemplateCompilerPass.php

@@ -22,6 +22,7 @@ class FormTwigTemplateCompilerPass implements CompilerPassInterface
     private $phoneNumberLayout = '@MisdPhoneNumber/Form/phone_number.html.twig';
     private $phoneNumberBootstrapLayout = '@MisdPhoneNumber/Form/phone_number_bootstrap.html.twig';
     private $phoneNumberBootstrap4Layout = '@MisdPhoneNumber/Form/phone_number_bootstrap_4.html.twig';
+    private $phoneNumberBootstrap5Layout = '@MisdPhoneNumber/Form/phone_number_bootstrap_5.html.twig';
 
     /**
      * {@inheritdoc}
@@ -39,7 +40,11 @@ public function process(ContainerBuilder $container)
         }
 
         // Insert right after base template if it exists.
-        if (false !== ($key = array_search('bootstrap_4_horizontal_layout.html.twig', $parameter))) {
+        if (false !== ($key = array_search('bootstrap_5_horizontal_layout.html.twig', $parameter))) {
+            array_splice($parameter, ++$key, 0, [$this->phoneNumberBootstrap5Layout]);
+        } elseif (false !== ($key = array_search('bootstrap_5_layout.html.twig', $parameter))) {
+            array_splice($parameter, ++$key, 0, [$this->phoneNumberBootstrap5Layout]);
+        } elseif (false !== ($key = array_search('bootstrap_4_horizontal_layout.html.twig', $parameter))) {
             array_splice($parameter, ++$key, 0, [$this->phoneNumberBootstrap4Layout]);
         } elseif (false !== ($key = array_search('bootstrap_4_layout.html.twig', $parameter))) {
             array_splice($parameter, ++$key, 0, [$this->phoneNumberBootstrap4Layout]);

src/Resources/views/Form/phone_number_bootstrap_5.html.twig

@@ -0,0 +1,11 @@
+{% block phone_number_widget -%}
+    {% if widget is constant('Misd\\PhoneNumberBundle\\Form\\Type\\PhoneNumberType::WIDGET_COUNTRY_CHOICE') %}
+        {% set attr = attr|merge({class: (attr.class|default('') ~ ' input-group')|trim}) %}
+        <div {{ block('widget_container_attributes') }}>
+            {{- form_widget(form.country) -}}
+            {{- form_widget(form.number) -}}
+        </div>
+    {% else -%}
+        {{- block('form_widget_simple') -}}
+    {%- endif %}
+{%- endblock phone_number_widget %}