refactor #6 Fix default datetime format (Zales0123)

This PR was merged into the 1.5-dev branch. Discussion ---------- Commits ------- 75a49e5 Fix default DateTime field format c20069b Fix phpstan tests
Sylius · Jul 5, 2019 · 7ddcffc · 7ddcffc
2 parents 54b903b + c20069b
commit 7ddcffc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Component/FieldTypes/DatetimeFieldType.php b/src/Component/FieldTypes/DatetimeFieldType.php
@@ -50,7 +50,7 @@ public function render(Field $field, $data, array $options)
      */
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefault('format', 'Y:m:d H:i:s');
+        $resolver->setDefault('format', 'Y-m-d H:i:s');
         $resolver->setAllowedTypes('format', 'string');
     }
 }
diff --git a/src/Component/Provider/ArrayGridProvider.php b/src/Component/Provider/ArrayGridProvider.php
@@ -57,6 +57,6 @@ private function extend(array $gridConfiguration, array $parentGridConfiguration
 
         unset($configuration['extends']);
 
-        return $configuration;
+        return $configuration ?? [];
     }
 }