Merge 2.x into master

sonata-project · Jun 8, 2018 · 73a22f5 · 73a22f5
2 parents 8f19762 + ca945a0
commit 73a22f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/DependencyInjection/SonataIntlExtension.php b/src/DependencyInjection/SonataIntlExtension.php
@@ -38,6 +38,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $config = $processor->processConfiguration($configuration, $configs);
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('autowire.xml');
         $loader->load('intl.xml');
 
         $this->configureTimezone($container, $config);

diff --git a/src/Resources/config/autowire.xml b/src/Resources/config/autowire.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="Sonata\IntlBundle\Templating\Helper\DateTimeHelper" alias="sonata.intl.templating.helper.datetime"/>
+        <service id="Sonata\IntlBundle\Templating\Helper\LocaleHelper" alias="sonata.intl.templating.helper.locale"/>
+        <service id="Sonata\IntlBundle\Templating\Helper\NumberHelper" alias="sonata.intl.templating.helper.number"/>
+    </services>
+</container>
diff --git a/src/Templating/Helper/BaseHelper.php b/src/Templating/Helper/BaseHelper.php
@@ -82,7 +82,7 @@ public static function getICUDataVersion()
 
         $info = explode("\n", $content);
 
-        if ('cli' == PHP_SAPI) {
+        if ('cli' == \PHP_SAPI) {
             foreach ($info as $line) {
                 $results = [];