Bundle own flatpickr fork (#2071)

atk4 · Jun 11, 2023 · 66cf1b6 · 66cf1b6
1 parent 7ae17fb
commit 66cf1b6
Show file tree

Hide file tree

Showing 15 changed files with 166 additions and 73 deletions.
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -92,7 +92,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=atk4_pass_root -e MYSQL_USER=atk4_test_user -e MYSQL_PASSWORD=atk4_pass -e MYSQL_DATABASE=atk4_test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
       mariadb:
         image: mariadb
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=atk4_pass_root -e MYSQL_USER=atk4_test_user -e MYSQL_PASSWORD=atk4_pass -e MYSQL_DATABASE=atk4_test
+        options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=atk4_pass_root -e MYSQL_USER=atk4_test_user -e MYSQL_PASSWORD=atk4_pass -e MYSQL_DATABASE=atk4_test
       postgres:
         image: postgres:12-alpine
         env:
@@ -253,7 +253,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=atk4_pass_root -e MYSQL_USER=atk4_test_user -e MYSQL_PASSWORD=atk4_pass -e MYSQL_DATABASE=atk4_test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
       mariadb:
         image: mariadb
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=atk4_pass_root -e MYSQL_USER=atk4_test_user -e MYSQL_PASSWORD=atk4_pass -e MYSQL_DATABASE=atk4_test
+        options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=atk4_pass_root -e MYSQL_USER=atk4_test_user -e MYSQL_PASSWORD=atk4_pass -e MYSQL_DATABASE=atk4_test
       postgres:
         image: postgres:12-alpine
         env:

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -18,11 +18,6 @@
         ],
 
         // disable some too strict rules
-        'phpdoc_types' => [
-            // keep enabled, but without "alias" group to not fix
-            // "Callback" to "callback" in phpdoc
-            'groups' => ['simple', 'meta'],
-        ],
         'phpdoc_types_order' => [
             'null_adjustment' => 'always_last',
             'sort_algorithm' => 'none',
@@ -59,7 +54,12 @@
         // also prevent bounding of unwanted variables for GC
         'use_arrow_functions' => false,
 
-        'phpdoc_var_without_name' => false, // remove once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/6959 is fixed
+        // TODO remove once 3.17.1 is released
+        // https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/pull/6979
+        // https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/pull/7011
+        // fixes were merged
+        'phpdoc_types' => ['groups' => ['simple', 'meta']],
+        'phpdoc_var_without_name' => false,
     ])
     ->setFinder($finder)
     ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer.' . md5(__DIR__) . '.cache');
diff --git a/public/external/@highlightjs/cdn-assets/highlight.min.js b/public/external/@highlightjs/cdn-assets/highlight.min.js
@@ -1204,4 +1204,4 @@ begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0
 aliases:["yml"],contains:l}}});const qe=ae;for(const e of Object.keys(Ke)){
 const n=e.replace("grmr_","").replace("_","-");qe.registerLanguage(n,Ke[e])}
 return qe}()
-;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
+;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
diff --git a/public/external/@highlightjs/cdn-assets/styles/github-dark-dimmed.min.css b/public/external/@highlightjs/cdn-assets/styles/github-dark-dimmed.min.css
diff --git a/public/external/flatpickr/dist/flatpickr.css b/public/external/flatpickr/dist/flatpickr.css
@@ -375,11 +375,9 @@
   pointer-events: none;
 }
 .flatpickr-current-month .flatpickr-monthDropdown-months {
-  appearance: menulist;
   background: transparent;
   border: none;
   border-radius: 0;
-  box-sizing: border-box;
   color: inherit;
   cursor: pointer;
   font-size: inherit;
@@ -393,8 +391,10 @@
   position: relative;
   vertical-align: initial;
   -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   -webkit-appearance: menulist;
   -moz-appearance: menulist;
+  appearance: menulist;
   width: auto;
 }
 .flatpickr-current-month .flatpickr-monthDropdown-months:focus,
@@ -483,9 +483,9 @@ span.flatpickr-weekday {
   display: -webkit-box;
   display: -webkit-flex;
   display: flex;
+  -ms-flex-wrap: wrap;
   -webkit-flex-wrap: wrap;
           flex-wrap: wrap;
-  -ms-flex-wrap: wrap;
   -ms-flex-pack: justify;
   -webkit-justify-content: space-around;
           justify-content: space-around;