use new version of addressing package (0.2.0) using handlebars instead of twig (#11)

Author: shieldo

DependencyInjection/Compiler/InternalTwigOptionsCompilerPass.php

@@ -30,7 +30,6 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
 
-        $this->setNonSharedServices($container);
         $this->loadCountryPostalCodeOverrides($config, $container);
     }
 
@@ -64,18 +63,4 @@ private function loadRequireStrictRegions(array $config, ContainerBuilder $conta
     {
         $container->setParameter('markup_addressing.require_strict_regions', $config['require_strict_regions']);
     }
-
-    private function setNonSharedServices(ContainerBuilder $container)
-    {
-        $sharedServiceIds = ['markup_addressing.twig.internal'];
-        $isLegacy = version_compare(Kernel::VERSION, '2.8', '<');
-        foreach ($sharedServiceIds as $sharedServiceId) {
-            $definition = $container->getDefinition($sharedServiceId);
-            if (!$isLegacy) {
-                $definition->setShared(false);
-            } else {
-                $definition->setScope(ContainerInterface::SCOPE_PROTOTYPE, false);
-            }
-        }
-    }
 }

DependencyInjection/Compiler/RegisterAddressNodeProvidersPass.php

@@ -14,8 +14,6 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        $container->addCompilerPass(new InternalTwigOptionsCompilerPass());
         $container->addCompilerPass(new RegisterAddressFormatExtensionsPass());
-        $container->addCompilerPass(new RegisterAddressNodeProvidersPass());
     }
 }

DependencyInjection/MarkupAddressingExtension.php

@@ -16,80 +16,18 @@ services:
             - '@markup_addressing.country_name.provider'
         tags:
             - { name: twig.extension }
-    markup_addressing.address.node.provider.schemadotorghtml:
-        class: 'Markup\Addressing\Twig\Node\SchemaDotOrgAdrHtmlNodeProvider'
-        tags:
-            - { name: markup_addressing.address_node_provider, alias: html }
-    markup_addressing.address.node.provider.plaintext:
-        class: 'Markup\Addressing\Twig\Node\PlainTextNodeProvider'
-        tags:
-            - { name: markup_addressing.address_node_provider, alias: plaintext }
-    markup_addressing.address.node.provider.comma_separated:
-        class: 'Markup\Addressing\Twig\Node\CommaSeparatedNodeProvider'
-        tags:
-            - { name: markup_addressing.address_node_provider, alias: comma_separated }
-    markup_addressing.address.factory.node.provider:
-        class: 'Markup\Addressing\Twig\Node\ProviderFactory'
-    markup_addressing.address.extension.internal.html:
-        class: 'Markup\Addressing\Twig\Extension\InternalAddressExtension'
-        arguments:
-            - '@markup_addressing.address.factory.node.provider'
-            - html
-        tags:
-            - { name: markup_addressing.address_format_extension, alias: html }
-    markup_addressing.address.extension.internal.plaintext:
-        class: 'Markup\Addressing\Twig\Extension\InternalAddressExtension'
-        arguments:
-            - '@markup_addressing.address.factory.node.provider'
-            - plaintext
-        tags:
-            - { name: markup_addressing.address_format_extension, alias: plaintext }
-    markup_addressing.address.extension.internal.comma_separated:
-        class: 'Markup\Addressing\Twig\Extension\InternalAddressExtension'
-        arguments:
-            - '@markup_addressing.address.factory.node.provider'
-            - comma_separated
-        tags:
-            - { name: markup_addressing.address_format_extension, alias: comma_separated }
-    markup_addressing.provider.address.extension.internal:
-        class: 'Markup\Addressing\Twig\Extension\InternalExtensionProvider'
-    markup_addressing.twig.loader:
-        class: 'Markup\Addressing\Twig\Loader\TemplateLoader'
-        arguments:
-            - '%markup_addressing.twig.delimiter.template_name%'
-    markup_addressing.twig.internal:
-        class: Twig_Environment
-        arguments:
-            - '@markup_addressing.twig.loader'
-            - []
-        calls:
-            - [ addExtension, [ '@markup_addressing.country_name.extension' ] ]
-    markup_addressing.twig.provider:
-        class: 'Markup\Addressing\Provider\KeyedEnvironmentServiceProvider'
-        arguments:
-            - '@markup_addressing.twig.internal.closure'
-    markup_addressing.twig.internal.closure:
-        class: 'Markup\AddressingBundle\DependencyInjection\ServiceClosure'
-        arguments:
-            - markup_addressing.twig.internal
-            - '@service_container'
-    markup_addressing.address.template.provider:
-        class: 'Markup\Addressing\Provider\IntlAddressTemplateProvider'
-        arguments:
-            - '@markup_addressing.provider.address.extension.internal'
-            - '%markup_addressing.twig.delimiter.template_name%'
     markup_addressing.address.renderer:
         class: 'Markup\Addressing\Renderer\AddressRenderer'
         arguments:
-            - '@markup_addressing.twig.provider'
-            - '@markup_addressing.address.template.provider'
+            - '@markup_addressing.handlebars.template.provider'
+            - '@markup_addressing.country_name.provider'
             - '@markup_addressing.locale_provider'
-    markup_addressing.address.extension.public:
-        class: 'Markup\Addressing\Twig\Extension\AddressExtension'
+    markup_addressing.handlebars.template.provider:
+        class: 'Markup\Addressing\Provider\IntlAddressHandlebarsTemplateProvider'
         arguments:
-            - '@markup_addressing.address.renderer'
-        tags:
-            - { name: twig.extension }
+            - ['be', 'ca', 'dk', 'fi', 'gb', 'gg', 'ie', 'im', 'je', 'nl', 'no', 'se', 'us']
+            - '%kernel.cache_dir%/addressing'
+        public: false
     markup_addressing.canonicalizer.postal_code:
         class: 'Markup\Addressing\Canonicalizer\PostalCodeCanonicalizer'
     markup_addressing.validator.postal_code:

MarkupAddressingBundle.php

@@ -15,8 +15,8 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
-        "markup/addressing": "1.0.x-dev",
+        "php": ">=5.6",
+        "markup/addressing": "~0.2.0",
         "symfony/framework-bundle": "~2.7|~3.0"
     },
     "require-dev": {