Merge 2.x into 3.x

sonata-project · Nov 23, 2023 · 8e53996 · 8e53996
2 parents f8d6401 + 0afb11e
commit 8e53996
Show file tree

Hide file tree

Showing 11 changed files with 2,711 additions and 2,108 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.0](https://github.com/sonata-project/form-extensions/compare/2.1.0...2.2.0) - 2023-11-22
+### Changed
+- [[#463](https://github.com/sonata-project/form-extensions/pull/463)] Updated and built all npm packages to the newest ones ([@haivala](https://github.com/haivala))
+
 ## [2.1.0](https://github.com/sonata-project/form-extensions/compare/2.0.0...2.1.0) - 2023-09-29
 ### Added
 - [[#455](https://github.com/sonata-project/form-extensions/pull/455)] CollectionType btn_translation_domain option ([@VincentLanglet](https://github.com/VincentLanglet))

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Bridge/Symfony/Resources/public/379.js b/src/Bridge/Symfony/Resources/public/379.js
diff --git a/src/Bridge/Symfony/Resources/public/46.js b/src/Bridge/Symfony/Resources/public/46.js
diff --git a/src/Bridge/Symfony/Resources/public/571.js b/src/Bridge/Symfony/Resources/public/571.js
diff --git a/src/Bridge/Symfony/Resources/public/684.js b/src/Bridge/Symfony/Resources/public/684.js
diff --git a/src/Bridge/Symfony/Resources/public/696.js b/src/Bridge/Symfony/Resources/public/696.js
diff --git a/src/Bridge/Symfony/Resources/public/873.js b/src/Bridge/Symfony/Resources/public/873.js
diff --git a/src/Bridge/Symfony/Resources/public/982.js b/src/Bridge/Symfony/Resources/public/982.js
diff --git a/src/Bridge/Symfony/Resources/public/manifest.json b/src/Bridge/Symfony/Resources/public/manifest.json
@@ -5,10 +5,13 @@
   "bundles/sonataform/873.js": "/bundles/sonataform/873.js",
   "bundles/sonataform/610.js": "/bundles/sonataform/610.js",
   "bundles/sonataform/152.js": "/bundles/sonataform/152.js",
+  "bundles/sonataform/46.js": "/bundles/sonataform/46.js",
+  "bundles/sonataform/684.js": "/bundles/sonataform/684.js",
   "bundles/sonataform/650.js": "/bundles/sonataform/650.js",
   "bundles/sonataform/653.js": "/bundles/sonataform/653.js",
   "bundles/sonataform/982.js": "/bundles/sonataform/982.js",
   "bundles/sonataform/833.js": "/bundles/sonataform/833.js",
+  "bundles/sonataform/571.js": "/bundles/sonataform/571.js",
   "bundles/sonataform/202.js": "/bundles/sonataform/202.js",
   "bundles/sonataform/935.js": "/bundles/sonataform/935.js",
   "bundles/sonataform/994.js": "/bundles/sonataform/994.js",

diff --git a/src/Type/BasePickerType.php b/src/Type/BasePickerType.php
@@ -67,6 +67,7 @@ abstract class BasePickerType extends AbstractType implements LocaleAwareInterfa
      */
     private const LOCALIZATION_OPTIONS = [
         'locale' => 'string',
+        'hourCycle' => 'string',
     ];
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         private const LOCALIZATION_OPTIONS = [
             'locale' => 'string',
+            'hourCycle' => 'string',
         ];
         /**
@@ Expand Down @@