Remove templating.yaml, add interfaces.

src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php

@@ -29,7 +29,7 @@ use Symfony\Component\Translation\Translator;
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  *
  */
-class TranslatableStringHelper
+class TranslatableStringHelper implements TranslatableStringHelperInterface
 {
     /**
      *

src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Chill\MainBundle\Templating;
+
+interface TranslatableStringHelperInterface
+{
+    /**
+     * return the string in current locale if it exists.
+     *
+     * If it does not exists; return the name in the first language available.
+     *
+     * Return a blank string if any strings are available.
+     * Return NULL if $translatableString is NULL
+     *
+     * @param array $translatableStrings
+     * @return string
+     */
+    public function localize(array $translatableStrings);
+}

src/Bundle/ChillMainBundle/config/services.yaml

@@ -10,6 +10,7 @@ services:
             - "@translator.default"
 
     Chill\MainBundle\Templating\TranslatableStringHelper: '@chill.main.helper.translatable_string'
+    Chill\MainBundle\Templating\TranslatableStringHelperInterface: Chill\MainBundle\Templating\TranslatableStringHelper
 
     chill.main.twig.translatable_string:
         class: Chill\MainBundle\Templating\TranslatableStringTwig

src/Bundle/ChillPersonBundle/config/services.yaml

@@ -46,6 +46,11 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
+    Chill\PersonBundle\Templating\Entity\:
+        resource: '../src/Templating/Entity/'
+        tags:
+            - { name: chill.render_entity }
+
     chill.person.security.authorization.person:
         class: Chill\PersonBundle\Security\Authorization\PersonVoter
         arguments:

src/Bundle/ChillPersonBundle/config/services/templating.yaml

@@ -1,12 +0,0 @@
-services:
-    Chill\PersonBundle\Templating\Entity\PersonRender:
-        arguments:
-            $configAltNamesHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
-        tags:
-            - 'chill.render_entity'
-            
-    Chill\PersonBundle\Templating\Entity\ClosingMotiveRender:
-        arguments:
-            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-        tags:
-            - 'chill.render_entity'

src/Bundle/ChillPersonBundle/src/Config/ConfigPersonAltNamesHelper.php

@@ -8,7 +8,7 @@ namespace Chill\PersonBundle\Config;
  *
  *
  */
-class ConfigPersonAltNamesHelper
+class ConfigPersonAltNamesHelper implements ConfigPersonAltNamesHelperInterface
 {
     /**
      * the raw config, directly from the container parameter

src/Bundle/ChillPersonBundle/src/Config/ConfigPersonAltNamesHelperInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Chill\PersonBundle\Config;
+
+interface ConfigPersonAltNamesHelperInterface
+{
+    /**
+     * Return true if at least one alt name is configured
+     *
+     * @return bool
+     */
+    public function hasAltNames(): bool;
+
+    /**
+     * get the choices as key => values
+     *
+     * @return array
+     */
+    public function getChoices(): array;
+}

src/Bundle/ChillPersonBundle/src/DependencyInjection/ChillPersonExtension.php

@@ -68,7 +68,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $loader->load('services/search.yaml');
         $loader->load('services/command.yaml');
         $loader->load('services/form.yaml');
-        $loader->load('services/templating.yaml');
         $loader->load('services/alt_names.yaml');
         $loader->load('services/serializer.yaml');
 

src/Bundle/ChillPersonBundle/src/Templating/Entity/ClosingMotiveRender.php

@@ -4,7 +4,7 @@ namespace Chill\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 
 /**
  * Render closing motive
@@ -15,12 +15,11 @@ class ClosingMotiveRender extends AbstractChillEntityRender
     private CONST SEPARATOR = ' > ';
 
     /**
-     *
-     * @var TranslatableStringHelper
+     * @var TranslatableStringHelperInterface
      */
     private $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
     {
         $this->translatableStringHelper = $translatableStringHelper;
     }

src/Bundle/ChillPersonBundle/src/Templating/Entity/PersonRender.php

@@ -22,7 +22,7 @@ namespace Chill\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelperInterface;
 
 /**
  * Render a Person
@@ -32,11 +32,11 @@ class PersonRender extends AbstractChillEntityRender
 {
     /**
      *
-     * @var ConfigPersonAltNamesHelper
+     * @var ConfigPersonAltNamesHelperInterface
      */
     protected $configAltNamesHelper;
 
-    public function __construct(ConfigPersonAltNamesHelper $configAltNamesHelper)
+    public function __construct(ConfigPersonAltNamesHelperInterface $configAltNamesHelper)
     {
         $this->configAltNamesHelper = $configAltNamesHelper;
     }