3.0.0

EventListener/FilePersister.php

@@ -2,8 +2,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\EventListener;
 
-use Akeneo\Component\FileStorage\Model\FileInfoInterface;
-use Kiboko\Bundle\EnrichBundle\Entity\Translatable;
+use Akeneo\Tool\Component\FileStorage\Model\FileInfoInterface;
 use Kiboko\Bundle\EnrichBundle\Model\PicturedInterface;
 use Kiboko\Bundle\EnrichBundle\Model\PicturedTranslationInterface;
 use League\Flysystem\Filesystem;
@@ -22,6 +21,8 @@ public function __construct(Filesystem $filesystem)
 
     /**
      * @param GenericEvent $event
+     *
+     * @throws \League\Flysystem\FileExistsException
      */
     public function onAkeneoStoragePostsave(GenericEvent $event)
     {
@@ -55,6 +56,8 @@ public function onAkeneoStoragePostsave(GenericEvent $event)
     /**
      * @param FileInfoInterface $picture
      * @param UploadedFile $file
+     *
+     * @throws \League\Flysystem\FileExistsException
      */
     private function persistFile(FileInfoInterface $picture, UploadedFile $file)
     {

Form/EventListener/PicturedFormListener.php

@@ -2,28 +2,27 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Form\EventListener;
 
-use Akeneo\Component\FileStorage\Model\FileInfoInterface;
-
+use Akeneo\Tool\Component\FileStorage\Model\FileInfoInterface;
 use Kiboko\Bundle\EnrichBundle\Model\PicturedInterface;
 use Kiboko\Bundle\EnrichBundle\Model\PicturedTranslationInterface;
-use Kiboko\Bundle\EnrichBundle\Utils\FileInfo;
+use Kiboko\Bundle\EnrichBundle\Utils\FileInfoUtils;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class PicturedFormListener implements EventSubscriberInterface
 {
     /**
-     * @var FileInfo
+     * @var FileInfoUtils
      */
     private $utils;
 
     /**
      * FormListener constructor.
      *
-     * @param FileInfo $utils
+     * @param FileInfoUtils $utils
      */
-    public function __construct(FileInfo $utils)
+    public function __construct(FileInfoUtils $utils)
     {
         $this->utils = $utils;
     }
@@ -34,7 +33,7 @@ public function __construct(FileInfo $utils)
     public static function getSubscribedEvents()
     {
         return [
-            FormEvents::POST_SUBMIT => 'postSubmit'
+            FormEvents::POST_SUBMIT => 'postSubmit',
         ];
     }
 

Form/Subscriber/TranslatableFieldSubscriber.php

@@ -2,11 +2,10 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Form\Subscriber;
 
-use Akeneo\Component\Localization\Factory\TranslationFactory;
+use Akeneo\Platform\Bundle\UIBundle\Exception\MissingOptionException;
+use Akeneo\Tool\Component\Localization\Factory\TranslationFactory;
+use Akeneo\UserManagement\Bundle\Context\UserContext;
 use Doctrine\Common\Inflector\Inflector;
-use Pim\Bundle\CatalogBundle\Helper\LocaleHelper;
-use Pim\Bundle\EnrichBundle\Exception\MissingOptionException;
-use Pim\Bundle\UserBundle\Context\UserContext;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
@@ -37,11 +36,6 @@ class TranslatableFieldSubscriber implements EventSubscriberInterface
      */
     protected $options;
 
-    /**
-     * @var LocaleHelper
-     */
-    protected $localeHelper;
-
     /**
      * @var UserContext
      */
@@ -51,22 +45,21 @@ class TranslatableFieldSubscriber implements EventSubscriberInterface
      * Constructor
      *
      * @param FormFactoryInterface $formFactory
-     * @param ValidatorInterface   $validator
-     * @param UserContext          $userContext
-     * @param LocaleHelper         $localeHelper
-     * @param array                $options
+     * @param ValidatorInterface $validator
+     * @param UserContext $userContext
+     * @param array $options
+     *
+     * @throws MissingOptionException
      */
     public function __construct(
         FormFactoryInterface $formFactory,
         ValidatorInterface $validator,
         UserContext $userContext,
-        LocaleHelper $localeHelper,
         array $options
     ) {
         $this->formFactory = $formFactory;
         $this->validator = $validator;
         $this->userContext = $userContext;
-        $this->localeHelper = $localeHelper;
         $this->options = $options;
 
         $this->translationFactory = new TranslationFactory(
@@ -93,6 +86,8 @@ public static function getSubscribedEvents()
      * Build the custom form based on the provided locales
      *
      * @param FormEvent $event
+     *
+     * @throws MissingOptionException
      */
     public function preSetData(FormEvent $event)
     {
@@ -139,7 +134,7 @@ public function preSetData(FormEvent $event)
                     $this->getOption('widget'),
                     $accessor->getValue($binded, sprintf('[translation].%s', $this->getOption('field'))),
                     [
-                        'label'           => $this->localeHelper->getLocaleLabel($binded['locale']),
+                        'label'           => $this->getLocaleLabel($binded['locale']),
                         'required'        => in_array($binded['locale'], $this->getOption('required_locale')),
                         'mapped'          => false,
                         'auto_initialize' => false
@@ -153,6 +148,8 @@ public function preSetData(FormEvent $event)
      * On submit event (validation)
      *
      * @param FormEvent $event
+     *
+     * @throws MissingOptionException
      */
     public function submit(FormEvent $event)
     {
@@ -190,6 +187,8 @@ public function submit(FormEvent $event)
      * On post submit event (after validation)
      *
      * @param FormEvent $event
+     *
+     * @throws MissingOptionException
      */
     public function postSubmit(FormEvent $event)
     {
@@ -218,6 +217,7 @@ public function postSubmit(FormEvent $event)
      * @param array $data
      *
      * @return mixed string
+     * @throws MissingOptionException
      */
     protected function bindTranslations($data)
     {
@@ -249,6 +249,7 @@ protected function bindTranslations($data)
      * Helper method to generate field names in format : '<locale>' => '<field>|<locale>'
      *
      * @return string[]
+     * @throws MissingOptionException
      */
     protected function getFieldNames()
     {
@@ -281,4 +282,19 @@ protected function getOption($name)
 
         return $this->options[$name];
     }
+
+    /**
+     * Returns the label of a locale in the specified language
+     *
+     * @param string $code        the code of the locale to translate
+     * @param string $translateIn the locale in which the label should be translated (if null, user locale will be used)
+     *
+     * @return string
+     */
+    private function getLocaleLabel($code, $translateIn = null)
+    {
+        $translateIn = $translateIn ?: $this->userContext->getCurrentLocaleCode();
+
+        return \Locale::getDisplayName($code, $translateIn);
+    }
 }

Form/Type/MediaType.php

@@ -2,7 +2,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Form\Type;
 
-use Akeneo\Bundle\FileStorageBundle\Form\Type\FileInfoType;
+use Akeneo\Tool\Bundle\FileStorageBundle\Form\Type\FileInfoType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class MediaType extends FileInfoType

Form/Type/TranslatableType.php

@@ -3,8 +3,7 @@
 namespace Kiboko\Bundle\EnrichBundle\Form\Type;
 
 use Kiboko\Bundle\EnrichBundle\Form\Subscriber\TranslatableFieldSubscriber;
-use Pim\Bundle\CatalogBundle\Helper\LocaleHelper;
-use Pim\Bundle\UserBundle\Context\UserContext;
+use Akeneo\UserManagement\Bundle\Context\UserContext;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Exception\InvalidConfigurationException;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -23,25 +22,19 @@ class TranslatableType extends AbstractType
      */
     protected $userContext;
 
-    /**
-     * @var LocaleHelper
-     */
-    protected $localeHelper;
-
     /**
      * @param ValidatorInterface $validator
-     * @param UserContext        $userContext
-     * @param LocaleHelper       $localeHelper
+     * @param UserContext $userContext
      */
-    public function __construct(ValidatorInterface $validator, UserContext $userContext, LocaleHelper $localeHelper)
+    public function __construct(ValidatorInterface $validator, UserContext $userContext)
     {
         $this->validator = $validator;
         $this->userContext = $userContext;
-        $this->localeHelper = $localeHelper;
     }
 
     /**
      * {@inheritdoc}
+     * @throws \Akeneo\Platform\Bundle\UIBundle\Exception\MissingOptionException
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -66,7 +59,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->getFormFactory(),
             $this->validator,
             $this->userContext,
-            $this->localeHelper,
             $options
         );
         $builder->addEventSubscriber($subscriber);
@@ -95,7 +87,7 @@ public function configureOptions(OptionsResolver $resolver)
                 'locales'           => $this->userContext->getUserLocaleCodes(),
                 'user_locale'       => $this->userContext->getUiLocale(),
                 'required_locale'   => [],
-                'widget'            => 'text'
+                'widget'            => 'text',
             ]
         );
     }

Model/CustomEntityTrait.php

@@ -39,7 +39,7 @@ public function getUpdated(): ?\DateTimeInterface
     /**
      * @param \DateTimeInterface $created
      *
-     * @return AbstractCustomEntity
+     * @return CustomEntityTrait
      */
     public function setCreated(\DateTimeInterface $created)
     {
@@ -51,7 +51,7 @@ public function setCreated(\DateTimeInterface $created)
     /**
      * @param \DateTimeInterface $updated
      *
-     * @return AbstractCustomEntity
+     * @return CustomEntityTrait
      */
     public function setUpdated(\DateTimeInterface $updated)
     {

Model/DescribedInterface.php

@@ -2,7 +2,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\Localization\Model\TranslatableInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslatableInterface;
 use Doctrine\Common\Collections\Collection;
 
 interface DescribedInterface extends TranslatableInterface

Model/DescribedTrait.php

@@ -2,7 +2,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\Localization\Model\TranslationInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslationInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 

Model/DescribedTranslationInterface.php

@@ -2,7 +2,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\Localization\Model\TranslationInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslationInterface;
 
 interface DescribedTranslationInterface extends TranslationInterface
 {

Model/LabeledInterface.php

@@ -8,7 +8,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\Localization\Model\TranslatableInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslatableInterface;
 use Doctrine\Common\Collections\Collection;
 
 interface LabeledInterface extends TranslatableInterface

Model/LabeledTrait.php

@@ -2,7 +2,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\Localization\Model\TranslationInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslationInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 

Model/LabeledTranslationInterface.php

@@ -2,8 +2,12 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\Localization\Model\TranslationInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslationInterface;
 
+/**
+ * Interface LabeledTranslationInterface
+ * @package Kiboko\Bundle\EnrichBundle\Model
+ */
 interface LabeledTranslationInterface extends TranslationInterface
 {
     /**

Model/PicturedInterface.php

@@ -2,8 +2,8 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\FileStorage\Model\FileInfoInterface;
-use Akeneo\Component\Localization\Model\TranslatableInterface;
+use Akeneo\Tool\Component\FileStorage\Model\FileInfoInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslatableInterface;
 use Doctrine\Common\Collections\Collection;
 
 interface PicturedInterface extends TranslatableInterface

Model/PicturedTrait.php

@@ -2,8 +2,8 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\FileStorage\Model\FileInfoInterface;
-use Akeneo\Component\Localization\Model\TranslationInterface;
+use Akeneo\Tool\Component\FileStorage\Model\FileInfoInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslationInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 

Model/PicturedTranslationInterface.php

@@ -2,9 +2,13 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\FileStorage\Model\FileInfoInterface;
-use Akeneo\Component\Localization\Model\TranslationInterface;
+use Akeneo\Tool\Component\FileStorage\Model\FileInfoInterface;
+use Akeneo\Tool\Component\Localization\Model\TranslationInterface;
 
+/**
+ * Interface PicturedTranslationInterface
+ * @package Kiboko\Bundle\EnrichBundle\Model
+ */
 interface PicturedTranslationInterface extends TranslationInterface
 {
     /**

Model/PicturedTranslationTrait.php

@@ -2,7 +2,7 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Akeneo\Component\FileStorage\Model\FileInfoInterface;
+use Akeneo\Tool\Component\FileStorage\Model\FileInfoInterface;
 
 trait PicturedTranslationTrait
 {

Model/ReferenceDataTrait.php

@@ -2,7 +2,6 @@
 
 namespace Kiboko\Bundle\EnrichBundle\Model;
 
-use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyAccess\PropertyAccessorBuilder;
 
 trait ReferenceDataTrait