Victoire · lenybernard · Feb 25, 2016 · Feb 24, 2016 · Feb 24, 2016 · Feb 24, 2016
diff --git a/Bundle/BlogBundle/Entity/Article.php b/Bundle/BlogBundle/Entity/Article.php
@@ -10,6 +10,7 @@
 use Victoire\Bundle\BusinessPageBundle\Entity\BusinessTemplate;
 use Victoire\Bundle\CoreBundle\Annotations as VIC;
 use Victoire\Bundle\MediaBundle\Entity\Media;
+use Victoire\Bundle\PageBundle\Entity\PageStatus;
 
 /**
  * @ORM\Entity(repositoryClass="Victoire\Bundle\BlogBundle\Repository\ArticleRepository"))
@@ -22,11 +23,6 @@ class Article
     use BusinessEntityTrait;
     use TimestampableEntity;
 
-    const DRAFT = 'draft';
-    const PUBLISHED = 'published';
-    const UNPUBLISHED = 'unpublished';
-    const SCHEDULED = 'scheduled';
-
     /**
      * @VIC\BusinessProperty("businessParameter")
      * @ORM\Column(name="id", type="integer")
@@ -161,7 +157,7 @@ public function __toString()
      */
     public function __construct()
     {
-        $this->status = self::DRAFT;
+        $this->status = PageStatus::DRAFT;
     }
 
     /**
@@ -263,7 +259,7 @@ public function getCategory()
      */
     public function getPublishedAt()
     {
-        if ($this->status == self::PUBLISHED && $this->publishedAt === null) {
+        if ($this->status == PageStatus::PUBLISHED && $this->publishedAt === null) {
             $this->setPublishedAt($this->getCreatedAt());
         }
 
@@ -445,7 +441,7 @@ public function getTemplate()
      */
     public function setStatus($status)
     {
-        if ($status == self::PUBLISHED && $this->publishedAt === null) {
+        if ($status == PageStatus::PUBLISHED && $this->publishedAt === null) {
             $this->setPublishedAt(new \DateTime());
         }
         $this->status = $status;

diff --git a/Bundle/BlogBundle/Filter/TagFilter.php b/Bundle/BlogBundle/Filter/TagFilter.php
@@ -89,7 +89,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $tagsChoices = [];
 
         foreach ($tags as $tag) {
-            $tagsChoices[$tag->getId()] = $tag->getTitle();
+            $tagsChoices[$tag->getTitle()] = $tag->getId();
         }
 
         $data = null;
@@ -105,17 +105,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder
-            ->add(
-                'tags', ChoiceType::class, [
-                    'label'       => false,
-                    'choices'     => $tagsChoices,
-                    'empty_value' => 'blog.tag_filter.empty_value',
-                    'required'    => false,
-                    'expanded'    => true,
-                    'multiple'    => $options['multiple'],
-                    'data'        => $data,
-                ]
-            );
+            ->add('tags', ChoiceType::class, [
+                'choices_as_values' => true,
+                'label'             => false,
+                'choices'           => $tagsChoices,
+                'empty_value'       => 'blog.tag_filter.empty_value',
+                'required'          => false,
+                'expanded'          => true,
+                'multiple'          => $options['multiple'],
+                'data'              => $data,
+            ]);
     }
 
     /**

diff --git a/Bundle/BlogBundle/Form/ArticleSettingsType.php b/Bundle/BlogBundle/Form/ArticleSettingsType.php
@@ -6,13 +6,10 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Victoire\Bundle\BlogBundle\Entity\Article;
 use Victoire\Bundle\FormBundle\Form\Type\SlugType;
 use Victoire\Bundle\MediaBundle\Form\Type\MediaType;
+use Victoire\Bundle\PageBundle\Entity\PageStatus;
 
-/**
- * Edit Article Type.
- */
 class ArticleSettingsType extends ArticleType
 {
     /**
@@ -31,12 +28,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('status', ChoiceType::class, [
                 'label'   => 'form.page.type.status.label',
                 'choices' => [
-                    Article::DRAFT       => 'form.page.type.status.choice.label.draft',
-                    Article::PUBLISHED   => 'form.page.type.status.choice.label.published',
-                    Article::UNPUBLISHED => 'form.page.type.status.choice.label.unpublished',
-                    Article::SCHEDULED   => 'form.page.type.status.choice.label.scheduled',
+                    'form.page.type.status.choice.label.draft'       => PageStatus::DRAFT,
+                    'form.page.type.status.choice.label.published'   => PageStatus::PUBLISHED,
+                    'form.page.type.status.choice.label.unpublished' => PageStatus::UNPUBLISHED,
+                    'form.page.type.status.choice.label.scheduled'   => PageStatus::SCHEDULED,
                 ],
-                'attr' => [
+                'choices_as_values' => true,
+                'attr'              => [
                     'data-refreshOnChange' => 'true',
                 ],
             ])
@@ -63,18 +61,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public static function manageRelatedStatus($status, $form)
     {
         switch ($status) {
-            case Article::SCHEDULED:
-                $form
-                    ->add('publishedAt', null, [
+            case PageStatus::SCHEDULED:
+                $form->add('publishedAt', null, [
                         'widget'             => 'single_text',
                         'vic_datetimepicker' => true,
                         'label'              => 'form.article.settings.type.publish.label',
                     ]);
                 break;
             default:
-                $form
-                    ->remove('publishedAt');
-
+                $form->remove('publishedAt');
                 break;
         }
     }

diff --git a/Bundle/BlogBundle/Form/ArticleType.php b/Bundle/BlogBundle/Form/ArticleType.php
@@ -123,8 +123,7 @@ protected function manageCategories($blogId, $form)
             'label'         => 'form.article.category.label',
             'class'         => 'Victoire\\Bundle\\BlogBundle\\Entity\\Category',
             'query_builder' => $queryBuilder,
-            'empty_value'   => 'Pas de catégorie', //@todo translate this #easypick
-            'empty_data'    => null,
+            'placeholder'   => 'form.article.category.placeholder',
         ]);
     }
 

diff --git a/Bundle/BlogBundle/Form/BlogSettingsType.php b/Bundle/BlogBundle/Form/BlogSettingsType.php
@@ -34,11 +34,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('status', ChoiceType::class, [
                 'label'   => 'form.page.type.status.label',
                 'choices' => [
-                    PageStatus::DRAFT       => 'form.page.type.status.choice.label.draft',
-                    PageStatus::PUBLISHED   => 'form.page.type.status.choice.label.published',
-                    PageStatus::UNPUBLISHED => 'form.page.type.status.choice.label.unpublished',
-                    PageStatus::SCHEDULED   => 'form.page.type.status.choice.label.scheduled',
+                    'form.page.type.status.choice.label.draft'       => PageStatus::DRAFT,
+                    'form.page.type.status.choice.label.published'   => PageStatus::PUBLISHED,
+                    'form.page.type.status.choice.label.unpublished' => PageStatus::UNPUBLISHED,
+                    'form.page.type.status.choice.label.scheduled'   => PageStatus::SCHEDULED,
                 ],
+                'choices_as_values' => true,
             ])
             ->add('publishedAt', null, [
                 'widget'             => 'single_text',

diff --git a/Bundle/BlogBundle/Listener/ArticleFilterDefaultValuesListener.php b/Bundle/BlogBundle/Listener/ArticleFilterDefaultValuesListener.php
@@ -36,7 +36,7 @@ public function setDefaultDateValue(WidgetFilterSetDefaultValueEvent $event)
             $options = $form->getConfig()->getOptions()['data'];
             $years = $months = $days = [];
             foreach ($articles as $key => $_article) {
-                $years[$_article->getPublishedAt()->format('Y')] = $_article->getPublishedAt()->format('Y');
+                $years[] = $_article->getPublishedAt()->format('Y');
 
                 if ($options->getFormat() != 'year') {
                     //init $months array
@@ -57,9 +57,8 @@ public function setDefaultDateValue(WidgetFilterSetDefaultValueEvent $event)
             $form->add('defaultValue', ChoiceType::class, [
                 'label'       => 'widget_filter.form.date.default.label',
                 'choices'     => $years,
-                'empty_value' => 'widget_filter.form.date.default.empty_value.label',
-                ]
-            );
+                'placeholder' => 'widget_filter.form.date.default.empty_value.label',
+            ]);
         }
     }
 }
diff --git a/Bundle/BlogBundle/Listener/BlogFilterListener.php b/Bundle/BlogBundle/Listener/BlogFilterListener.php
@@ -48,11 +48,12 @@ public function manageExtraFiltersFields(FormEvent $event)
                 $form->add('format', ChoiceType::class, [
                     'label'   => 'widget_filter.form.date.format.label',
                     'choices' => [
-                        'year'  => 'widget_filter.form.date.format.choices.year.label',
-                        'month' => 'widget_filter.form.date.format.choices.month.label',
-                        'day'   => 'widget_filter.form.date.format.choices.day.label',
+                        'widget_filter.form.date.format.choices.year.label'  => 'year',
+                        'widget_filter.form.date.format.choices.month.label' => 'month',
+                        'widget_filter.form.date.format.choices.day.label'   => 'day',
                     ],
-                    'attr' => [
+                    'choices_as_values' => true,
+                    'attr'              => [
                         'data-refreshOnChange' => 'true',
                     ],
                 ]);

diff --git a/Bundle/BlogBundle/Repository/ArticleRepository.php b/Bundle/BlogBundle/Repository/ArticleRepository.php
@@ -4,9 +4,9 @@
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Victoire\Bundle\BlogBundle\Entity\Article;
 use Victoire\Bundle\BlogBundle\Entity\Blog;
 use Victoire\Bundle\CoreBundle\Repository\StateFullRepositoryTrait;
+use Victoire\Bundle\PageBundle\Entity\PageStatus;
 
 /**
  * The Article repository.
@@ -32,8 +32,8 @@ public function getAll($excludeUnpublished = false)
             $this->qb
                 ->andWhere('article.status = :status')
                 ->orWhere('article.status = :scheduled_status AND article.publishedAt > :publicationDate')
-                ->setParameter('status', Article::PUBLISHED)
-                ->setParameter('scheduled_status', Article::SCHEDULED)
+                ->setParameter('status', PageStatus::PUBLISHED)
+                ->setParameter('scheduled_status', PageStatus::SCHEDULED)
                 ->setParameter('publicationDate', new \DateTime());
         }
 

diff --git a/Bundle/BlogBundle/Resources/translations/victoire.en.xliff b/Bundle/BlogBundle/Resources/translations/victoire.en.xliff
@@ -226,6 +226,10 @@
         <source>form.article.settings.type.article.title</source>
         <target>Article</target>
       </trans-unit>
+      <trans-unit id="50" resname="form.article.category.placeholder">
+        <source>form.article.category.placeholder</source>
+        <target>Choose</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Bundle/BlogBundle/Resources/translations/victoire.es.xliff b/Bundle/BlogBundle/Resources/translations/victoire.es.xliff
@@ -226,9 +226,9 @@
         <source>form.article.settings.type.article.title</source>
         <target>Artículo</target>
       </trans-unit>
-      <trans-unit id="50" resname="menu.blog.translate">
-        <source>menu.blog.translate</source>
-        <target>Traducir</target>
+      <trans-unit id="50" resname="form.article.category.placeholder">
+        <source>form.article.category.placeholder</source>
+        <target>Elegir</target>
       </trans-unit>
     </body>
   </file>

diff --git a/Bundle/BlogBundle/Resources/translations/victoire.fr.xliff b/Bundle/BlogBundle/Resources/translations/victoire.fr.xliff
@@ -226,9 +226,9 @@
         <source>form.article.settings.type.article.title</source>
         <target>Article</target>
       </trans-unit>
-      <trans-unit id="50" resname="menu.blog.translate">
-        <source>menu.blog.translate</source>
-        <target>Traduire</target>
+      <trans-unit id="50" resname="form.article.category.placeholder">
+        <source>form.article.category.placeholder</source>
+        <target>Choisissez</target>
       </trans-unit>
     </body>
   </file>

diff --git a/Bundle/BusinessEntityBundle/Form/Extension/BusinessEntityTypeExtension.php b/Bundle/BusinessEntityBundle/Form/Extension/BusinessEntityTypeExtension.php
@@ -23,14 +23,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             && $this->businessEntityHelper->findByEntityClassname($options['data_class'])) {
             $builder
             ->add('visibleOnFront', ChoiceType::class, [
-                    'choices' => [
-                        1 => 'businessEntity.form.visibleOnFront.yes',
-                        0 => 'businessEntity.form.visibleOnFront.no',
-                    ],
-                    'label'              => 'businessEntity.form.visibleOnFront.label',
-                    'translation_domain' => 'victoire',
-                ]
-            );
+                'choices' => [
+                    'businessEntity.form.visibleOnFront.yes' => 1,
+                    'businessEntity.form.visibleOnFront.no'  => 0,
+                ],
+                'choices_as_values'  => true,
+                'label'              => 'businessEntity.form.visibleOnFront.label',
+                'translation_domain' => 'victoire',
+            ]);
         }
     }
 

diff --git a/Bundle/BusinessPageBundle/Form/BusinessTemplateType.php b/Bundle/BusinessPageBundle/Form/BusinessTemplateType.php
@@ -2,6 +2,7 @@
 
 namespace Victoire\Bundle\BusinessPageBundle\Form;
 
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -57,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'description' => 'victoire.form.business_template.slug.vic_business_property_picker',
                 ],
             ])
-            ->add('businessEntityId', 'hidden');
+            ->add('businessEntityId', HiddenType::class);
     }
 
     /**
@@ -67,10 +68,9 @@ public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
         $resolver->setDefined(['businessProperty']);
-
         $resolver->setDefaults([
-                'data_class'         => 'Victoire\Bundle\BusinessPageBundle\Entity\BusinessTemplate',
-                'translation_domain' => 'victoire',
+            'data_class'         => 'Victoire\Bundle\BusinessPageBundle\Entity\BusinessTemplate',
+            'translation_domain' => 'victoire',
         ]);
     }
 }
diff --git a/Bundle/CoreBundle/Form/EntityProxyFormType.php b/Bundle/CoreBundle/Form/EntityProxyFormType.php
@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add($options['business_entity_id'], EntityType::class, [
                 'label'       => false,
                 'required'    => false,
-                'empty_value' => 'entity_proxy.form.empty_value',
+                'placeholder' => 'entity_proxy.form.empty_value',
                 'class'       => $options['namespace'],
                 'attr'        => [
                     'class' => 'add_'.$options['business_entity_id'].'_link picker_entity_select',

diff --git a/Bundle/CoreBundle/Form/ViewType.php b/Bundle/CoreBundle/Form/ViewType.php
@@ -35,8 +35,6 @@ public function __construct($availableLocales, RequestStack $requestStack)
      *
      * @param FormBuilderInterface $builder
      * @param array                $options
-     *
-     * @return null
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -66,16 +64,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'query_builder' => $getAllTemplateWithoutMe,
                 ]);
             }
-            if (!$form->has('locale') && count($choices = $this->getAvailableLocales($view)) > 1) {
+            if (!$form->has('locale') && count($choices = $this->getAvailableLocales()) > 1) {
                 $data = $view->getLocale() ?: $this->currentLocale;
                 $form->add('locale', ChoiceType::class, [
-                        'expanded' => false,
-                        'multiple' => false,
-                        'choices'  => $choices,
-                        'label'    => 'form.view.type.locale.label',
-                        'data'     => $data,
-                    ]
-                );
+                    'expanded'          => false,
+                    'multiple'          => false,
+                    'choices'           => $choices,
+                    'choices_as_values' => true,
+                    'label'             => 'form.view.type.locale.label',
+                    'data'              => $data,
+                ]);
             }
 
             //If view is an Article BEP, we do not allow to choose parent because it will be set automatically
@@ -109,13 +107,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]);
     }
 
-    protected function getAvailableLocales(View $view)
+    protected function getAvailableLocales()
     {
         $choices = [];
-        $i18n = $view->getI18n();
 
         foreach ($this->availableLocales as $localeVal) {
-            $choices[$localeVal] = 'victoire.i18n.viewType.locale.'.$localeVal;
+            $choices['victoire.i18n.viewType.locale.'.$localeVal] = $localeVal;
         }
 
         return $choices;