Merge pull request #422 from StefanvdBroek/columnblock-fix

Made span collection type compatible for symfony 3

Author: StefanvdBroek

src/ContentBundle/Form/Type/SpanCollectionType.php

@@ -42,10 +42,10 @@ public function configureOptions(OptionsResolver $resolver)
         parent::configureOptions($resolver);
 
         $resolver->setDefaults(array(
-            'type' => new ColumnEnumType(),
+            'entry_type' => ColumnEnumType::class,
+            'entry_options' => ['label' => false],
             'column_count' => 1,
             'choices' => [0, 1, 2, 3, 4, 5],
-            'options' => ['label' => false],
         ));
     }