Merge branch 'master' of github.com:bolt/core

src/Configuration/Parser/ContentTypesParser.php

@@ -309,6 +309,10 @@ class ContentTypesParser extends BaseParser
             $field['values'] = array_combine($field['values'], $field['values']);
         }
 
+        if ($field['type'] === 'select' && ! isset($field['multiple'])) {
+            $field['multiple'] = false;
+        }
+
         if (empty($field['label'])) {
             $field['label'] = ucwords($key);
         }

src/Controller/Backend/ContentEditController.php

@@ -485,7 +485,7 @@ class ContentEditController extends TwigAwareController implements BackendZoneIn
             ]);
 
             if ($taxonomy === null) {
-                $taxonomy = $this->taxonomyRepository->factory($key, $slug);
+                $taxonomy = $this->taxonomyRepository->factory($key, (string) $slug);
             }
 
             $content->addTaxonomy($taxonomy);

src/Twig/ContentExtension.php

@@ -660,7 +660,7 @@ class ContentExtension extends AbstractExtension
 
         foreach ($taxonomy['options'] as $key => $value) {
             $options[] = [
-                'key' => $key,
+                'key' => (string) $key,
                 'value' => $value,
             ];
         }