Merge remote-tracking branch 'origin/master' into cire16

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -22,17 +22,22 @@ use Chill\MainBundle\Controller\UserController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
+use Chill\MainBundle\Doctrine\DQL\Age;
 use Chill\MainBundle\Doctrine\DQL\Extract;
 use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey;
+use Chill\MainBundle\Doctrine\DQL\Greatest;
 use Chill\MainBundle\Doctrine\DQL\JsonAggregate;
 use Chill\MainBundle\Doctrine\DQL\JsonbArrayLength;
 use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray;
 use Chill\MainBundle\Doctrine\DQL\JsonExtract;
+use Chill\MainBundle\Doctrine\DQL\Least;
 use Chill\MainBundle\Doctrine\DQL\OverlapsI;
 use Chill\MainBundle\Doctrine\DQL\Replace;
 use Chill\MainBundle\Doctrine\DQL\Similarity;
 use Chill\MainBundle\Doctrine\DQL\STContains;
 use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
+use Chill\MainBundle\Doctrine\DQL\STX;
+use Chill\MainBundle\Doctrine\DQL\STY;
 use Chill\MainBundle\Doctrine\DQL\ToChar;
 use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
@@ -205,8 +210,11 @@ class ChillMainExtension extends Extension implements
         $loader->load('services/search.yaml');
         $loader->load('services/serializer.yaml');
         $loader->load('services/mailer.yaml');
+        $loader->load('services/short_message.yaml');
 
         $this->configureCruds($container, $config['cruds'], $config['apis'], $loader);
+        $container->setParameter('chill_main.short_messages', $config['short_messages']);
+        //$this->configureSms($config['short_messages'], $container, $loader);
     }
 
     public function prepend(ContainerBuilder $container)
@@ -247,10 +255,15 @@ class ChillMainExtension extends Extension implements
                                 'STRICT_WORD_SIMILARITY_OPS' => StrictWordSimilarityOPS::class,
                                 'ST_CONTAINS' => STContains::class,
                                 'JSONB_ARRAY_LENGTH' => JsonbArrayLength::class,
+                                'ST_X' => STX::class,
+                                'ST_Y' => STY::class,
+                                'GREATEST' => Greatest::class,
+                                'LEAST' => LEAST::class,
                             ],
                             'datetime_functions' => [
                                 'EXTRACT' => Extract::class,
                                 'TO_CHAR' => ToChar::class,
+                                'AGE' => Age::class,
                             ],
                         ],
                         'hydrators' => [

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
+use Chill\MainBundle\Export\ExportManager;
 use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -30,53 +31,19 @@ class ExportsCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (!$container->has('Chill\MainBundle\Export\ExportManager')) {
-            throw new LogicException('service Chill\MainBundle\Export\ExportManager '
+        if (!$container->has(ExportManager::class)) {
+            throw new LogicException('service ' . ExportManager::class . ' '
                     . 'is not defined. It is required by ExportsCompilerPass');
         }
 
         $chillManagerDefinition = $container->findDefinition(
-            'Chill\MainBundle\Export\ExportManager'
+            ExportManager::class
         );
 
-        $this->compileExports($chillManagerDefinition, $container);
-        $this->compileFilters($chillManagerDefinition, $container);
-        $this->compileAggregators($chillManagerDefinition, $container);
         $this->compileFormatters($chillManagerDefinition, $container);
         $this->compileExportElementsProvider($chillManagerDefinition, $container);
     }
 
-    private function compileAggregators(
-        Definition $chillManagerDefinition,
-        ContainerBuilder $container
-    ) {
-        $taggedServices = $container->findTaggedServiceIds(
-            'chill.export_aggregator'
-        );
-
-        $knownAliases = [];
-
-        foreach ($taggedServices as $id => $tagAttributes) {
-            foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes['alias'])) {
-                    throw new LogicException("the 'alias' attribute is missing in your " .
-                        "service '{$id}' definition");
-                }
-
-                if (array_search($attributes['alias'], $knownAliases, true)) {
-                    throw new LogicException('There is already a chill.export_aggregator service with alias '
-                        . $attributes['alias'] . '. Choose another alias.');
-                }
-                $knownAliases[] = $attributes['alias'];
-
-                $chillManagerDefinition->addMethodCall(
-                    'addAggregator',
-                    [new Reference($id), $attributes['alias']]
-                );
-            }
-        }
-    }
-
     private function compileExportElementsProvider(
         Definition $chillManagerDefinition,
         ContainerBuilder $container
@@ -108,68 +75,6 @@ class ExportsCompilerPass implements CompilerPassInterface
         }
     }
 
