diff --git a/composer.lock b/composer.lock index 55bb29ac40..2ae78c8d34 100644 --- a/composer.lock +++ b/composer.lock @@ -5597,17 +5597,17 @@ }, { "name": "drupal/entity_clone", - "version": "2.0.0-beta6", + "version": "2.0.0-beta4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_clone.git", - "reference": "2.0.0-beta6" + "reference": "2.0.0-beta4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta6.zip", - "reference": "2.0.0-beta6", - "shasum": "afd98c1aeffc1d28b8a0b29c8cfb09de95debc9b" + "url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta4.zip", + "reference": "2.0.0-beta4", + "shasum": "21b6636cea194e1f71753a54b28d4a56b42a4b00" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -5621,8 +5621,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-beta6", - "datestamp": "1712549899", + "version": "2.0.0-beta4", + "datestamp": "1687250852", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -18895,16 +18895,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.28.0", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -18936,9 +18936,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, - "time": "2024-04-03T18:51:33+00:00" + "time": "2024-02-23T16:05:55+00:00" }, { "name": "phpstan/phpstan", @@ -25368,6 +25368,115 @@ ], "time": "2024-02-15T11:26:02+00:00" }, + { + "name": "symfony/twig-bridge", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/twig-bridge.git", + "reference": "256f330026d1c97187b61aa5c29e529499877f13" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/256f330026d1c97187b61aa5c29e529499877f13", + "reference": "256f330026d1c97187b61aa5c29e529499877f13", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/translation-contracts": "^2.5|^3", + "twig/twig": "^2.13|^3.0.4" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/console": "<5.4", + "symfony/form": "<6.3", + "symfony/http-foundation": "<5.4", + "symfony/http-kernel": "<6.4", + "symfony/mime": "<6.2", + "symfony/serializer": "<6.4", + "symfony/translation": "<5.4", + "symfony/workflow": "<5.4" + }, + "require-dev": { + "egulias/email-validator": "^2.1.10|^3|^4", + "league/html-to-markdown": "^5.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/asset-mapper": "^6.3|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/form": "^6.4|^7.0", + "symfony/html-sanitizer": "^6.1|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", + "symfony/polyfill-intl-icu": "~1.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/security-acl": "^2.8|^3.0", + "symfony/security-core": "^5.4|^6.0|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/security-http": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4.3|^7.0.3", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^6.1|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/workflow": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "twig/cssinliner-extra": "^2.12|^3", + "twig/inky-extra": "^2.12|^3", + "twig/markdown-extra": "^2.12|^3" + }, + "type": "symfony-bridge", + "autoload": { + "psr-4": { + "Symfony\\Bridge\\Twig\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides integration for Twig with various Symfony components", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-15T11:26:02+00:00" + }, { "name": "symfony/validator", "version": "v6.4.6", diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php index 82134b9fad..3034c72cdd 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php +++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php @@ -364,7 +364,7 @@ protected function getOnlineScheduling(string $online_scheduling_avail) { 'yes' => 'true', ]; - return $map[$online_scheduling_avail]; + return $map[$online_scheduling_avail] ?? NULL; } /** diff --git a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php index 7456783943..cc0e300bf3 100644 --- a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php +++ b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php @@ -189,10 +189,11 @@ protected function migrateScheduleOnline(): void { '1' => 'yes', // 'No' => 'No'. '0' => 'no', - // This is the do no harm, option defaulting to most restrictive. - // 'unspecified' => 'No'. - 'not_applicable' => 'no', - 'default' => 'no', + // This is the do no harm, option defaulting to no choice. + // 'unspecified' => NULL. + '2' => NULL, + 'not_applicable' => NULL, + 'default' => NULL, ]; $lookup = $this->facilityService->get('field_online_scheduling_availabl')->value; $new_value = script_libary_map_to_value($lookup, $schedule_online_map); @@ -211,10 +212,11 @@ protected function migrateWalkinsAccepted(): void { '0' => 'yes_appointment_only', // 'Yes' => 'Yes, with or without an appointment'. '1' => 'yes_with_or_without_appointment', - // This is the do no harm, option defaulting to most restrictive. - // 'unspecified' => 'yes by appointment only'. - 'not_applicable' => 'yes_appointment_only', - 'default' => 'yes_appointment_only', + // This is the do no harm, option defaulting to no choice. + // 'unspecified' => NULL. + '2' => NULL, + 'not_applicable' => NULL, + 'default' => NULL, ]; $lookup = $this->facilityService->get('field_walk_ins_accepted')->value; $new_value = script_libary_map_to_value($lookup, $walkins_accepted_map); diff --git a/scripts/content/script-library.php b/scripts/content/script-library.php index ac00016965..e7d55cca42 100644 --- a/scripts/content/script-library.php +++ b/scripts/content/script-library.php @@ -388,7 +388,7 @@ function script_library_sandbox_complete(array &$sandbox, $completed_message) { * Whatever the value associated with the key. */ function script_libary_map_to_value(string|null $lookup, array $map, bool $strict = TRUE) : mixed { - if (empty($lookup)) { + if (empty($lookup) && strlen($lookup) === 0) { if (isset($map['default'])) { // There is a default set, so use it. return $map['default'];