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

src/Bundle/ChillMainBundle/Form/LocationFormType.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\LocationType as EntityLocationType;
+use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickAddressType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -46,8 +47,8 @@ final class LocationFormType extends AbstractType
                 },
             ])
             ->add('name', TextType::class)
-            ->add('phonenumber1', TextType::class, ['required' => false])
-            ->add('phonenumber2', TextType::class, ['required' => false])
+            ->add('phonenumber1', ChillPhoneNumberType::class, ['required' => false])
+            ->add('phonenumber2', ChillPhoneNumberType::class, ['required' => false])
             ->add('email', TextType::class, ['required' => false])
             ->add('address', PickAddressType::class, [
                 'required' => false,

src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php

@@ -0,0 +1,61 @@
+<?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);
+
+namespace Chill\MainBundle\Form\Type;
+
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberUtil;
+use Misd\PhoneNumberBundle\Form\Type\PhoneNumberType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use function array_key_exists;
+
+class ChillPhoneNumberType extends AbstractType
+{
+    private string $defaultCarrierCode;
+
+    private PhoneNumberUtil $phoneNumberUtil;
+
+    public function __construct(ParameterBagInterface $parameterBag)
+    {
+        $this->defaultCarrierCode = $parameterBag->get('chill_main')['phone_helper']['default_carrier_code'];
+        $this->phoneNumberUtil = PhoneNumberUtil::getInstance();
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('default_region', $this->defaultCarrierCode)
+            ->setDefault('format', PhoneNumberFormat::NATIONAL)
+            ->setDefault('type', \libphonenumber\PhoneNumberType::FIXED_LINE_OR_MOBILE)
+            ->setNormalizer('attr', function (Options $options, $value) {
+                if (array_key_exists('placeholder', $value)) {
+                    return $value;
+                }
+
+                $examplePhoneNumber = $this->phoneNumberUtil->getExampleNumberForType($this->defaultCarrierCode, $options['type']);
+
+                return array_merge(
+                    $value,
+                    [
+                        'placeholder' => PhoneNumberUtil::getInstance()->format($examplePhoneNumber, $options['format']),
+                    ]
+                );
+            });
+    }
+
+    public function getParent()
+    {
+        return PhoneNumberType::class;
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php

@@ -38,7 +38,7 @@ class ObjectToIdTransformer implements DataTransformerInterface
      */
     public function reverseTransform($id)
     {
-        if (!$id) {
+        if (null === $id) {
             return null;
         }
 
@@ -46,7 +46,7 @@ class ObjectToIdTransformer implements DataTransformerInterface
             ->getRepository($this->class)
             ->find($id);
 
-        if (!$object) {
+        if (null === $object) {
             throw new TransformationFailedException();
         }
 
@@ -62,7 +62,7 @@ class ObjectToIdTransformer implements DataTransformerInterface
      */
     public function transform($object)
     {
-        if (!$object) {
+        if (null === $object) {
             return '';
         }
 

src/Bundle/ChillMainBundle/Form/WorkflowStepType.php

@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
+use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -21,8 +22,14 @@ use LogicException;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Constraints\Email;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
 use function array_key_exists;
@@ -146,6 +153,22 @@ class WorkflowStepType extends AbstractType
                     'label' => 'workflow.dest for next steps',
                     'multiple' => true,
                     'mapped' => false,
+                ])
+                ->add('future_dest_emails', ChillCollectionType::class, [
+                    'label' => 'workflow.dest by email',
+                    'help' => 'workflow.dest by email help',
+                    'mapped' => false,
+                    'allow_add' => true,
+                    'entry_type' => EmailType::class,
+                    'button_add_label' => 'workflow.Add an email',
+                    'button_remove_label' => 'workflow.Remove an email',
+                    'empty_collection_explain' => 'workflow.Any email',
+                    'entry_options' => [
+                        'constraints' => [
+                            new NotNull(), new NotBlank(), new Email(['checkMX' => true]),
+                        ],
+                        'label' => 'Email',
+                    ],
                 ]);
         }
 
@@ -175,6 +198,37 @@ class WorkflowStepType extends AbstractType
             ->setRequired('transition')
             ->setAllowedTypes('transition', 'bool')
             ->setRequired('entity_workflow')
-            ->setAllowedTypes('entity_workflow', EntityWorkflow::class);
+            ->setAllowedTypes('entity_workflow', EntityWorkflow::class)
+            ->setDefault('constraints', [
+                new Callback(
+                    function ($step, ExecutionContextInterface $context, $payload) {
+                        /** @var EntityWorkflowStep $step */
+                        $form = $context->getObject();
+                        $workflow = $this->registry->get($step->getEntityWorkflow(), $step->getEntityWorkflow()->getWorkflowName());
+                        $transition = $form['transition']->getData();
+                        $toFinal = true;
+
+                        foreach ($transition->getTos() as $to) {
+                            $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
+
+                            if (
+                                !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                            ) {
+                                $toFinal = false;
+                            }
+                        }
+
+                        $destUsers = $form['future_dest_users']->getData();
+                        $destEmails = $form['future_dest_emails']->getData();
+
+                        if (!$toFinal && [] === $destUsers && [] === $destEmails) {
+                            $context
+                                ->buildViolation('workflow.You must add at least one dest user or email')
+                                ->atPath('future_dest_users')
+                                ->addViolation();
+                        }
+                    }
+                ),
+            ]);
     }
 }