Merge branch 'hotfix/v1.0.19'

roadiz · Jan 15, 2019 · fb1191e · fb1191e
2 parents a13082b + d145b83
commit fb1191e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/Roadiz/CMS/Forms/ExplorerProviderItemType.php b/src/Roadiz/CMS/Forms/ExplorerProviderItemType.php
@@ -93,8 +93,10 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('explorerProvider', [ExplorerProviderInterface::class]);
         $resolver->setDefault('max_length', 0);
         $resolver->setDefault('min_length', 0);
+        $resolver->setDefault('multiple', true);
         $resolver->setAllowedTypes('max_length', ['int']);
         $resolver->setAllowedTypes('min_length', ['int']);
+        $resolver->setAllowedTypes('multiple', ['bool']);
     }
 
     /**

diff --git a/src/Roadiz/CMS/Forms/RolesType.php b/src/Roadiz/CMS/Forms/RolesType.php
@@ -51,9 +51,11 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefaults([
             'choices_as_values' => true,
             'roles' => new ArrayCollection(),
+            'multiple' => false,
         ]);
 
         $resolver->setRequired('entityManager');
+        $resolver->setAllowedTypes('multiple', ['bool']);
         $resolver->setAllowedTypes('entityManager', [EntityManager::class]);
         $resolver->setAllowedTypes('roles', [Collection::class]);
 

diff --git a/src/Roadiz/Core/Kernel.php b/src/Roadiz/Core/Kernel.php
@@ -101,7 +101,7 @@ class Kernel implements ServiceProviderInterface, KernelInterface, RebootableInt
     const SECURITY_DOMAIN = 'roadiz_domain';
     const INSTALL_CLASSNAME = InstallApp::class;
     public static $cmsBuild = null;
-    public static $cmsVersion = "1.0.18";
+    public static $cmsVersion = "1.0.19";
 
     /**
      * @var null|Container