Merge pull request #16 from webburza/fix/compatibility

Fix/compatibility
webburza · Jun 23, 2016 · f11ade9 · f11ade9
2 parents b3c6bfc + c4bde9e
commit f11ade9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 27 deletions.
diff --git a/EventListener/FrontendMenuBuilderListener.php b/EventListener/FrontendMenuBuilderListener.php
@@ -2,8 +2,8 @@
 namespace Webburza\Sylius\ArticleBundle\EventListener;
 
 use Sylius\Bundle\WebBundle\Event\MenuBuilderEvent;
-use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\Translator;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class FrontendMenuBuilderListener
 {
@@ -12,7 +12,7 @@ class FrontendMenuBuilderListener
      */
     protected $translator;
 
-    public function __construct(DataCollectorTranslator $translator)
+    public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }

diff --git a/EventListener/MenuBuilderListener.php b/EventListener/MenuBuilderListener.php
@@ -2,8 +2,8 @@
 namespace Webburza\Sylius\ArticleBundle\EventListener;
 
 use Sylius\Bundle\WebBundle\Event\MenuBuilderEvent;
-use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\Translator;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class MenuBuilderListener
 {
@@ -12,7 +12,7 @@ class MenuBuilderListener
      */
     protected $translator;
 
-    public function __construct(DataCollectorTranslator $translator)
+    public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
@@ -21,18 +21,20 @@ public function addBackendMenuItems(MenuBuilderEvent $event)
     {
         $menu = $event->getMenu();
 
-        $menu['content']
-            ->addChild('webburza_sylius_articles', array(
-                'route'           => 'webburza_article_index',
-                'labelAttributes' => array('icon' => 'glyphicon glyphicon-file'),
-            ))
-            ->setLabel($this->translator->trans('webburza.sylius.article.backend.articles'));
+        if (isset($menu['content'])) {
+            $menu['content']
+                ->addChild('webburza_sylius_articles', array(
+                    'route'           => 'webburza_article_index',
+                    'labelAttributes' => array('icon' => 'glyphicon glyphicon-file'),
+                ))
+                ->setLabel($this->translator->trans('webburza.sylius.article.backend.articles'));
 
-        $menu['content']
-            ->addChild('webburza_sylius_article_categories', array(
-                'route'           => 'webburza_article_category_index',
-                'labelAttributes' => array('icon' => 'glyphicon glyphicon-tags'),
-            ))
-            ->setLabel($this->translator->trans('webburza.sylius.article_category.backend.article_categories'));
+            $menu['content']
+                ->addChild('webburza_sylius_article_categories', array(
+                    'route'           => 'webburza_article_category_index',
+                    'labelAttributes' => array('icon' => 'glyphicon glyphicon-tags'),
+                ))
+                ->setLabel($this->translator->trans('webburza.sylius.article_category.backend.article_categories'));
+        }
     }
 }
diff --git a/Form/Type/ArticleCategoryTranslationType.php b/Form/Type/ArticleCategoryTranslationType.php
@@ -16,7 +16,7 @@ class ArticleCategoryTranslationType extends AbstractResourceType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('title', Type\TextType::class, [
+        $builder->add('title', 'text', [
             'label' => 'webburza.sylius.article_category.label.title'
         ]);
     }

diff --git a/Form/Type/ArticleCategoryType.php b/Form/Type/ArticleCategoryType.php
@@ -21,7 +21,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'label'    => 'webburza.sylius.article_category.translations'
         ]);
 
-        $builder->add('published', Type\CheckboxType::class, [
+        $builder->add('published', 'checkbox', [
             'label' => 'webburza.sylius.article_category.label.published'
         ]);
     }

diff --git a/Form/Type/ArticleTranslationType.php b/Form/Type/ArticleTranslationType.php
@@ -16,30 +16,30 @@ class ArticleTranslationType extends AbstractResourceType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('title', Type\TextType::class, [
+        $builder->add('title', 'text', [
             'label' => 'webburza.sylius.article.label.title'
         ]);
 
-        $builder->add('lead', Type\TextareaType::class, [
+        $builder->add('lead', 'textarea', [
             'label' => 'webburza.sylius.article.label.lead',
             'attr' => ['rows' => 4]
         ]);
 
-        $builder->add('content', Type\TextareaType::class, [
+        $builder->add('content', 'textarea', [
             'label' => 'webburza.sylius.article.label.content',
             'attr' => ['class' => 'ckeditor']
         ]);
 
-        $builder->add('active', Type\CheckboxType::class, [
+        $builder->add('active', 'checkbox', [
             'label' => 'webburza.sylius.article.label.active'
         ]);
 
-        $builder->add('metaKeywords', Type\TextareaType::class, [
+        $builder->add('metaKeywords', 'textarea', [
             'label' => 'webburza.sylius.article.label.meta_keywords',
             'attr' => ['rows' => 2]
         ]);
 
-        $builder->add('metaDescription', Type\TextareaType::class, [
+        $builder->add('metaDescription', 'textarea', [
             'label' => 'webburza.sylius.article.label.meta_description',
             'attr' => ['rows' => 2]
         ]);

diff --git a/Form/Type/ArticleType.php b/Form/Type/ArticleType.php
@@ -41,19 +41,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'multiple' => true
         ]);
 
-        $builder->add('publishedAt', Type\DateTimeType::class, [
+        $builder->add('publishedAt', 'datetime', [
             'label' => 'webburza.sylius.article.label.published_at',
             'required' => false,
             'date_format' => 'y-M-d',
             'date_widget' => 'choice',
             'time_widget' => 'text'
         ]);
 
-        $builder->add('published', Type\CheckboxType::class, [
+        $builder->add('published', 'checkbox', [
             'label' => 'webburza.sylius.article.label.published'
         ]);
 
-        $builder->add('featured', Type\CheckboxType::class, [
+        $builder->add('featured', 'checkbox', [
             'label' => 'webburza.sylius.article.label.featured'
         ]);
     }