Additional 3.0 adjustments.

Clastic · Dec 13, 2015 · 8ac9b3d · 8ac9b3d
1 parent 80cb161
commit 8ac9b3d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 36 deletions.
diff --git a/src/Clastic/AliasBundle/Resources/views/Form/fields.html.twig b/src/Clastic/AliasBundle/Resources/views/Form/fields.html.twig
@@ -7,7 +7,7 @@
         {%- set attr = attr|merge({'data-alias-pattern': alias_pattern|default('{title}') }) -%}
     {% endif %}
     <div class="input-group">
-        <span class="input-group-addon" id="basic-addon1">{{ prefix_text }}</span>
+        <span class="input-group-addon">{{ prefix_text }}</span>
         {{ block('form_widget_simple') }}
     </div>
 {%- endblock alias_widget %}
diff --git a/src/Clastic/BackofficeBundle/Form/Type/TreeType.php b/src/Clastic/BackofficeBundle/Form/Type/TreeType.php
@@ -22,19 +22,6 @@
  */
 class TreeType extends AbstractType
 {
-    /**
-     * @var string
-     */
-    private $source;
-
-    /**
-     * @param string $source Path to the data source.
-     */
-    public function __construct($source)
-    {
-        $this->source = $source;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -43,7 +30,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         parent::finishView($view, $form, $options);
 
         $view->vars['tree_current'] = $form->getParent()->getData()->getId();
-        $view->vars['tree_source'] = $this->source;
+        $view->vars['tree_source'] = $options['source'];
     }
 
     /**
@@ -59,7 +46,10 @@ public function configureOptions(OptionsResolver $resolver)
             ],
             'mapped' => false,
             'required' => false,
+            'source' => null,
         ]);
+
+        $resolver->setRequired('source');
     }
 
     /**

diff --git a/src/Clastic/GeneratorBundle/composer.json b/src/Clastic/GeneratorBundle/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": ">=5.6",
-        "sensio/generator-bundle": "~2.3"
+        "sensio/generator-bundle": "^3.0"
     },
     "autoload": {
         "psr-4": { "Clastic\\GeneratorBundle\\": "" }

diff --git a/src/Clastic/MenuBundle/Controller/MenuItemController.php b/src/Clastic/MenuBundle/Controller/MenuItemController.php
@@ -55,7 +55,9 @@ protected function getListTemplate()
      */
     protected function buildForm($data)
     {
-        return $this->createForm(new MenuItemFormType($this->get('router')), $data);
+        return $this->createForm(MenuItemFormType::class, $data, [
+            'router' => $this->get('router'),
+        ]);
     }
 
     /**

diff --git a/src/Clastic/MenuBundle/Form/Type/MenuItemFormType.php b/src/Clastic/MenuBundle/Form/Type/MenuItemFormType.php
@@ -19,23 +19,18 @@
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Dries De Peuter <dries@nousefreak.be>
  */
 class MenuItemFormType extends AbstractType
 {
-    /**
-     * @var Router
-     */
-    private $router;
-
-    /**
-     * @param Router $router
-     */
-    public function __construct(Router $router)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        $this->router = $router;
+        parent::configureOptions($resolver);
+        $resolver->setDefault('router', null);
+        $resolver->isRequired('router');
     }
 
     /**
@@ -115,16 +110,16 @@ private function createActionTab(FormBuilderInterface $builder)
      */
     private function createPositionTab(FormBuilderInterface $builder)
     {
-        $treeType = new TreeType(
-            $this->router->generate(
-                'clastic_backoffice_menu_item_tree',
-                array('menuId' => $builder->getData()->getMenu()->getId()))
+        $source = $builder->getOption('router')->generate(
+            'clastic_backoffice_menu_item_tree',
+            ['menuId' => $builder->getData()->getMenu()->getId()]
         );
 
-        return $this->createTab($builder, 'position_tab', array(
-            'label' => 'Position',
-            ))
-            ->add('position', $treeType);
+        return $this->createTab(
+            $builder,
+            'position_tab',
+            ['label' => 'Position',]
+        )->add('position', TreeType::class, ['source' => $source]);
     }
 
     /**

diff --git a/src/Clastic/UserBundle/Resources/config/doctrine/User.orm.xml b/src/Clastic/UserBundle/Resources/config/doctrine/User.orm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity repository-class="Clastic\UserBundle\Entity\UserRepository" name="Clastic\UserBundle\Entity\User">
+  <entity repository-class="Clastic\UserBundle\Entity\UserRepository" name="Clastic\UserBundle\Entity\User" table="users">
     <id name="id" type="integer" column="id">
       <generator strategy="AUTO"/>
     </id>