-    private function compileExports(
-        Definition $chillManagerDefinition,
-        ContainerBuilder $container
-    ) {
-        $taggedServices = $container->findTaggedServiceIds(
-            'chill.export'
-        );
-
-        $knownAliases = [];
-
-        foreach ($taggedServices as $id => $tagAttributes) {
-            foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes['alias'])) {
-                    throw new LogicException("the 'alias' attribute is missing in your " .
-                        "service '{$id}' definition");
-                }
-
-                if (array_search($attributes['alias'], $knownAliases, true)) {
-                    throw new LogicException('There is already a chill.export service with alias '
-                        . $attributes['alias'] . '. Choose another alias.');
-                }
-                $knownAliases[] = $attributes['alias'];
-
-                $chillManagerDefinition->addMethodCall(
-                    'addExport',
-                    [new Reference($id), $attributes['alias']]
-                );
-            }
-        }
-    }
-
-    private function compileFilters(
-        Definition $chillManagerDefinition,
-        ContainerBuilder $container
-    ) {
-        $taggedServices = $container->findTaggedServiceIds(
-            'chill.export_filter'
-        );
-
-        $knownAliases = [];
-
-        foreach ($taggedServices as $id => $tagAttributes) {
-            foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes['alias'])) {
-                    throw new LogicException("the 'alias' attribute is missing in your " .
-                        "service '{$id}' definition");
-                }
-
-                if (array_search($attributes['alias'], $knownAliases, true)) {
-                    throw new LogicException('There is already a chill.export_filter service with alias '
-                        . $attributes['alias'] . '. Choose another alias.');
-                }
-                $knownAliases[] = $attributes['alias'];
-
-                $chillManagerDefinition->addMethodCall(
-                    'addFilter',
-                    [new Reference($id), $attributes['alias']]
-                );
-            }
-        }
-    }
-
     private function compileFormatters(
         Definition $chillManagerDefinition,
         ContainerBuilder $container

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php

@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * Chill is a software for social workers.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\DependencyInjection\CompilerPass;
+
+use Chill\MainBundle\Service\ShortMessage\NullShortMessageSender;
+use Chill\MainBundle\Service\ShortMessage\ShortMessageTransporter;
+use Chill\MainBundle\Service\ShortMessageOvh\OvhShortMessageSender;
+use libphonenumber\PhoneNumberUtil;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
+use function array_key_exists;
+
+class ShortMessageCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        $config = $container->resolveEnvPlaceholders($container->getParameter('chill_main.short_messages', null), true);
+        // weird fix for special characters
+        $config['dsn'] = str_replace(['%%'], ['%'], $config['dsn']);
+        $dsn = parse_url($config['dsn']);
+        parse_str($dsn['query'] ?? '', $dsn['queries']);
+
+        if ('null' === $dsn['scheme'] || false === $config['enabled']) {
+            $defaultTransporter = new Reference(NullShortMessageSender::class);
+        } elseif ('ovh' === $dsn['scheme']) {
+            if (!class_exists('\Ovh\Api')) {
+                throw new RuntimeException('Class \\Ovh\\Api not found');
+            }
+
+            foreach (['user', 'host', 'pass'] as $component) {
+                if (!array_key_exists($component, $dsn)) {
+                    throw new RuntimeException(sprintf('The component %s does not exist in dsn. Please provide a dsn ' .
+                        'like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $component));
+                }
+
+                $container->setParameter('chill_main.short_messages.ovh_config_' . $component, $dsn[$component]);
+            }
+
+            foreach (['consumer_key', 'sender', 'service_name'] as $param) {
+                if (!array_key_exists($param, $dsn['queries'])) {
+                    throw new RuntimeException(sprintf('The parameter %s does not exist in dsn. Please provide a dsn ' .
+                        'like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $param));
+                }
+                $container->setParameter('chill_main.short_messages.ovh_config_' . $param, $dsn['queries'][$param]);
+            }
+
+            $ovh = new Definition();
+            $ovh
+                ->setClass('\Ovh\Api')
+                ->setArgument(0, $dsn['user'])
+                ->setArgument(1, $dsn['pass'])
+                ->setArgument(2, $dsn['host'])
+                ->setArgument(3, $dsn['queries']['consumer_key']);
+            $container->setDefinition('Ovh\Api', $ovh);
+
+            $ovhSender = new Definition();
+            $ovhSender
+                ->setClass(OvhShortMessageSender::class)
+                ->setArgument(0, new Reference('Ovh\Api'))
+                ->setArgument(1, $dsn['queries']['service_name'])
+                ->setArgument(2, $dsn['queries']['sender'])
+                ->setArgument(3, new Reference(LoggerInterface::class))
+                ->setArgument(4, new Reference(PhoneNumberUtil::class));
+            $container->setDefinition(OvhShortMessageSender::class, $ovhSender);
+
+            $defaultTransporter = new Reference(OvhShortMessageSender::class);
+        } else {
+            throw new RuntimeException(sprintf('Cannot find a sender for this dsn: %s', $config['dsn']));
+        }
+
+        $container->getDefinition(ShortMessageTransporter::class)
+            ->setArgument(0, $defaultTransporter);
+    }
+}

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -102,6 +102,14 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
+            ->arrayNode('short_messages')
+            ->canBeEnabled()
+            ->children()
+            ->scalarNode('dsn')->cannotBeEmpty()->defaultValue('null://null')
+            ->info('the dsn for sending short message. Example: ovh://applicationKey:secret@endpoint')
+            ->end()
+            ->end()
+            ->end() // end for 'short_messages'
             ->arrayNode('acl')
             ->addDefaultsIfNotSet()
             ->children()