From 9e20e5ec0a538294972fc697d3c7f02183c63e6c Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Mon, 7 Aug 2023 20:24:01 +0000 Subject: [PATCH 01/22] FOIA-389: FOIA FBI webform updates for the first pass. --- config/default/webform.webform.doj_fbi.yml | 171 ++++++++++++++++++-- config/default/webform_template.webform.yml | 2 +- 2 files changed, 156 insertions(+), 17 deletions(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index c7423b87a..f99b086b3 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -13,8 +13,8 @@ archive: false id: doj_fbi title: DOJ-FBI description: '' -category: '' -elements: | +category: null +elements: |- name_first: '#type': textfield '#title': 'First name' @@ -24,10 +24,19 @@ elements: | company_organization: '#type': textfield '#title': 'Your organization' + '#states': + required: + ':input[name="fbi_requester_type"]': + value: organization + visible: + ':input[name="fbi_requester_type"]': + value: organization email: '#type': email '#title': 'Email address' - '#help': "In order for us to communicate with you about your request,
\nyou must provide at least one form of contact information." + '#help': |- + In order for us to communicate with you about your request,
+ you must provide at least one form of contact information. phone_number: '#type': tel '#title': 'Phone number' @@ -54,6 +63,26 @@ elements: | '#title': Country '#default_value': 'United States' '#options': country_names + request_description: + '#type': textarea + '#title': 'Your request' + '#help': 'A brief and clear description of the information you''d like to receive. Please be as specific as possible.' + '#maxlength': 3000 + '#required': true + fbi_request_subject: + '#type': radios + '#title': 'What is the subject of your request?' + '#options': + myself: Myself + deceased: 'Deceased Individual' + other: 'All Other Subjects' + fbi_requester_type: + '#type': radios + '#title': 'I am making this request on behalf of' + '#options': + myself: Myself + organization: 'An Organization' + '#required': true request_category: '#type': select '#title': 'What type of requester are you?' @@ -64,24 +93,26 @@ elements: | scientific: 'Non-commercial scientific institution' commercial: 'Commercial-use requester' other: 'All other requester' - request_description: - '#type': textarea - '#maxlength': 10000 - '#title': 'Your request' - '#help': 'A brief and clear description of the information you''d like to receive. Please be as specific as possible.' - '#required': true fee_waiver: - '#type': select + '#type': radios '#title': 'Fee waiver' - '#default_value': 'no' '#options': - 'no': 'No' - 'yes': 'Yes' + option1: 'I am requesting a fee waiver for my request and have reviewed the FOIA Reference Guide. If my fee waiver is denied, I would like to limit my request to the two free hours of searching and 100 duplicated pages. (Non-commercial request only)' + option2: 'I am requesting a fee waiver for my request and have reviewed the FOIA Reference Guide. If my fee waiver is denied, I am willing to pay additional fees and will enter the maximum amount that I am willing to pay in the box below.' + option3: 'I am limiting my request to the two free hours of searching and 100 duplicated pages. I am not willing to pay additional fees. (Non-commercial request only)' + option4: 'I am willing to pay additional fees and will enter the maximum amount that I am willing to pay in the box below.' fee_waiver_explanation: '#type': textarea - '#maxlength': 10000 '#title': 'Fee waiver justification' '#help': 'Leave this blank if you are not requesting a fee waiver. When making a request for a fee waiver you must explain how your request meets the fee waiver standard described above.' + '#maxlength': 4000 + '#states': + required: + - ':input[name="fee_waiver"]': + value: option1 + - or + - ':input[name="fee_waiver"]': + value: option2 fee_amount_willing: '#type': textfield '#title': 'The amount of money you’re willing to pay in fees, if any' @@ -89,6 +120,13 @@ elements: | '#pattern': '^(?=.)([+\-\$]?([0-9]*)(\.([0-9]+))?)$' '#counter_type': word '#counter_maximum': 1 + '#states': + required: + - ':input[name="fee_waiver"]': + value: option2 + - or + - ':input[name="fee_waiver"]': + value: option4 expedited_processing: '#type': select '#title': 'Expedited processing' @@ -98,14 +136,110 @@ elements: | 'yes': 'Yes' expedited_processing_explanation: '#type': textarea - '#maxlength': 10000 '#title': 'Justification for expedited processing' '#help': 'Leave this blank if you are not requesting expedited processing. When making a request for expedited processing you must explain how your request meets one of the expedition standards described above.  This agency has additional criteria for expedited processing detailed at 28 C.F.R. § 16.5(e).' + '#maxlength': 10000 + '#states': + required: + ':input[name="expedited_processing"]': + value: 'yes' attachments_supporting_documentation: '#type': managed_file '#title': 'Upload additional documentation' - '#help': "If you are seeking records about yourself, additional documentation
\nis required to verify your identity. 28 C.F.R. § 16.3(a)(3). You can use this form to verify your identity." '#multiple': true + '#help': |- + + '#states': + required: + ':input[name="fbi_requester_type"]': + value: myself + '#max_filesize': '10' + '#sanitize': true + deceased_name_first: + '#type': textfield + '#title': 'Deceased Individual''s First Name' + '#states': + required: + ':input[name="fbi_request_subject"]': + value: deceased + visible: + ':input[name="fbi_request_subject"]': + value: deceased + deceased_name_middle: + '#type': textfield + '#title': 'Deceased Individual''s Middle Name' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: deceased + deceased_name_last: + '#type': textfield + '#title': 'Deceased Individual''s Last Name' + '#states': + required: + ':input[name="fbi_request_subject"]': + value: deceased + visible: + ':input[name="fbi_request_subject"]': + value: deceased + deceased_social_security_number: + '#type': textfield + '#title': 'Deceased Individual''s Social Security Number' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: decease + deceased_alien_registration_number: + '#type': textfield + '#title': 'Deceased Individual''s Alien Registration Number' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: decease + deceased_fbi_number: + '#type': textfield + '#title': 'Deceased Individual''s FBI Number' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: decease + deceased_place_of_birth: + '#type': textfield + '#title': 'Deceased Individual''s Place of Birth' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: decease + deceased_date_of_birth: + '#type': textfield + '#title': 'Deceased Individual''s Date of Birth' + '#pattern': '(0[1-9]|1[012])\/(0[1-9]|[12][0-9]|3[01])\/(19|20)\d\d' + '#pattern_error': 'Please use the date format: MM/DD/YYYY' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: deceased + deceased_date_of_death: + '#type': textfield + '#title': 'Deceased Individual''s Date of Death' + '#pattern': '(0[1-9]|1[012])\/(0[1-9]|[12][0-9]|3[01])\/(19|20)\d\d' + '#pattern_error': 'Please use the date format: MM/DD/YYYY' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: deceased + deceased_additional_information: + '#type': textarea + '#title': 'Deceased Individual''s Additional Information' + '#description': 'Provide additional information about the subject of your request. Please provide as much information as possible.' + '#states': + visible: + ':input[name="fbi_request_subject"]': + value: decease css: '' javascript: '' settings: @@ -147,6 +281,9 @@ settings: form_access_denied_message: '' form_access_denied_attributes: { } form_file_limit: '' + form_attributes: { } + form_method: '' + form_action: '' share: false share_node: false share_theme_name: '' @@ -190,6 +327,8 @@ settings: wizard_toggle: false wizard_toggle_show_label: '' wizard_toggle_hide_label: '' + wizard_page_type: container + wizard_page_title_tag: h2 preview: 0 preview_label: '' preview_title: '' diff --git a/config/default/webform_template.webform.yml b/config/default/webform_template.webform.yml index d228d4b58..c8430f4be 100644 --- a/config/default/webform_template.webform.yml +++ b/config/default/webform_template.webform.yml @@ -231,7 +231,7 @@ doj_eoir: 1 doj_ocdetf: 1 doj_eousa: 1 doj_eoust: 1 -doj_fbi: 1 +doj_fbi: 0 doj_fcsc: 1 doj_jmd: 1 doj_nsd: 1 From 51f02e76dccc958381fbec01492bb98e04f63730 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Tue, 15 Aug 2023 17:50:45 +0000 Subject: [PATCH 02/22] FOIA-389: More updates and fixes to FBI form. --- config/default/webform.webform.doj_fbi.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index f99b086b3..4f6b85986 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -13,7 +13,7 @@ archive: false id: doj_fbi title: DOJ-FBI description: '' -category: null +category: '' elements: |- name_first: '#type': textfield @@ -143,6 +143,9 @@ elements: |- required: ':input[name="expedited_processing"]': value: 'yes' + visible: + ':input[name="expedited_processing"]': + value: 'yes' attachments_supporting_documentation: '#type': managed_file '#title': 'Upload additional documentation' @@ -158,6 +161,7 @@ elements: |- ':input[name="fbi_requester_type"]': value: myself '#max_filesize': '10' + '#file_extensions': 'gif jpg png txt pdf doc docx odf zip' '#sanitize': true deceased_name_first: '#type': textfield @@ -192,28 +196,28 @@ elements: |- '#states': visible: ':input[name="fbi_request_subject"]': - value: decease + value: deceased deceased_alien_registration_number: '#type': textfield '#title': 'Deceased Individual''s Alien Registration Number' '#states': visible: ':input[name="fbi_request_subject"]': - value: decease + value: deceased deceased_fbi_number: '#type': textfield '#title': 'Deceased Individual''s FBI Number' '#states': visible: ':input[name="fbi_request_subject"]': - value: decease + value: deceased deceased_place_of_birth: '#type': textfield '#title': 'Deceased Individual''s Place of Birth' '#states': visible: ':input[name="fbi_request_subject"]': - value: decease + value: deceased deceased_date_of_birth: '#type': textfield '#title': 'Deceased Individual''s Date of Birth' @@ -239,7 +243,7 @@ elements: |- '#states': visible: ':input[name="fbi_request_subject"]': - value: decease + value: deceased css: '' javascript: '' settings: @@ -281,9 +285,6 @@ settings: form_access_denied_message: '' form_access_denied_attributes: { } form_file_limit: '' - form_attributes: { } - form_method: '' - form_action: '' share: false share_node: false share_theme_name: '' @@ -327,8 +328,6 @@ settings: wizard_toggle: false wizard_toggle_show_label: '' wizard_toggle_hide_label: '' - wizard_page_type: container - wizard_page_title_tag: h2 preview: 0 preview_label: '' preview_title: '' From 2f7c605812a0bced87b78e7d9c46b43f068bc05f Mon Sep 17 00:00:00 2001 From: Johann Huang Date: Fri, 25 Aug 2023 14:44:05 +0000 Subject: [PATCH 03/22] FOIA-417: webform updates Sanitize filename. --- config/default/core.extension.yml | 1 + config/default/lightning_core.versions.yml | 2 +- .../views.view.commonly_requested_records.yml | 269 ++++++++++++++++++ .../webform.webform.treasury_irs_form.yml | 4 +- config/default/webform_template.webform.yml | 2 +- 5 files changed, 274 insertions(+), 4 deletions(-) create mode 100644 config/default/views.view.commonly_requested_records.yml diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index 8a3737e2d..b4baf5ccb 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -161,6 +161,7 @@ module: views_bulk_operations: 0 views_data_export: 0 views_infinite_scroll: 0 + views_ui: 0 webform: 0 webform_serialization: 0 webform_template: 0 diff --git a/config/default/lightning_core.versions.yml b/config/default/lightning_core.versions.yml index bcf460dce..10864c057 100644 --- a/config/default/lightning_core.versions.yml +++ b/config/default/lightning_core.versions.yml @@ -163,7 +163,7 @@ views: 8.4.5 views_bulk_operations: 3.6.0 views_data_export: 1.0.0-alpha4 views_infinite_scroll: 1.5.0 -views_ui: 9.5.3 +views_ui: 9.5.8 webform: 5.0.0-beta19 webform_serialization: 0.0.0 webform_template: 0.0.0 diff --git a/config/default/views.view.commonly_requested_records.yml b/config/default/views.view.commonly_requested_records.yml new file mode 100644 index 000000000..eb041e52a --- /dev/null +++ b/config/default/views.view.commonly_requested_records.yml @@ -0,0 +1,269 @@ +uuid: 597e4837-6984-4cf6-a104-39679eaeec6e +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_commonly_requested_records + - node.type.agency_component + module: + - node + - user +id: commonly_requested_records +label: 'Commonly requested records' +module: views +description: '' +tag: '' +base_table: node_field_data +base_field: nid +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: 'Commonly requested records' + fields: + title: + id: title + table: node_field_data + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: field + label: '' + exclude: false + alter: + alter_text: false + make_link: false + absolute: false + word_boundary: false + ellipsis: false + strip_tags: false + trim: false + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_commonly_requested_records: + id: field_commonly_requested_records + table: node__field_commonly_requested_records + field: field_commonly_requested_records + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Commonly Requested Records' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: none + options: + offset: 0 + items_per_page: 0 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + title: + id: title + table: node_field_data + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: '' + exposed: false + arguments: { } + filters: + status: + id: status + table: node_field_data + field: status + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + type: + id: type + table: node_field_data + field: type + entity_type: node + entity_field: type + plugin_id: bundle + value: + agency_component: agency_component + expose: + operator_limit_selection: false + operator_list: { } + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + title: title + default: '-1' + info: + title: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + header: { } + footer: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: + - 'config:field.storage.node.field_commonly_requested_records' + page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 + display_options: + display_extenders: { } + path: commonly-requested-records + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: + - 'config:field.storage.node.field_commonly_requested_records' diff --git a/config/default/webform.webform.treasury_irs_form.yml b/config/default/webform.webform.treasury_irs_form.yml index 02aa42127..3b0c67547 100644 --- a/config/default/webform.webform.treasury_irs_form.yml +++ b/config/default/webform.webform.treasury_irs_form.yml @@ -14,7 +14,7 @@ id: treasury_irs_form title: 'Treasury-IRS Form' description: '' category: '' -elements: | +elements: |- name_first: '#type': textfield '#title': 'First name' @@ -112,7 +112,7 @@ elements: | '#title': 'Upload additional documentation' '#multiple': true '#max_filesize': '20' - '#file_extensions': 'gif jpg png txt pdf doc docx odf' + '#sanitize': true css: '' javascript: '' settings: diff --git a/config/default/webform_template.webform.yml b/config/default/webform_template.webform.yml index d228d4b58..602072e02 100644 --- a/config/default/webform_template.webform.yml +++ b/config/default/webform_template.webform.yml @@ -421,7 +421,7 @@ treasury_fcen_form: 1 treasury_mint_form: 1 treasury_occ_form: 1 treasury_tigta_form: 1 -treasury_irs_form: 1 +treasury_irs_form: 0 epa_hq: 1 epa_region_1_form: 1 epa_region_2_form: 1 From 952f63d0ba1b4be2f0ef4de12e581586ec1f59a7 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Fri, 25 Aug 2023 17:26:17 +0000 Subject: [PATCH 04/22] FOIA-0: Disable views_ui module. --- config/default/core.extension.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index b4baf5ccb..8a3737e2d 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -161,7 +161,6 @@ module: views_bulk_operations: 0 views_data_export: 0 views_infinite_scroll: 0 - views_ui: 0 webform: 0 webform_serialization: 0 webform_template: 0 From 4c1bfe398a908ce1c7f504472824dfdfadf9ff0b Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Fri, 25 Aug 2023 21:19:46 +0000 Subject: [PATCH 05/22] FOIA-389: Citizen element. --- config/default/webform.webform.doj_fbi.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index 4f6b85986..da35660b0 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -83,6 +83,19 @@ elements: |- myself: Myself organization: 'An Organization' '#required': true + fbi_citizen: + '#type': select + '#title': 'Are you a US citizen?' + '#options': + 'yes': 'Yes' + 'no': 'No' + '#states': + required: + ':input[name="fbi_requester_type"]': + value: myself + visible: + ':input[name="fbi_requester_type"]': + value: myself request_category: '#type': select '#title': 'What type of requester are you?' From 96ee8d894f996e8119f7cc99d3d8d4c9c4a1477c Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Mon, 28 Aug 2023 14:57:55 +0000 Subject: [PATCH 06/22] FOIA-389: Some validation updates. --- config/default/webform.webform.doj_fbi.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index da35660b0..d73bedb64 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -18,12 +18,15 @@ elements: |- name_first: '#type': textfield '#title': 'First name' + '#maxlength': 30 name_last: '#type': textfield '#title': 'Last name' + '#maxlength': 30 company_organization: '#type': textfield '#title': 'Your organization' + '#maxlength': 100 '#states': required: ':input[name="fbi_requester_type"]': @@ -46,18 +49,22 @@ elements: |- address_line1: '#type': textfield '#title': 'Mailing address 1' + '#maxlength': 50 address_line2: '#type': textfield '#title': 'Mailing address 2' + '#maxlength': 50 address_city: '#type': textfield '#title': City + '#maxlength': 50 address_state_province: '#type': textfield '#title': 'State or province' address_zip_postal_code: '#type': textfield '#title': 'Zip or postal code' + '#maxlength': 50 address_country: '#type': select '#title': Country @@ -67,8 +74,7 @@ elements: |- '#type': textarea '#title': 'Your request' '#help': 'A brief and clear description of the information you''d like to receive. Please be as specific as possible.' - '#maxlength': 3000 - '#required': true + '#maxlength': 4000 fbi_request_subject: '#type': radios '#title': 'What is the subject of your request?' @@ -151,7 +157,7 @@ elements: |- '#type': textarea '#title': 'Justification for expedited processing' '#help': 'Leave this blank if you are not requesting expedited processing. When making a request for expedited processing you must explain how your request meets one of the expedition standards described above.  This agency has additional criteria for expedited processing detailed at 28 C.F.R. § 16.5(e).' - '#maxlength': 10000 + '#maxlength': 4000 '#states': required: ':input[name="expedited_processing"]': @@ -179,6 +185,7 @@ elements: |- deceased_name_first: '#type': textfield '#title': 'Deceased Individual''s First Name' + '#maxlength': 30 '#states': required: ':input[name="fbi_request_subject"]': @@ -189,6 +196,8 @@ elements: |- deceased_name_middle: '#type': textfield '#title': 'Deceased Individual''s Middle Name' + '#maxlength': 30 + '#pattern': '[a-zA-Z\-\,\ ]+[\.]?' '#states': visible: ':input[name="fbi_request_subject"]': @@ -196,6 +205,7 @@ elements: |- deceased_name_last: '#type': textfield '#title': 'Deceased Individual''s Last Name' + '#maxlength': 255 '#states': required: ':input[name="fbi_request_subject"]': @@ -206,6 +216,7 @@ elements: |- deceased_social_security_number: '#type': textfield '#title': 'Deceased Individual''s Social Security Number' + '#pattern': '^(?!666|000|9\\d{2})\\d{3}(?!00)\\d{2}(?!0{4})\\d{4}$' '#states': visible: ':input[name="fbi_request_subject"]': @@ -220,6 +231,7 @@ elements: |- deceased_fbi_number: '#type': textfield '#title': 'Deceased Individual''s FBI Number' + '#maxlength': 30 '#states': visible: ':input[name="fbi_request_subject"]': @@ -227,6 +239,7 @@ elements: |- deceased_place_of_birth: '#type': textfield '#title': 'Deceased Individual''s Place of Birth' + '#maxlength': 100 '#states': visible: ':input[name="fbi_request_subject"]': @@ -253,6 +266,7 @@ elements: |- '#type': textarea '#title': 'Deceased Individual''s Additional Information' '#description': 'Provide additional information about the subject of your request. Please provide as much information as possible.' + '#maxlength': 4000 '#states': visible: ':input[name="fbi_request_subject"]': From 01dcc4c6341236d0a86ec178e0fc6f94b0ad2c66 Mon Sep 17 00:00:00 2001 From: nubasit Date: Wed, 30 Aug 2023 19:23:42 +0000 Subject: [PATCH 07/22] FOIA-000: PHP update 8.1 completed. --- .ddev/config.yaml | 2 +- composer.json | 4 +-- composer.lock | 65 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index baef8eae2..90b9b396d 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,7 +1,7 @@ name: foia-api type: drupal9 docroot: docroot -php_version: "8.0" +php_version: "8.1" webserver_type: nginx-fpm router_http_port: "80" router_https_port: "443" diff --git a/composer.json b/composer.json index ab5477965..793c6dc28 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=8.0", + "php": ">=8.1", "ext-dom": "*", "acquia/blt": "^13.4.0", "acquia/blt-simplesamlphp": "^1.0", @@ -206,7 +206,7 @@ "drupal/core-project-message": true }, "platform": { - "php": "8.0.24" + "php": "8.1" } }, "autoload": { diff --git a/composer.lock b/composer.lock index 73ef3b53a..3c18a4887 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a357856700bd5683627a4c0f08501222", + "content-hash": "a3d7aef34d3ff699eff179b23cdd5f56", "packages": [ { "name": "acquia/blt", @@ -762,6 +762,7 @@ "issues": "https://github.com/minkphp/MinkGoutteDriver/issues", "source": "https://github.com/minkphp/MinkGoutteDriver/tree/v1.3.0" }, + "abandoned": "behat/mink-browserkit-driver", "time": "2021-10-12T11:35:46+00:00" }, { @@ -886,7 +887,7 @@ "version": "v2.3.4", "source": { "type": "git", - "url": "https://github.com/fengyuanchen/cropper.git", + "url": "git@github.com:fengyuanchen/cropper.git", "reference": "30c58b29ee21010e17e58ebab165fbd84285c685" }, "dist": { @@ -922,7 +923,7 @@ "version": "v1.8.1", "source": { "type": "git", - "url": "git@github.com:kenwheeler/slick.git", + "url": "https://github.com/kenwheeler/slick.git", "reference": "0f40c9d6a02a5c08b5f4dd80fdada3a854a59bee" }, "dist": { @@ -2894,10 +2895,6 @@ "name": "acquia", "homepage": "https://www.drupal.org/user/1231722" }, - { - "name": "Dane Powell", - "homepage": "https://www.drupal.org/user/339326" - }, { "name": "irek02", "homepage": "https://www.drupal.org/user/736644" @@ -5744,6 +5741,10 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + }, { "name": "dawehner", "homepage": "https://www.drupal.org/user/99340" @@ -5772,6 +5773,10 @@ "name": "joseph.olstad", "homepage": "https://www.drupal.org/user/1321830" }, + { + "name": "matthand", + "homepage": "https://www.drupal.org/user/171527" + }, { "name": "mpotter", "homepage": "https://www.drupal.org/user/616192" @@ -6406,14 +6411,14 @@ "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "kaythay", - "homepage": "https://www.drupal.org/user/2182186" - }, { "name": "oknate", "homepage": "https://www.drupal.org/user/471638" }, + { + "name": "podarok", + "homepage": "https://www.drupal.org/user/116002" + }, { "name": "ram4nd", "homepage": "https://www.drupal.org/user/601534" @@ -6853,6 +6858,14 @@ "homepage": "https://www.drupal.org/u/eiriksm", "role": "Maintainer" }, + { + "name": "eiriksm", + "homepage": "https://www.drupal.org/user/1014468" + }, + { + "name": "gravelpot", + "homepage": "https://www.drupal.org/user/748208" + }, { "name": "Jeff Cardwell", "homepage": "https://www.drupal.org/user/2913129" @@ -9479,8 +9492,8 @@ ], "authors": [ { - "name": "Niels van Mourik", - "homepage": "http://www.nielsvm.org" + "name": "djbobbydrake", + "homepage": "https://www.drupal.org/user/336378" }, { "name": "japerry", @@ -9681,6 +9694,10 @@ "name": "Dave Reid", "homepage": "https://www.drupal.org/user/53892" }, + { + "name": "Kristen Pol", + "homepage": "https://www.drupal.org/user/8389" + }, { "name": "pifagor", "homepage": "https://www.drupal.org/user/2375692" @@ -9823,8 +9840,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.0-alpha7+46-dev", - "datestamp": "1678409312", + "version": "8.x-3.0-alpha7+50-dev", + "datestamp": "1689032348", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -11196,6 +11213,14 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "Anybody", + "homepage": "https://www.drupal.org/user/291091" + }, + { + "name": "Grevil", + "homepage": "https://www.drupal.org/user/3668491" + }, { "name": "Honza Pobořil", "homepage": "https://www.drupal.org/user/123612" @@ -11211,6 +11236,10 @@ { "name": "Sam152", "homepage": "https://www.drupal.org/user/1485048" + }, + { + "name": "thomas.frobieter", + "homepage": "https://www.drupal.org/user/409335" } ], "description": "A pager which allows an infinite scroll effect for views.", @@ -11405,7 +11434,7 @@ "homepage": "https://www.drupal.org/user/272316" }, { - "name": "RenatoG", + "name": "renatog", "homepage": "https://www.drupal.org/user/3326031" }, { @@ -23207,12 +23236,12 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=8.0", + "php": ">=8.1", "ext-dom": "*" }, "platform-dev": [], "platform-overrides": { - "php": "8.0.24" + "php": "8.1" }, "plugin-api-version": "2.3.0" } From 28a716af44b350b892a1388f2eb1a01f0614830d Mon Sep 17 00:00:00 2001 From: nubasit Date: Wed, 30 Aug 2023 20:30:55 +0000 Subject: [PATCH 08/22] FOIA-000: Additional files for PHP update 8.1 completed. --- .github/workflows/deploy-to-dev.yml | 2 +- .github/workflows/deploy-to-production.yml | 2 +- .github/workflows/deploy-to-staging.yml | 2 +- .github/workflows/deploy-to-uat.yml | 2 +- .github/workflows/test-pull-requests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-to-dev.yml b/.github/workflows/deploy-to-dev.yml index 10f93da90..909d9b7c7 100644 --- a/.github/workflows/deploy-to-dev.yml +++ b/.github/workflows/deploy-to-dev.yml @@ -11,7 +11,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.1' - name: Install SSH key uses: webfactory/ssh-agent@v0.5.4 with: diff --git a/.github/workflows/deploy-to-production.yml b/.github/workflows/deploy-to-production.yml index 0712170ee..f7f908192 100644 --- a/.github/workflows/deploy-to-production.yml +++ b/.github/workflows/deploy-to-production.yml @@ -11,7 +11,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.1' - name: Install SSH key uses: webfactory/ssh-agent@v0.5.4 with: diff --git a/.github/workflows/deploy-to-staging.yml b/.github/workflows/deploy-to-staging.yml index ae4da192e..0cbe25cfb 100644 --- a/.github/workflows/deploy-to-staging.yml +++ b/.github/workflows/deploy-to-staging.yml @@ -11,7 +11,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.1' - name: Install SSH key uses: webfactory/ssh-agent@v0.5.4 with: diff --git a/.github/workflows/deploy-to-uat.yml b/.github/workflows/deploy-to-uat.yml index f6262496d..1fe426408 100644 --- a/.github/workflows/deploy-to-uat.yml +++ b/.github/workflows/deploy-to-uat.yml @@ -11,7 +11,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.1' - name: Install SSH key uses: webfactory/ssh-agent@v0.5.4 with: diff --git a/.github/workflows/test-pull-requests.yml b/.github/workflows/test-pull-requests.yml index 1e91ef0c8..d3e1fee9d 100644 --- a/.github/workflows/test-pull-requests.yml +++ b/.github/workflows/test-pull-requests.yml @@ -11,7 +11,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.1' - name: Set up ddev uses: ddev/github-action-setup-ddev@v1 - name: Set up the site From c5931b6911be8d8f8484577eccb5761f047f3238 Mon Sep 17 00:00:00 2001 From: nubasit Date: Thu, 7 Sep 2023 13:03:43 +0000 Subject: [PATCH 09/22] FOIA-431: Modify the agency component field to commonly_requested_records. --- ...resource_config.node--agency_component.yml | 44 +++++-------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/config/default/jsonapi_extras.jsonapi_resource_config.node--agency_component.yml b/config/default/jsonapi_extras.jsonapi_resource_config.node--agency_component.yml index 43452d01c..1c6482116 100644 --- a/config/default/jsonapi_extras.jsonapi_resource_config.node--agency_component.yml +++ b/config/default/jsonapi_extras.jsonapi_resource_config.node--agency_component.yml @@ -128,30 +128,6 @@ resourceFields: publicName: moderation_state enhancer: id: '' - scheduled_transition_date: - disabled: true - fieldName: scheduled_transition_date - publicName: scheduled_transition_date - enhancer: - id: '' - scheduled_transition_state: - disabled: true - fieldName: scheduled_transition_state - publicName: scheduled_transition_state - enhancer: - id: '' - scheduled_publication: - disabled: true - fieldName: scheduled_publication - publicName: scheduled_publication - enhancer: - id: '' - scheduled_moderation_state: - disabled: true - fieldName: scheduled_moderation_state - publicName: scheduled_moderation_state - enhancer: - id: '' metatag: disabled: true fieldName: metatag @@ -194,10 +170,10 @@ resourceFields: publicName: telephone enhancer: id: '' - field_agency_component_inactive: - disabled: true - fieldName: field_agency_component_inactive - publicName: field_agency_component_inactive + field_commonly_requested_records: + disabled: false + fieldName: field_commonly_requested_records + publicName: commonly_requested_records enhancer: id: '' field_complex_average_days: @@ -272,12 +248,6 @@ resourceFields: publicName: field_interop_planned_method enhancer: id: '' - field_interop_status: - disabled: true - fieldName: field_interop_status - publicName: field_interop_status - enhancer: - id: '' field_is_centralized: disabled: false fieldName: field_is_centralized @@ -338,6 +308,12 @@ resourceFields: publicName: request_form enhancer: id: '' + field_require_manual_processing: + disabled: false + fieldName: field_require_manual_processing + publicName: field_require_manual_processing + enhancer: + id: '' field_service_centers: disabled: false fieldName: field_service_centers From 1302b44de1dd63c3a53847a3fba65df8f3e3bd69 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Wed, 13 Sep 2023 14:33:22 +0000 Subject: [PATCH 10/22] FOIA-389: Signature fields for FBI form. --- config/default/webform.webform.doj_fbi.yml | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index d73bedb64..7b4522f18 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -271,6 +271,52 @@ elements: |- visible: ':input[name="fbi_request_subject"]': value: deceased + fbi_citizen_dob: + '#type': textfield + '#title': 'Date of birth' + '#pattern': '(0[1-9]|1[012])\/(0[1-9]|[12][0-9]|3[01])\/(19|20)\d\d' + '#pattern_error': 'Please use the date format: MM/DD/YYYY' + '#states': + required: + ':input[name="fbi_citizen"]': + value: 'yes' + visible: + ':input[name="fbi_citizen"]': + value: 'yes' + fbi_citizen_confirm: + '#type': select + '#title': 'By providing an electronic signature below I declare under penalty of perjury under the laws of the United States of America that the foregoing is true and correct, and that I am the person named above, and I understand that any falsification of this statement is punishable under the provisions of 18 U.S.C. Section 1001 by a fine of not more than $10,000 or by imprisonment of not more than five years or both, and that requesting or obtaining any record(s) under false pretenses is punishable under the provisions of 5 U.S.C. Section 552(a)(3) by a fine of not more than $5,000.' + '#options': + 'yes': 'I agree' + '#states': + required: + ':input[name="fbi_citizen"]': + value: 'yes' + visible: + ':input[name="fbi_citizen"]': + value: 'yes' + fbi_citizen_signature: + '#type': textfield + '#title': 'Signature (typed)' + '#states': + required: + ':input[name="fbi_citizen"]': + value: 'yes' + visible: + ':input[name="fbi_citizen"]': + value: 'yes' + fbi_citizen_today: + '#type': textfield + '#title': 'Today''s date' + '#pattern': '(0[1-9]|1[012])\/(0[1-9]|[12][0-9]|3[01])\/(19|20)\d\d' + '#pattern_error': 'Please use the date format: MM/DD/YYYY' + '#states': + required: + ':input[name="fbi_citizen"]': + value: 'yes' + visible: + ':input[name="fbi_citizen"]': + value: 'yes' css: '' javascript: '' settings: From 470fb5bb75e2fad5871fa5c4de145daafb8a182b Mon Sep 17 00:00:00 2001 From: brockfanning Date: Wed, 13 Sep 2023 12:58:35 -0400 Subject: [PATCH 11/22] Trigger builds --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bf7f57784..7958e9a24 100644 --- a/README.md +++ b/README.md @@ -42,3 +42,4 @@ As an alternative to Drupal VM, Docker can be used to spin up this project. * [Issue queue](https://github.com/18F/beta.foia.gov/issues) * [GitHub](https://github.com/usdoj/foia) + From b4e68dbabd5149b423655f0c617919d12c1bee9b Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Mon, 18 Sep 2023 18:59:29 +0000 Subject: [PATCH 12/22] FOIA-389: More tweaks to FBI form. --- config/default/webform.webform.doj_fbi.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index 7b4522f18..f99cf844d 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -31,9 +31,6 @@ elements: |- required: ':input[name="fbi_requester_type"]': value: organization - visible: - ':input[name="fbi_requester_type"]': - value: organization email: '#type': email '#title': 'Email address' @@ -97,10 +94,10 @@ elements: |- 'no': 'No' '#states': required: - ':input[name="fbi_requester_type"]': + ':input[name="fbi_request_subject"]': value: myself visible: - ':input[name="fbi_requester_type"]': + ':input[name="fbi_request_subject"]': value: myself request_category: '#type': select @@ -171,8 +168,9 @@ elements: |- '#multiple': true '#help': |-
    -
  • If you are including multiple files, please zip them into a single file.
    • -
  • If you are seeking records about yourself, additional documentation is required to verify your identity. 28 C.F.R. § 16.3(a)(3). You can use this form to verify your identity.
    • +
  • Acceptable formats: pdf, doc, docx, png, gif, jpg, jpeg. Max file size: 10MB
    • +
  • If you are seeking records about yourself, additional documentation is required to verify your identity. 28 C.F.R. § 16.3(a)(3).  If you are a U.S. citizen and sign the below Penalty of Perjury section additional documentation is not required or you can use this form to verify your identity.
    • +
  • If you are requesting records on yourself and need to authorize release of information to another person, please use this form. 
  • If the subject of your request is a deceased individual, you can include proof-of-death documentation.
'#states': @@ -180,7 +178,7 @@ elements: |- ':input[name="fbi_requester_type"]': value: myself '#max_filesize': '10' - '#file_extensions': 'gif jpg png txt pdf doc docx odf zip' + '#file_extensions': 'pdf doc docx png gif jpg jpeg' '#sanitize': true deceased_name_first: '#type': textfield From 231b34117df3fb1b718d5dbceb9e573060d49b86 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Thu, 21 Sep 2023 14:12:19 +0000 Subject: [PATCH 13/22] FOIA-389: More logic tweaks. --- config/default/webform.webform.doj_fbi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index f99cf844d..86d3c3a7c 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -177,6 +177,8 @@ elements: |- required: ':input[name="fbi_requester_type"]': value: myself + ':input[name="fbi_request_subject"]': + value: myself '#max_filesize': '10' '#file_extensions': 'pdf doc docx png gif jpg jpeg' '#sanitize': true From 9350c0905fd9aa10b858f2f1375768b73e7eb079 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Thu, 21 Sep 2023 19:15:00 +0000 Subject: [PATCH 14/22] FOIA-389: More tweaks. --- config/default/webform.webform.doj_fbi.yml | 42 +++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index 86d3c3a7c..83903915d 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -173,12 +173,6 @@ elements: |-
  • If you are requesting records on yourself and need to authorize release of information to another person, please use this form. 
  • If the subject of your request is a deceased individual, you can include proof-of-death documentation.
    • - '#states': - required: - ':input[name="fbi_requester_type"]': - value: myself - ':input[name="fbi_request_subject"]': - value: myself '#max_filesize': '10' '#file_extensions': 'pdf doc docx png gif jpg jpeg' '#sanitize': true @@ -278,11 +272,10 @@ elements: |- '#pattern_error': 'Please use the date format: MM/DD/YYYY' '#states': required: - ':input[name="fbi_citizen"]': - value: 'yes' - visible: - ':input[name="fbi_citizen"]': - value: 'yes' + ':input[name="fbi_request_subject"]': + value: myself + ':input[name="fbi_requester_type"]': + value: myself fbi_citizen_confirm: '#type': select '#title': 'By providing an electronic signature below I declare under penalty of perjury under the laws of the United States of America that the foregoing is true and correct, and that I am the person named above, and I understand that any falsification of this statement is punishable under the provisions of 18 U.S.C. Section 1001 by a fine of not more than $10,000 or by imprisonment of not more than five years or both, and that requesting or obtaining any record(s) under false pretenses is punishable under the provisions of 5 U.S.C. Section 552(a)(3) by a fine of not more than $5,000.' @@ -290,21 +283,19 @@ elements: |- 'yes': 'I agree' '#states': required: - ':input[name="fbi_citizen"]': - value: 'yes' - visible: - ':input[name="fbi_citizen"]': - value: 'yes' + ':input[name="fbi_request_subject"]': + value: myself + ':input[name="fbi_requester_type"]': + value: myself fbi_citizen_signature: '#type': textfield '#title': 'Signature (typed)' '#states': required: - ':input[name="fbi_citizen"]': - value: 'yes' - visible: - ':input[name="fbi_citizen"]': - value: 'yes' + ':input[name="fbi_request_subject"]': + value: myself + ':input[name="fbi_requester_type"]': + value: myself fbi_citizen_today: '#type': textfield '#title': 'Today''s date' @@ -312,11 +303,10 @@ elements: |- '#pattern_error': 'Please use the date format: MM/DD/YYYY' '#states': required: - ':input[name="fbi_citizen"]': - value: 'yes' - visible: - ':input[name="fbi_citizen"]': - value: 'yes' + ':input[name="fbi_request_subject"]': + value: myself + ':input[name="fbi_requester_type"]': + value: myself css: '' javascript: '' settings: From 33d70f69a34618b9fb004fdb03055f7478441a57 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Wed, 27 Sep 2023 20:02:02 +0000 Subject: [PATCH 15/22] FOIA-389: Allow for non-US state/province field. --- .../src/Plugin/rest/resource/WebformSubmissionResource.php | 3 ++- .../custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php b/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php index 925750438..14d7adb44 100644 --- a/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php +++ b/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php @@ -191,7 +191,8 @@ public function post($data) { $phoneNumber = isset($data['phone_number']) && $data['phone_number']; $mailingAddress = isset($data['address_line1']) && $data['address_line1'] && isset($data['address_city']) && $data['address_city'] - && isset($data['address_state_province']) && $data['address_state_province'] + && ((isset($data['address_state_province']) && $data['address_state_province']) + || (isset($data['address_state_province_international']) && $data['address_state_province_international'])) && isset($data['address_zip_postal_code']) && $data['address_zip_postal_code'] && isset($data['address_country']) && $data['address_country']; diff --git a/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php b/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php index 7314ab252..cbd6f7ca3 100644 --- a/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php +++ b/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php @@ -140,6 +140,7 @@ public function formatSubmissionContentsAsList() { 'address_line2' => '', 'address_city' => 'City', 'address_state_province' => 'State/Province', + 'address_state_province_international' => 'Non-U.S. State/Province', 'address_zip_postal_code' => 'Postal Code', 'address_country' => 'Country', 'phone_number' => 'Phone', From 097b6cfe4fe866f1e6bda8ecf7ca3c50e0aa3768 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Wed, 27 Sep 2023 20:49:10 +0000 Subject: [PATCH 16/22] FOIA-389: More tweaks for launching the FBI form. --- config/default/webform.webform.doj_fbi.yml | 28 ++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index 83903915d..f38c5d877 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -19,10 +19,14 @@ elements: |- '#type': textfield '#title': 'First name' '#maxlength': 30 + '#pattern': '^[a-zA-Z]+$' + '#pattern_error': 'Please use only alphabetical characters.' name_last: '#type': textfield '#title': 'Last name' '#maxlength': 30 + '#pattern': '^[a-zA-Z]+$' + '#pattern_error': 'Please use only alphabetical characters.' company_organization: '#type': textfield '#title': 'Your organization' @@ -40,9 +44,13 @@ elements: |- phone_number: '#type': tel '#title': 'Phone number' + '#pattern': '^[0-9]*$' + '#pattern_error': 'Please use only numbers.' fax_number: '#type': tel '#title': 'Fax number' + '#pattern': '^[0-9]*$' + '#pattern_error': 'Please use only numbers.' address_line1: '#type': textfield '#title': 'Mailing address 1' @@ -65,13 +73,14 @@ elements: |- address_country: '#type': select '#title': Country + '#options': country_codes '#default_value': 'United States' - '#options': country_names request_description: '#type': textarea '#title': 'Your request' '#help': 'A brief and clear description of the information you''d like to receive. Please be as specific as possible.' '#maxlength': 4000 + '#required': true fbi_request_subject: '#type': radios '#title': 'What is the subject of your request?' @@ -79,6 +88,7 @@ elements: |- myself: Myself deceased: 'Deceased Individual' other: 'All Other Subjects' + '#required': true fbi_requester_type: '#type': radios '#title': 'I am making this request on behalf of' @@ -133,7 +143,8 @@ elements: |- '#type': textfield '#title': 'The amount of money you’re willing to pay in fees, if any' '#help': 'There is no initial fee required to submit a FOIA request, but the FOIA does allow people requesting records to be charged certain types of fees in some instances.' - '#pattern': '^(?=.)([+\-\$]?([0-9]*)(\.([0-9]+))?)$' + '#pattern': '^[0-9]*$' + '#pattern_error': 'Please use only numbers.' '#counter_type': word '#counter_maximum': 1 '#states': @@ -218,6 +229,9 @@ elements: |- deceased_alien_registration_number: '#type': textfield '#title': 'Deceased Individual''s Alien Registration Number' + '#maxlength': 30 + '#pattern': '^[a-zA-Z0-9]*$' + '#pattern_error': 'Please use only letters and numbers.' '#states': visible: ':input[name="fbi_request_subject"]': @@ -226,6 +240,8 @@ elements: |- '#type': textfield '#title': 'Deceased Individual''s FBI Number' '#maxlength': 30 + '#pattern': '^[a-zA-Z0-9]*$' + '#pattern_error': 'Please use only letters and numbers.' '#states': visible: ':input[name="fbi_request_subject"]': @@ -274,8 +290,6 @@ elements: |- required: ':input[name="fbi_request_subject"]': value: myself - ':input[name="fbi_requester_type"]': - value: myself fbi_citizen_confirm: '#type': select '#title': 'By providing an electronic signature below I declare under penalty of perjury under the laws of the United States of America that the foregoing is true and correct, and that I am the person named above, and I understand that any falsification of this statement is punishable under the provisions of 18 U.S.C. Section 1001 by a fine of not more than $10,000 or by imprisonment of not more than five years or both, and that requesting or obtaining any record(s) under false pretenses is punishable under the provisions of 5 U.S.C. Section 552(a)(3) by a fine of not more than $5,000.' @@ -285,8 +299,6 @@ elements: |- required: ':input[name="fbi_request_subject"]': value: myself - ':input[name="fbi_requester_type"]': - value: myself fbi_citizen_signature: '#type': textfield '#title': 'Signature (typed)' @@ -294,8 +306,6 @@ elements: |- required: ':input[name="fbi_request_subject"]': value: myself - ':input[name="fbi_requester_type"]': - value: myself fbi_citizen_today: '#type': textfield '#title': 'Today''s date' @@ -305,8 +315,6 @@ elements: |- required: ':input[name="fbi_request_subject"]': value: myself - ':input[name="fbi_requester_type"]': - value: myself css: '' javascript: '' settings: From bf082ba3b7bfb494357a0cdb1c099f78e3978de6 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Wed, 27 Sep 2023 21:01:17 +0000 Subject: [PATCH 17/22] FOIA-389: Default value country fix. --- config/default/webform.webform.doj_fbi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index f38c5d877..9d25af468 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -74,7 +74,7 @@ elements: |- '#type': select '#title': Country '#options': country_codes - '#default_value': 'United States' + '#default_value': US request_description: '#type': textarea '#title': 'Your request' From eefcfb2b2220601c5108244be4abb9126f17812f Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Thu, 28 Sep 2023 18:32:32 +0000 Subject: [PATCH 18/22] FOIA-389: More fixes. --- config/default/webform.webform.doj_fbi.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index 9d25af468..c6b3f29a5 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -19,12 +19,14 @@ elements: |- '#type': textfield '#title': 'First name' '#maxlength': 30 + '#required': true '#pattern': '^[a-zA-Z]+$' '#pattern_error': 'Please use only alphabetical characters.' name_last: '#type': textfield '#title': 'Last name' '#maxlength': 30 + '#required': true '#pattern': '^[a-zA-Z]+$' '#pattern_error': 'Please use only alphabetical characters.' company_organization: @@ -35,12 +37,6 @@ elements: |- required: ':input[name="fbi_requester_type"]': value: organization - email: - '#type': email - '#title': 'Email address' - '#help': |- - In order for us to communicate with you about your request,
    - you must provide at least one form of contact information. phone_number: '#type': tel '#title': 'Phone number' @@ -66,10 +62,14 @@ elements: |- address_state_province: '#type': textfield '#title': 'State or province' + '#pattern': '^[a-zA-Z]+$' + '#pattern_error': 'Please use only alphabetical characters.' address_zip_postal_code: '#type': textfield '#title': 'Zip or postal code' '#maxlength': 50 + '#pattern': '^[0-9]*$' + '#pattern_error': 'Please use only numeric characters.' address_country: '#type': select '#title': Country @@ -191,6 +191,8 @@ elements: |- '#type': textfield '#title': 'Deceased Individual''s First Name' '#maxlength': 30 + '#pattern': '^[a-zA-Z]+$' + '#pattern_error': 'Please use only alphabetical characters.' '#states': required: ':input[name="fbi_request_subject"]': @@ -202,7 +204,8 @@ elements: |- '#type': textfield '#title': 'Deceased Individual''s Middle Name' '#maxlength': 30 - '#pattern': '[a-zA-Z\-\,\ ]+[\.]?' + '#pattern': '^[a-zA-Z]+$' + '#pattern_error': 'Please use only alphabetical characters.' '#states': visible: ':input[name="fbi_request_subject"]': @@ -211,6 +214,8 @@ elements: |- '#type': textfield '#title': 'Deceased Individual''s Last Name' '#maxlength': 255 + '#pattern': '^[a-zA-Z]+$' + '#pattern_error': 'Please use only alphabetical characters.' '#states': required: ':input[name="fbi_request_subject"]': From a56131a41751674c6130a6bc25876d6bd132c831 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Fri, 29 Sep 2023 13:18:00 +0000 Subject: [PATCH 19/22] FOIA-389: Require address field. --- config/default/webform.webform.doj_fbi.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index c6b3f29a5..87b9f161c 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -51,6 +51,7 @@ elements: |- '#type': textfield '#title': 'Mailing address 1' '#maxlength': 50 + '#required': true address_line2: '#type': textfield '#title': 'Mailing address 2' @@ -59,21 +60,25 @@ elements: |- '#type': textfield '#title': City '#maxlength': 50 + '#required': true address_state_province: '#type': textfield '#title': 'State or province' + '#required': true '#pattern': '^[a-zA-Z]+$' '#pattern_error': 'Please use only alphabetical characters.' address_zip_postal_code: '#type': textfield '#title': 'Zip or postal code' '#maxlength': 50 + '#required': true '#pattern': '^[0-9]*$' '#pattern_error': 'Please use only numeric characters.' address_country: '#type': select '#title': Country '#options': country_codes + '#required': true '#default_value': US request_description: '#type': textarea From 5b7e0dcb1bd6575dd266c87ac6bb703972748a86 Mon Sep 17 00:00:00 2001 From: Brock Fanning Date: Fri, 29 Sep 2023 19:09:49 +0000 Subject: [PATCH 20/22] FOIA-389: Yes/no in options. --- config/default/webform.webform.doj_fbi.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/default/webform.webform.doj_fbi.yml b/config/default/webform.webform.doj_fbi.yml index 87b9f161c..5184155ba 100644 --- a/config/default/webform.webform.doj_fbi.yml +++ b/config/default/webform.webform.doj_fbi.yml @@ -304,7 +304,8 @@ elements: |- '#type': select '#title': 'By providing an electronic signature below I declare under penalty of perjury under the laws of the United States of America that the foregoing is true and correct, and that I am the person named above, and I understand that any falsification of this statement is punishable under the provisions of 18 U.S.C. Section 1001 by a fine of not more than $10,000 or by imprisonment of not more than five years or both, and that requesting or obtaining any record(s) under false pretenses is punishable under the provisions of 5 U.S.C. Section 552(a)(3) by a fine of not more than $5,000.' '#options': - 'yes': 'I agree' + 'yes': 'Yes' + 'no': 'No' '#states': required: ':input[name="fbi_request_subject"]': From 9536c719dd937e92ef911abb6352fc60158f30d2 Mon Sep 17 00:00:00 2001 From: Amir Meshkin Date: Wed, 4 Oct 2023 19:12:50 -0400 Subject: [PATCH 21/22] =?UTF-8?q?FOIA-238:=20WS-238=20Updated=20codebase?= =?UTF-8?q?=20with=20new=20button=20to=20make=20clearing=20an=E2=80=A6=20(?= =?UTF-8?q?#533)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * FOIA-238: WS-238 Updated codebase with new button to make clearing and updating values easier. * FOIA-238: WS-238- Updating file to pass php sniffer. * WS-238: Updating js code to cover textarea too. * FOIA-238: Still need to fix multiple components. * FOIA-238: Added dialog boxes and agency check. --------- Co-authored-by: brockfanning --- .../foia_annual_data_report.module | 2 +- .../js/foia-change-report-agency.js | 649 ++++++++++++++++-- .../Action/AnnualReportModerationAction.php | 8 +- .../modules/custom/foia_api/foia_api.module | 4 +- .../FoiaApiFiscalYearController.php | 6 +- .../FoiaApiQuarterlyFiscalYearController.php | 6 +- .../resource/WebformSubmissionResource.php | 2 +- .../src/Controller/ExportController.php | 2 +- .../src/Commands/FoiaFileCommands.php | 2 +- .../migrate/process/NewlineToLineBreak.php | 2 +- .../Controller/FoiaPersonnelController.php | 2 +- .../src/Entity/FoiaPersonnel.php | 6 +- .../src/Entity/FoiaPersonnelInterface.php | 4 +- .../src/FoiaPersonnelAccessControlHandler.php | 2 +- .../src/FoiaPersonnelStorage.php | 2 +- .../src/FoiaPersonnelStorageInterface.php | 2 +- .../foia_quarterly_data_report.module | 4 +- .../QuarterlyReportModerationAction.php | 8 +- .../foia_request/foia_request.drush.inc | 4 +- .../src/Commands/FoiaRequestCommands.php | 6 +- .../foia_request/src/Entity/FoiaRequest.php | 4 +- .../src/FoiaRequestAccessControlHandler.php | 2 +- .../src/Form/FoiaRequestPurgeForm.php | 2 +- docroot/modules/custom/foia_ui/foia_ui.module | 4 +- .../src/Commands/FoiaUploadXmlCommands.php | 8 +- ...UploadXmlMigrationPostImportSubscriber.php | 16 +- ...oadXmlPostImportCalculationsSubscriber.php | 6 +- .../FailedMigrationHandler/DefaultHandler.php | 2 +- .../src/FoiaUploadXmlBatchImport.php | 2 +- .../src/FoiaUploadXmlMigrateExecutable.php | 10 +- .../src/FoiaUploadXmlMigrationsProcessor.php | 6 +- .../src/FoiaUploadXmlReportParser.php | 2 +- .../src/Form/AgencyXmlUploadForm.php | 8 +- .../QueueWorker/FoiaXmlReportImportWorker.php | 6 +- .../Plugin/migrate/FoiaUploadXmlMigration.php | 2 +- .../src/Plugin/migrate/process/ArrayPad.php | 2 +- .../migrate/process/ComponentLookup.php | 2 +- .../Plugin/migrate/process/FilterValues.php | 2 +- .../src/ReportUploadValidator.php | 8 +- .../custom/foia_users/foia_users.module | 2 +- .../custom/foia_webform/foia_webform.module | 2 +- .../src/FoiaSubmissionPrettyFormatter.php | 2 +- .../src/FoiaSubmissionQueueingService.php | 2 +- .../FoiaEmailWebformHandler.php | 2 +- .../src/Kernel/AgencyLookupServiceTest.php | 8 +- .../tests/src/Kernel/FieldInstallTrait.php | 2 +- .../Kernel/FoiaSubmissionQueueHandlerTest.php | 8 +- .../Kernel/FoiaSubmissionQueueWorkerTest.php | 2 +- .../Kernel/FoiaSubmissionServiceApiTest.php | 8 +- .../custom/foia_workflow/foia_workflow.module | 2 +- .../node_to_docx/node_to_docx.theme.inc | 2 +- .../EventSubscriber/AutoloaderSubscriber.php | 2 +- .../node_to_docx/src/NodeToDocxHandler.php | 2 +- .../FieldEnhancer/WebformElementsEnhancer.php | 2 +- .../src/Functional/WebformNormalizerTest.php | 2 +- .../src/WebformTemplateController.php | 6 +- .../webform_template/webform_template.module | 2 +- 57 files changed, 701 insertions(+), 174 deletions(-) diff --git a/docroot/modules/custom/foia_annual_data_report/foia_annual_data_report.module b/docroot/modules/custom/foia_annual_data_report/foia_annual_data_report.module index 374d69d7e..cc10aa50c 100644 --- a/docroot/modules/custom/foia_annual_data_report/foia_annual_data_report.module +++ b/docroot/modules/custom/foia_annual_data_report/foia_annual_data_report.module @@ -8,9 +8,9 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Render\Element; use Drupal\Core\Render\Markup; use Drupal\Core\StringTranslation\TranslatableMarkup; -use Drupal\Core\Render\Element; /** * Implements hook_form_form_alter(). diff --git a/docroot/modules/custom/foia_annual_data_report/js/foia-change-report-agency.js b/docroot/modules/custom/foia_annual_data_report/js/foia-change-report-agency.js index 88d2fbc99..bc39191e6 100644 --- a/docroot/modules/custom/foia_annual_data_report/js/foia-change-report-agency.js +++ b/docroot/modules/custom/foia_annual_data_report/js/foia-change-report-agency.js @@ -5,135 +5,577 @@ (function ($, drupalSettings) { Drupal.behaviors.foia_change_report_agency = { attach: function attach() { - - var sections = [ + function genericWarning(title, btn, msg) { + dialogOptions = { + title: title, + width: 370, + height: 200, + buttons: { + button_resume: { + text: Drupal.t(btn), + click: function () { + $(this).dialog('close'); + } + }, + }, + close: function () { + $(this).remove(); + } + }; + $('
    ').appendTo('body') + .html(`
    ${msg}.
    `) + .dialog(dialogOptions); + } + const clearAllReportData = function (containId, overWriteFields = null) { + // Clear all sections data, + // clear individual section field will be in section clear function. + let dialogOptions; + // Loop through textareas and check for values + $('#' + containId + ' table tbody tr textarea:not([readonly]):not([type=hidden])').map(function () { + if (this.value) { + return this.value; + } + }).get(); + $('#' + containId + ' table tbody tr select[name*="field_agency_component"]:not([readonly]):not([type=hidden])').each(function(index, value) { + if (this.value === '_none') { + $(this).css('border', '1px solid #8B0100'); + return genericWarning('Select an Agency First', + 'Close', + 'Select an agency using the drop down for the section you are adding'); + } + }); + // Inputs, number fields and textareas that are not submit or readonly + let containerInputs = $('#' + containId + ' table tbody tr input:not([type=submit]):not([readonly]):not([type=hidden])'); + // If there are inputs for this container meaning component is filled out + if (typeof containerInputs !== 'undefined' && containerInputs.length > 0) { + // Count number of rows, check for N/A + const inputValues = containerInputs.map(function () { + if (this.value && typeof this.value !== 'undefined') { + return this.value; + } + }).get(); + // If data was already added manually then show error:inputValues.includes("N/A") + if (inputValues.length >= 1) { + return runManualWarning(); + } else { + // Run the foreach script if there are not any manual edits + $(this).css('border', 'none'); + runInputs(); + } + } else { + // Show error if "No Data to report for this section" was pressed + // without having populated any components + return runPlaceholderWarning(); + } + // Run only when needed since this code will run before user answers dialogue + function runInputs() { + $('#' + containId + ' table tbody tr input').each(function () { + if ($(this).is('[type=text]') && !$(this).attr('readonly')) { + $(this).val('N/A'); + if (overWriteFields !== null) { + for (let i = 0; i < overWriteFields.length; i++) { + let FieldIdPattern = overWriteFields[i].field; + let id = $(this).attr('id'); + if (id.match(FieldIdPattern)) { + $(this).val(overWriteFields[i].value); + break; + } + } + } + } + if ($(this).is('[type=number]') && (typeof $(this).attr('readonly') === "undefined")) { + $(this).val('0').trigger("change"); + } + }); + $('#' + containId + ' table tbody tr textarea').each(function () { + if (typeof $(this).attr('readonly') === "undefined") { + $(this).val('N/A'); + } + }); + } + function runManualWarning() { + dialogOptions = { + title: "Manual Changes Detected", + width: 370, + height: 200, + buttons: { + button_resume: { + text: Drupal.t('Close'), + click: function () { + $(this).dialog('close'); + } + }, + button_confirm: { + text: Drupal.t('Replace Anyway'), + click: function () { + runInputs() + $(this).dialog('close'); + }, + } + }, + close: function () { + $(this).remove(); + } + }; + $('
    ').appendTo('body') + .html('
    You have already entered data in this section. Please adjust the data manually.
    ') + .dialog(dialogOptions); + } + // Show warning about fields already being filled out + function runPlaceholderWarning() { + dialogOptions = { + title: "Add Placeholders First", + width: 370, + height: 200, + buttons: { + button_resume: { + text: Drupal.t('Close'), + click: function () { + $(this).dialog('close'); + } + }, + button_confirm: { + text: Drupal.t('Add Placeholders'), + click: function () { + $('#' + containId + " .component-placeholder-button").trigger("click"); + $(this).dialog('close'); + }, + } + }, + close: function () { + $(this).remove(); + } + }; + $('
    ').appendTo('body') + .html('
    Please press "Add placeholders for component data below" and try again.
    ') + .dialog(dialogOptions); + } + }; + const sections = [ { field: 'field_admin_app_vib', - paragraph: 'admin_app_vib', + paragraph: 'admin_app_vib', // VI.B + section: { + name: 'vib', + containerWrapper: 'edit-field-admin-app-vib-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_admin_app_vic1', - paragraph: 'admin_app_vic1', + paragraph: 'admin_app_vic1', // VI.C.1 + section: { + name: 'vic1', + containerWrapper: 'edit-field-admin-app-vic1-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_admin_app_vic2', - paragraph: 'admin_app_vic2', + paragraph: 'admin_app_vic2', // VI.C.2 + section: { + name: 'vic2', + containerWrapper: 'edit-field-admin-app-vic2-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_admin_app_vic3', - paragraph: 'admin_app_vic3', + paragraph: 'admin_app_vic3', // VI.C.3 + section: { + name: 'vic3', + containerWrapper: 'edit-field-admin-app-vic3-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_admin_app_vic4', - paragraph: 'admin_app_vic4', + paragraph: 'admin_app_vic4', // VI.C.4 + section: { + name: 'vic4', + containerWrapper: 'edit-field-admin-app-vic4-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_admin_app_vic5', - paragraph: 'oldest_days', + paragraph: 'oldest_days', // VI.C.5 + section: { + name: 'vic5', + containerWrapper: 'edit-field-admin-app-vic5-wrapper', + fnt: function () { + var fields = [ + { + field: '-subform-field-date-', + value: 'N/A', + }, + { + field: 'subform-field-num-days-', + value: '0', + }, + ]; + clearAllReportData(this.containerWrapper, fields); + }, + }, }, { field: 'field_admin_app_via', - paragraph: 'admin_app_via', + paragraph: 'admin_app_via', // VI.A + section: { + name: 'via', + containerWrapper: 'edit-field-admin-app-via-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_fees_x', - paragraph: 'fees_x', + paragraph: 'fees_x', // X + section: { + name: 'x', + containerWrapper: 'edit-field-fees-x-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_pers_costs_ix', - paragraph: 'foia_pers_costs_ix', + paragraph: 'foia_pers_costs_ix', // IX + section: { + name: 'ix', + containerWrapper: 'edit-field-foia-pers-costs-ix-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_xiia', - paragraph: 'foia_xiia', + paragraph: 'foia_xiia', // XII.A + section: { + name: 'xiia', + containerWrapper: 'edit-field-foia-xiia-wrapper', + fnt: function () { + var fields = [ + { + field: '-subform-field-back-app-end-yr-', + value: '0', + }, + ]; + clearAllReportData(this.containerWrapper, fields); + }, + }, }, { field: 'field_foia_xiib', - paragraph: 'foia_xiib', + paragraph: 'foia_xiib', // XII.B + section: { + name: 'xiib', + containerWrapper: 'edit-field-foia-xiib-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_xiic', - paragraph: 'oldest_days', + paragraph: 'oldest_days', // XII.C + section: { + name: 'xiic', + containerWrapper: 'edit-field-foia-xiic-wrapper', + fnt: function () { + var fields = [ + { + field: '-subform-field-num-days-', + value: '0', + }, + { + field: '-subform-field-date-', + value: 'N/A', + }, + ]; + clearAllReportData(this.containerWrapper, fields); + }, + }, }, { field: 'field_foia_xiid1', - paragraph: 'foia_xii_received_proc', + paragraph: 'foia_xii_received_proc', // XII.D.1 + section: { + name: 'xiid1', + containerWrapper: 'edit-field-foia-xiid1-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_xiid2', - paragraph: 'foia_xii_backlogged', + paragraph: 'foia_xii_backlogged', // XII.D.2 + section: { + name: 'xiid2', + containerWrapper: 'edit-field-foia-xiid2-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_xiie1', - paragraph: 'foia_xii_received_proc', + paragraph: 'foia_xii_received_proc', // XII.E.1 + section: { + name: 'xiie1', + containerWrapper: 'edit-field-foia-xiie1-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_xiie2', - paragraph: 'foia_xii_backlogged', + paragraph: 'foia_xii_backlogged', // XII.E.2 + section: { + name: 'xiie2', + containerWrapper: 'edit-field-foia-xiie2-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_requests_va', - paragraph: 'foia_req_va', + paragraph: 'foia_req_va', // V.A + section: + { + name: 'va', + containerWrapper: 'edit-field-foia-requests-va-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_requests_vb2', - paragraph: 'foia_req_vb2', + paragraph: 'foia_req_vb2', // V.B.2 + section: { + name: 'vb2', + containerWrapper: 'edit-field-foia-requests-vb2-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_requests_vb3', - paragraph: 'admin_app_vic1', + paragraph: 'admin_app_vic1', // V.B.3 + section: { + name: 'vb3', + containerWrapper: 'edit-field-foia-requests-vb3-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_foia_requests_vb1', - paragraph: 'foia_req_vb1', + paragraph: 'foia_req_vb1', // V.B.1 + section: { + name: 'vb1', + containerWrapper: 'edit-field-foia-requests-vb1-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_pending_requests_vii_d_', - paragraph: 'pending_requests_viid', + paragraph: 'pending_requests_viid', // VII.D + section: { + name: 'vii-d-', + containerWrapper: 'edit-field-pending-requests-vii-d-wrapper', + fnt: function () { + var fields = [ + { + field: '-subform-field-sim-pend-', + value: '0', + }, + { + field: '-subform-field-comp-med-', + value: 'N/A', + }, + { + field: '-subform-field-comp-avg-', + value: 'N/A', + }, + { + field: '-subform-field-sim-med-', + value: 'N/A', + }, + { + field: '-subform-field-sim-avg-', + value: 'N/A', + }, + { + field: '-subform-field-exp-med-', + value: 'N/A', + }, + { + field: '-subform-field-exp-avg-', + value: 'N/A', + }, + ]; + clearAllReportData(this.containerWrapper, fields); + }, + }, }, { field: 'field_admin_app_viie', - paragraph: 'oldest_days', + paragraph: 'oldest_days', // VII.E + section: { + name: 'viie', + containerWrapper: 'edit-field-admin-app-viie-wrapper', + fnt: function () { + var fields = [ + { + field: '-subform-field-date-', + value: 'N/A', + }, + { + field: '-subform-field-num-days-', + value: '0', + }, + ]; + clearAllReportData(this.containerWrapper, fields); + }, + }, }, { field: 'field_proc_req_viia', - paragraph: 'processed_requests_vii', + paragraph: 'processed_requests_vii', // VII.A + section: { + name: 'viia', + containerWrapper: 'edit-field-proc-req-viia-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_proc_req_viib', - paragraph: 'processed_requests_vii', + paragraph: 'processed_requests_vii', // VII.B + section: { + name: 'viib', + containerWrapper: 'edit-field-proc-req-viib-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_proc_req_viic1', - paragraph: 'proc_req_viic', + paragraph: 'proc_req_viic', // VII.C.1 + section: { + name: 'viic1', + containerWrapper: 'edit-field-proc-req-viic1-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_proc_req_viic2', - paragraph: 'proc_req_viic', + paragraph: 'proc_req_viic', // VII.C.2 + section: { + name: 'viic2', + containerWrapper: 'edit-field-proc-req-viic2-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_proc_req_viic3', - paragraph: 'proc_req_viic', + paragraph: 'proc_req_viic', // VII.C.3 + section: { + name: 'viic3', + containerWrapper: 'edit-field-proc-req-viic3-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_req_viiib', - paragraph: 'req_viiib', + paragraph: 'req_viiib', // VIII.B + section: { + name: 'viiib', + containerWrapper: 'edit-field-req-viiib-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_req_viiia', - paragraph: 'req_viiia', + paragraph: 'req_viiia', // VIII.A + section: { + name: 'viiia', + containerWrapper: 'edit-field-req-viiia-wrapper', + fnt: function () { + var fields = [ + { + field: '-subform-field-num-jud-w', + value: '0', + }, + ]; + clearAllReportData(this.containerWrapper, fields); + }, + }, }, { field: 'field_statute_iv', - paragraph: 'statute', + paragraph: 'statute', // IV + section: { + name: 'iv', + containerWrapper: 'edit-field-statute-iv-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_sub_xia', - paragraph: 'sub_xia', + paragraph: 'sub_xia', // XI.A + section: { + name: 'xia', + containerWrapper: 'edit-field-sub-xia-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, { field: 'field_sub_xib', - paragraph: 'sub_xib', + paragraph: 'sub_xib', // XI.B + section: { + name: 'xib', + containerWrapper: 'edit-field-sub-xib-wrapper', + fnt: function () { + clearAllReportData(this.containerWrapper); + }, + }, }, ]; for (var i = 0; i < sections.length; i++) { @@ -143,7 +585,7 @@ this.addClearDataButton(); }, - addClearDataButton: function() { + addClearDataButton: function () { function clearData() { var form = '#node-annual-foia-report-data-edit-form'; var exempt = '#edit-group-agency-info'; @@ -155,12 +597,31 @@ for (var i = 0; i < elements.length; i++) { $(form + ' ' + elements[i]).not(exempt + ' ' + elements[i]).val(''); } - alert('All data has been cleared from the form. Click "Save" to finalize.'); + dialogOptions = { + title: 'Form Fields Cleared', + width: 370, + height: 200, + buttons: { + button_resume: { + text: Drupal.t('Close'), + click: function () { + $(this).dialog('close'); + } + }, + }, + close: function () { + $(this).remove(); + } + }; + $('
    ').appendTo('body') + .html(`
    All data has been cleared from the form. Click "Save" to finalize.
    `) + .dialog(dialogOptions); + } - $('#edit-actions').once('foia-clear-data-button').each(function() { + $('#edit-actions').once('foia-clear-data-button').each(function () { var $button = $(''); $(this).append($button); - $button.click(function(evt) { + $button.click(function (evt) { evt.preventDefault(); if (confirm('Are you sure you want to clear all data from this report?')) { clearData(); @@ -169,34 +630,82 @@ }); }, - addPopulateComponentsButton: function(section) { + addPopulateComponentsButton: function (section) { // Anomaly - if a field ends in an underscore needs to be removed for the wrapper but maintained for other uses. var wrapperVar = section.field.replace(/_$/, ''); var fieldWrapperId = 'edit-' + wrapperVar.replace(/_/g, '-') + '-wrapper', - addMoreName = section.field + '_' + section.paragraph + '_add_more', - fieldWrapperSelector = '#' + fieldWrapperId, - addMoreSelector = 'input[name="' + addMoreName + '"]', - existingComponentSelector = fieldWrapperSelector + ' tbody tr:visible', - checkedComponentSelector = '#edit-field-agency-components input:checked', - getComponentDropdownName = function(index) { return section.field + '[' + index + '][subform]' }; - $(fieldWrapperSelector).once('foia-add-populate-button').each(function() { - $(this).prepend('
    Use this button when starting a new report, to quickly add placeholders for all of the components that you have selected in the checkboxes above.
    '); - var $button = $(''); - $(this).prepend($button); - $button.click(function(evt) { + addMoreName = section.field + '_' + section.paragraph + '_add_more', + fieldWrapperSelector = '#' + fieldWrapperId, + addMoreSelector = 'input[name="' + addMoreName + '"]', + existingComponentSelector = fieldWrapperSelector + ' tbody tr:visible', + checkedComponentSelector = '#edit-field-agency-components input:checked', + getComponentDropdownName = function (index) { return section.field + '[' + index + '][subform]' }; + $(fieldWrapperSelector).once('foia-add-populate-button').each(function () { + // Build buttons contain. + var sectionBtns = $('
    Use this button when starting a new report, to quickly add placeholders for all of the components that you have selected in the checkboxes above.
    Use this button to quickly fill 0 or N/A for components do not apply.
    '); + $(this).prepend(sectionBtns); + let componentPlaceholderButtonDiv = $(this).find('.section-button-group .component-placeholder-button-div'); + let noDataToReportDiv = $(this).find('.section-button-group .no-data-to-report-div'); + // Build component placeholder button. + let $placeholderButton = $(''); + componentPlaceholderButtonDiv.prepend($placeholderButton); + // Build no data report button. + let $noDataButton = $(''); + noDataToReportDiv.prepend($noDataButton); + $noDataButton.click(function (evt) { + evt.preventDefault(); + section.section.fnt(); + }); + $placeholderButton.click(function (evt) { evt.preventDefault(); var $components = $(checkedComponentSelector), - numComponents = $components.length, - currentComponent = 0, - singleComponent = $(existingComponentSelector).length === 1, - componentDropdownName = getComponentDropdownName(currentComponent), - componentDropdownSelector = 'select[name^="' + componentDropdownName + '"]', - blankComponent = singleComponent && $(componentDropdownSelector).val() === '_none'; + numComponents = $components.length, + currentComponent = 0, + singleComponent = $(existingComponentSelector).length === 1, + componentDropdownName = getComponentDropdownName(currentComponent), + componentDropdownSelector = 'select[name^="' + componentDropdownName + '"]', + blankComponent = singleComponent && $(componentDropdownSelector).val() === '_none'; if (numComponents === 0) { - alert('First select the components you want using the checkboxes above.'); + dialogOptions = { + title: 'Select an Agency First', + width: 370, + height: 200, + buttons: { + button_resume: { + text: Drupal.t('Close'), + click: function () { + $(this).dialog('close'); + } + }, + }, + close: function () { + $(this).remove(); + } + }; + $('
    ').appendTo('body') + .html(`
    First select the components you want using the checkboxes above.
    `) + .dialog(dialogOptions); } else if ($(existingComponentSelector).length > 0 && !blankComponent) { - alert('Placeholders cannot be added while there are existing entries. Please remove all entries and try again.'); + dialogOptions = { + title: 'Existing Entries', + width: 370, + height: 200, + buttons: { + button_resume: { + text: Drupal.t('Close'), + click: function () { + $(this).dialog('close'); + } + }, + }, + close: function () { + $(this).remove(); + } + }; + $('
    ').appendTo('body') + .html(`
    Placeholders cannot be added while there are existing entries. Please remove all entries and try again.
    `) + .dialog(dialogOptions); } else { function clickAddMoreButton() { @@ -213,10 +722,28 @@ clickAddMoreButton(); } else { - alert('Finished adding placeholders.'); + dialogOptions = { + title: 'Finished adding placeholders.', + width: 370, + height: 200, + buttons: { + button_resume: { + text: Drupal.t('close'), + click: function () { + $(this).dialog('close'); + } + }, + }, + close: function () { + $(this).remove(); + } + }; + $('
    ').appendTo('body') + .html(`
    You can now manually enter data or click the "No Data to report for this section" button.
    `) + .dialog(dialogOptions); } } - $(document).on('ajaxStop', function() { + $(document).on('ajaxStop', function () { if (currentComponent < numComponents) { populateNextComponent(currentComponent); } @@ -231,5 +758,5 @@ }); }); } - } + }; })(jQuery, drupalSettings); diff --git a/docroot/modules/custom/foia_annual_data_report/src/Plugin/Action/AnnualReportModerationAction.php b/docroot/modules/custom/foia_annual_data_report/src/Plugin/Action/AnnualReportModerationAction.php index 6145ca7cc..9e236fcaf 100644 --- a/docroot/modules/custom/foia_annual_data_report/src/Plugin/Action/AnnualReportModerationAction.php +++ b/docroot/modules/custom/foia_annual_data_report/src/Plugin/Action/AnnualReportModerationAction.php @@ -7,14 +7,14 @@ * Contains \Drupal\foia_annual_data_report\Plugin\Action\AnnualReportModerationAction. */ +use Drupal\content_moderation\ModerationInformationInterface; +use Drupal\content_moderation\StateTransitionValidationInterface; use Drupal\Core\Action\ActionBase; +use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Session\AccountInterface; -use Drupal\Core\Messenger\MessengerInterface; -use Drupal\content_moderation\ModerationInformationInterface; -use Drupal\content_moderation\StateTransitionValidationInterface; use Drupal\node\NodeInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Provides a a Publish foia annual reports action. diff --git a/docroot/modules/custom/foia_api/foia_api.module b/docroot/modules/custom/foia_api/foia_api.module index 0cd8ee199..b8e0ad602 100644 --- a/docroot/modules/custom/foia_api/foia_api.module +++ b/docroot/modules/custom/foia_api/foia_api.module @@ -5,11 +5,11 @@ * Main module file for FOIA API. */ -use Drupal\Core\Session\AccountInterface; -use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Access\AccessResultAllowed; use Drupal\Core\Database\Query\AlterableInterface; use Drupal\Core\Database\Query\ConditionInterface; +use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Session\AccountInterface; /** * Implements hook_jsonapi_ENTITY_TYPE_filter_access(). diff --git a/docroot/modules/custom/foia_api/src/Controller/FoiaApiFiscalYearController.php b/docroot/modules/custom/foia_api/src/Controller/FoiaApiFiscalYearController.php index 8b36ecc6b..32ee63a2f 100644 --- a/docroot/modules/custom/foia_api/src/Controller/FoiaApiFiscalYearController.php +++ b/docroot/modules/custom/foia_api/src/Controller/FoiaApiFiscalYearController.php @@ -2,11 +2,11 @@ namespace Drupal\foia_api\Controller; -use Drupal\Core\Database\Connection; -use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Cache\CacheableJsonResponse; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Controller\ControllerBase; +use Drupal\Core\Database\Connection; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Gets jsonapi data. diff --git a/docroot/modules/custom/foia_api/src/Controller/FoiaApiQuarterlyFiscalYearController.php b/docroot/modules/custom/foia_api/src/Controller/FoiaApiQuarterlyFiscalYearController.php index 21252caf6..f484ac4c2 100644 --- a/docroot/modules/custom/foia_api/src/Controller/FoiaApiQuarterlyFiscalYearController.php +++ b/docroot/modules/custom/foia_api/src/Controller/FoiaApiQuarterlyFiscalYearController.php @@ -2,11 +2,11 @@ namespace Drupal\foia_api\Controller; -use Drupal\Core\Database\Connection; -use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Cache\CacheableJsonResponse; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Controller\ControllerBase; +use Drupal\Core\Database\Connection; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Gets jsonapi data. diff --git a/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php b/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php index 14d7adb44..ca25fa854 100644 --- a/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php +++ b/docroot/modules/custom/foia_api/src/Plugin/rest/resource/WebformSubmissionResource.php @@ -10,8 +10,8 @@ use Drupal\file_entity\Entity\FileEntity; use Drupal\foia_webform\AgencyLookupServiceInterface; use Drupal\node\NodeInterface; -use Drupal\rest\Plugin\ResourceBase; use Drupal\rest\ModifiedResourceResponse; +use Drupal\rest\Plugin\ResourceBase; use Drupal\webform\Entity\Webform; use Drupal\webform\Plugin\WebformElementManagerInterface; use Drupal\webform\WebformInterface; diff --git a/docroot/modules/custom/foia_export_xml/src/Controller/ExportController.php b/docroot/modules/custom/foia_export_xml/src/Controller/ExportController.php index b47452f1d..dadd673ad 100644 --- a/docroot/modules/custom/foia_export_xml/src/Controller/ExportController.php +++ b/docroot/modules/custom/foia_export_xml/src/Controller/ExportController.php @@ -3,11 +3,11 @@ namespace Drupal\foia_export_xml\Controller; use Drupal\Core\Access\AccessResult; +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Controller\ControllerBase; use Drupal\foia_export_xml\ExportXml; use Drupal\node\Entity\Node; use Symfony\Component\HttpFoundation\Response; -use Drupal\Core\Cache\CacheBackendInterface; /** * Class ExportController for XML export. diff --git a/docroot/modules/custom/foia_file/src/Commands/FoiaFileCommands.php b/docroot/modules/custom/foia_file/src/Commands/FoiaFileCommands.php index 7a9021331..beb0530fb 100644 --- a/docroot/modules/custom/foia_file/src/Commands/FoiaFileCommands.php +++ b/docroot/modules/custom/foia_file/src/Commands/FoiaFileCommands.php @@ -2,8 +2,8 @@ namespace Drupal\foia_file\Commands; -use Drush\Commands\DrushCommands; use Drupal\file\Entity\File; +use Drush\Commands\DrushCommands; /** * A Drush commandfile. diff --git a/docroot/modules/custom/foia_migrate/src/Plugin/migrate/process/NewlineToLineBreak.php b/docroot/modules/custom/foia_migrate/src/Plugin/migrate/process/NewlineToLineBreak.php index 413c0ec21..5f0b0a787 100644 --- a/docroot/modules/custom/foia_migrate/src/Plugin/migrate/process/NewlineToLineBreak.php +++ b/docroot/modules/custom/foia_migrate/src/Plugin/migrate/process/NewlineToLineBreak.php @@ -2,9 +2,9 @@ namespace Drupal\foia_migrate\Plugin\migrate\process; -use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; /** diff --git a/docroot/modules/custom/foia_personnel/src/Controller/FoiaPersonnelController.php b/docroot/modules/custom/foia_personnel/src/Controller/FoiaPersonnelController.php index e3b465658..7a2cb5116 100644 --- a/docroot/modules/custom/foia_personnel/src/Controller/FoiaPersonnelController.php +++ b/docroot/modules/custom/foia_personnel/src/Controller/FoiaPersonnelController.php @@ -2,10 +2,10 @@ namespace Drupal\foia_personnel\Controller; -use Drupal\Core\Link; use Drupal\Component\Utility\Xss; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Link; use Drupal\Core\Url; use Drupal\foia_personnel\Entity\FoiaPersonnelInterface; diff --git a/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnel.php b/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnel.php index f6219ceca..4c2488ec2 100644 --- a/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnel.php +++ b/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnel.php @@ -2,11 +2,11 @@ namespace Drupal\foia_personnel\Entity; -use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\Core\Field\BaseFieldDefinition; -use Drupal\Core\Entity\RevisionableContentEntityBase; use Drupal\Core\Entity\EntityChangedTrait; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Entity\RevisionableContentEntityBase; +use Drupal\Core\Field\BaseFieldDefinition; use Drupal\user\UserInterface; /** diff --git a/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnelInterface.php b/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnelInterface.php index 7566443a6..8ec603f31 100644 --- a/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnelInterface.php +++ b/docroot/modules/custom/foia_personnel/src/Entity/FoiaPersonnelInterface.php @@ -2,9 +2,9 @@ namespace Drupal\foia_personnel\Entity; -use Drupal\Core\Entity\RevisionLogInterface; -use Drupal\Core\Entity\RevisionableInterface; use Drupal\Core\Entity\EntityChangedInterface; +use Drupal\Core\Entity\RevisionableInterface; +use Drupal\Core\Entity\RevisionLogInterface; use Drupal\user\EntityOwnerInterface; /** diff --git a/docroot/modules/custom/foia_personnel/src/FoiaPersonnelAccessControlHandler.php b/docroot/modules/custom/foia_personnel/src/FoiaPersonnelAccessControlHandler.php index c40bda032..e07d9f0f2 100644 --- a/docroot/modules/custom/foia_personnel/src/FoiaPersonnelAccessControlHandler.php +++ b/docroot/modules/custom/foia_personnel/src/FoiaPersonnelAccessControlHandler.php @@ -2,10 +2,10 @@ namespace Drupal\foia_personnel; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Entity\EntityAccessControlHandler; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Session\AccountInterface; -use Drupal\Core\Access\AccessResult; /** * Access controller for the FOIA Personnel entity. diff --git a/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorage.php b/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorage.php index d63253929..03cd09cee 100644 --- a/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorage.php +++ b/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorage.php @@ -3,8 +3,8 @@ namespace Drupal\foia_personnel; use Drupal\Core\Entity\Sql\SqlContentEntityStorage; -use Drupal\Core\Session\AccountInterface; use Drupal\Core\Language\LanguageInterface; +use Drupal\Core\Session\AccountInterface; use Drupal\foia_personnel\Entity\FoiaPersonnelInterface; /** diff --git a/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorageInterface.php b/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorageInterface.php index dc1ffefe5..9c60e372b 100644 --- a/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorageInterface.php +++ b/docroot/modules/custom/foia_personnel/src/FoiaPersonnelStorageInterface.php @@ -3,8 +3,8 @@ namespace Drupal\foia_personnel; use Drupal\Core\Entity\ContentEntityStorageInterface; -use Drupal\Core\Session\AccountInterface; use Drupal\Core\Language\LanguageInterface; +use Drupal\Core\Session\AccountInterface; use Drupal\foia_personnel\Entity\FoiaPersonnelInterface; /** diff --git a/docroot/modules/custom/foia_quarterly_data_report/foia_quarterly_data_report.module b/docroot/modules/custom/foia_quarterly_data_report/foia_quarterly_data_report.module index 2ebb499e1..6805e8ac7 100644 --- a/docroot/modules/custom/foia_quarterly_data_report/foia_quarterly_data_report.module +++ b/docroot/modules/custom/foia_quarterly_data_report/foia_quarterly_data_report.module @@ -5,11 +5,11 @@ * Primary module hooks for foia_quarterly_data_report module. */ +use Drupal\Core\Entity\EntityForm; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Render\Element; use Drupal\Core\Render\Markup; use Drupal\Core\StringTranslation\TranslatableMarkup; -use Drupal\Core\Entity\EntityForm; -use Drupal\Core\Render\Element; /** * Implements hook_form_form_id_alter(). diff --git a/docroot/modules/custom/foia_quarterly_data_report/src/Plugin/Action/QuarterlyReportModerationAction.php b/docroot/modules/custom/foia_quarterly_data_report/src/Plugin/Action/QuarterlyReportModerationAction.php index 9b9fbeb76..c550ba4ca 100644 --- a/docroot/modules/custom/foia_quarterly_data_report/src/Plugin/Action/QuarterlyReportModerationAction.php +++ b/docroot/modules/custom/foia_quarterly_data_report/src/Plugin/Action/QuarterlyReportModerationAction.php @@ -7,14 +7,14 @@ * Contains \Drupal\foia_quarterly_data_report\Plugin\Action\QuarterlyReportModerationAction. */ +use Drupal\content_moderation\ModerationInformationInterface; +use Drupal\content_moderation\StateTransitionValidationInterface; use Drupal\Core\Action\ActionBase; +use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Session\AccountInterface; -use Drupal\Core\Messenger\MessengerInterface; -use Drupal\content_moderation\ModerationInformationInterface; -use Drupal\content_moderation\StateTransitionValidationInterface; use Drupal\node\NodeInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * VBO Moderation state change. diff --git a/docroot/modules/custom/foia_request/foia_request.drush.inc b/docroot/modules/custom/foia_request/foia_request.drush.inc index 5e18d3c3c..0eeccd48e 100644 --- a/docroot/modules/custom/foia_request/foia_request.drush.inc +++ b/docroot/modules/custom/foia_request/foia_request.drush.inc @@ -5,10 +5,10 @@ * Drush command to update FOIA request submissions. */ -use Drupal\webform\Entity\WebformSubmission; use Drupal\file_entity\Entity\FileEntity; -use Drupal\foia_request\Entity\FoiaRequestInterface; use Drupal\foia_request\Entity\FoiaRequest; +use Drupal\foia_request\Entity\FoiaRequestInterface; +use Drupal\webform\Entity\WebformSubmission; /** * Implements hook_drush_command(). diff --git a/docroot/modules/custom/foia_request/src/Commands/FoiaRequestCommands.php b/docroot/modules/custom/foia_request/src/Commands/FoiaRequestCommands.php index 66e601b36..fba7a4a19 100644 --- a/docroot/modules/custom/foia_request/src/Commands/FoiaRequestCommands.php +++ b/docroot/modules/custom/foia_request/src/Commands/FoiaRequestCommands.php @@ -2,11 +2,11 @@ namespace Drupal\foia_request\Commands; -use Drush\Commands\DrushCommands; -use Drupal\webform\Entity\WebformSubmission; use Drupal\file_entity\Entity\FileEntity; -use Drupal\foia_request\Entity\FoiaRequestInterface; use Drupal\foia_request\Entity\FoiaRequest; +use Drupal\foia_request\Entity\FoiaRequestInterface; +use Drupal\webform\Entity\WebformSubmission; +use Drush\Commands\DrushCommands; /** * A Drush commandfile. diff --git a/docroot/modules/custom/foia_request/src/Entity/FoiaRequest.php b/docroot/modules/custom/foia_request/src/Entity/FoiaRequest.php index 83df45833..2d341f960 100644 --- a/docroot/modules/custom/foia_request/src/Entity/FoiaRequest.php +++ b/docroot/modules/custom/foia_request/src/Entity/FoiaRequest.php @@ -2,11 +2,11 @@ namespace Drupal\foia_request\Entity; -use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\EntityChangedTrait; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Field\BaseFieldDefinition; use Drupal\user\UserInterface; /** diff --git a/docroot/modules/custom/foia_request/src/FoiaRequestAccessControlHandler.php b/docroot/modules/custom/foia_request/src/FoiaRequestAccessControlHandler.php index 847e148fc..338750882 100644 --- a/docroot/modules/custom/foia_request/src/FoiaRequestAccessControlHandler.php +++ b/docroot/modules/custom/foia_request/src/FoiaRequestAccessControlHandler.php @@ -2,10 +2,10 @@ namespace Drupal\foia_request; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Entity\EntityAccessControlHandler; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Session\AccountInterface; -use Drupal\Core\Access\AccessResult; /** * Access controller for the FOIA Request entity. diff --git a/docroot/modules/custom/foia_request/src/Form/FoiaRequestPurgeForm.php b/docroot/modules/custom/foia_request/src/Form/FoiaRequestPurgeForm.php index e16613275..bbb8d4eab 100644 --- a/docroot/modules/custom/foia_request/src/Form/FoiaRequestPurgeForm.php +++ b/docroot/modules/custom/foia_request/src/Form/FoiaRequestPurgeForm.php @@ -4,8 +4,8 @@ use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\foia_request\Entity\FoiaRequestInterface; use Drupal\foia_request\Entity\FoiaRequest; +use Drupal\foia_request\Entity\FoiaRequestInterface; /** * Purge failed FOIA requests older than 2 weeks. diff --git a/docroot/modules/custom/foia_ui/foia_ui.module b/docroot/modules/custom/foia_ui/foia_ui.module index a79fc265d..d83787017 100644 --- a/docroot/modules/custom/foia_ui/foia_ui.module +++ b/docroot/modules/custom/foia_ui/foia_ui.module @@ -5,11 +5,11 @@ * FOIA UI module hook implementations. */ +use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Render\Element; use Drupal\Core\Url; use Drupal\node\Entity\Node; use Drupal\node\Entity\NodeType; -use Drupal\Core\Render\Element; -use Drupal\Core\Form\FormStateInterface; /** * Implements hook_toolbar_alter(). diff --git a/docroot/modules/custom/foia_upload_xml/src/Commands/FoiaUploadXmlCommands.php b/docroot/modules/custom/foia_upload_xml/src/Commands/FoiaUploadXmlCommands.php index 2d8036cab..5f5fd14a2 100644 --- a/docroot/modules/custom/foia_upload_xml/src/Commands/FoiaUploadXmlCommands.php +++ b/docroot/modules/custom/foia_upload_xml/src/Commands/FoiaUploadXmlCommands.php @@ -2,14 +2,14 @@ namespace Drupal\foia_upload_xml\Commands; -use Drupal\file\FileInterface; +use Consolidation\OutputFormatters\StructuredData\RowsOfFields; use Drupal\Core\Database\Connection; -use Drupal\migrate\Plugin\MigrateIdMapInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\foia_upload_xml\FoiaUploadXmlReportParser; use Drupal\Core\Logger\LoggerChannelFactoryInterface; +use Drupal\file\FileInterface; use Drupal\foia_upload_xml\FoiaUploadXmlMigrationsProcessor; -use Consolidation\OutputFormatters\StructuredData\RowsOfFields; +use Drupal\foia_upload_xml\FoiaUploadXmlReportParser; +use Drupal\migrate\Plugin\MigrateIdMapInterface; use Drush\Commands\DrushCommands; /** diff --git a/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlMigrationPostImportSubscriber.php b/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlMigrationPostImportSubscriber.php index 693cd665c..93e3c5d01 100644 --- a/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlMigrationPostImportSubscriber.php +++ b/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlMigrationPostImportSubscriber.php @@ -2,18 +2,18 @@ namespace Drupal\foia_upload_xml\EventSubscriber; -use Drupal\migrate\Row; +use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\Utility\Error; -use Drupal\migrate\MigrateMessage; -use Drupal\migrate\MigrateException; use Drupal\migrate\Event\MigrateEvents; use Drupal\migrate\Event\MigrateImportEvent; -use Drupal\Core\Messenger\MessengerInterface; -use Drupal\migrate\Plugin\MigrationInterface; -use Drupal\migrate\Plugin\MigrateIdMapInterface; -use Drupal\migrate\Event\MigratePreRowSaveEvent; use Drupal\migrate\Event\MigratePostRowSaveEvent; -use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\migrate\Event\MigratePreRowSaveEvent; +use Drupal\migrate\MigrateException; +use Drupal\migrate\MigrateMessage; +use Drupal\migrate\Plugin\MigrateIdMapInterface; +use Drupal\migrate\Plugin\MigrationInterface; +use Drupal\migrate\Row; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** diff --git a/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlPostImportCalculationsSubscriber.php b/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlPostImportCalculationsSubscriber.php index f925519a9..c2409bc94 100644 --- a/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlPostImportCalculationsSubscriber.php +++ b/docroot/modules/custom/foia_upload_xml/src/EventSubscriber/FoiaUploadXmlPostImportCalculationsSubscriber.php @@ -2,11 +2,11 @@ namespace Drupal\foia_upload_xml\EventSubscriber; -use Drupal\migrate\Row; -use Drupal\migrate\Event\MigrateEvents; +use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Messenger\MessengerInterface; +use Drupal\migrate\Event\MigrateEvents; use Drupal\migrate\Event\MigratePreRowSaveEvent; -use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\migrate\Row; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** diff --git a/docroot/modules/custom/foia_upload_xml/src/FailedMigrationHandler/DefaultHandler.php b/docroot/modules/custom/foia_upload_xml/src/FailedMigrationHandler/DefaultHandler.php index d67cb9e82..143b5e0e4 100644 --- a/docroot/modules/custom/foia_upload_xml/src/FailedMigrationHandler/DefaultHandler.php +++ b/docroot/modules/custom/foia_upload_xml/src/FailedMigrationHandler/DefaultHandler.php @@ -3,8 +3,8 @@ namespace Drupal\foia_upload_xml\FailedMigrationHandler; use Drupal\Core\Messenger\MessengerInterface; -use Drupal\migrate\Plugin\MigrationInterface; use Drupal\Core\StringTranslation\TranslationInterface; +use Drupal\migrate\Plugin\MigrationInterface; /** * A default FailedMigrationHandler. diff --git a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlBatchImport.php b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlBatchImport.php index aabcefae1..54339a408 100644 --- a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlBatchImport.php +++ b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlBatchImport.php @@ -2,10 +2,10 @@ namespace Drupal\foia_upload_xml; -use Drupal\file\FileInterface; use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Drupal\file\FileInterface; use Drupal\migrate\MigrateMessage; /** diff --git a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrateExecutable.php b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrateExecutable.php index 7d43767fa..afaa5963d 100644 --- a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrateExecutable.php +++ b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrateExecutable.php @@ -2,13 +2,13 @@ namespace Drupal\foia_upload_xml; -use Drupal\migrate\Row; +use Drupal\foia_upload_xml\FailedMigrationHandler\DefaultHandler; +use Drupal\foia_upload_xml\FailedMigrationHandler\SectionMissing; use Drupal\migrate\MigrateException; -use Drupal\migrate_tools\MigrateExecutable; -use Drupal\migrate\Plugin\MigrateIdMapInterface; use Drupal\migrate\Plugin\migrate\process\Extract; -use Drupal\foia_upload_xml\FailedMigrationHandler\SectionMissing; -use Drupal\foia_upload_xml\FailedMigrationHandler\DefaultHandler; +use Drupal\migrate\Plugin\MigrateIdMapInterface; +use Drupal\migrate\Row; +use Drupal\migrate_tools\MigrateExecutable; /** * Wrapper around MigrateExecutable that provides for better failure messaging. diff --git a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrationsProcessor.php b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrationsProcessor.php index ec796092c..b4c650054 100644 --- a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrationsProcessor.php +++ b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlMigrationsProcessor.php @@ -2,11 +2,11 @@ namespace Drupal\foia_upload_xml; -use Drupal\file\FileInterface; -use Drupal\migrate\MigrateMessage; +use Drupal\Component\Utility\NestedArray; use Drupal\Core\Cache\NullBackend; use Drupal\Core\Session\AccountInterface; -use Drupal\Component\Utility\NestedArray; +use Drupal\file\FileInterface; +use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateMessageInterface; use Drupal\migrate\Plugin\MigrationPluginManager; diff --git a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlReportParser.php b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlReportParser.php index 4bf033a2b..4adb9cce5 100644 --- a/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlReportParser.php +++ b/docroot/modules/custom/foia_upload_xml/src/FoiaUploadXmlReportParser.php @@ -2,8 +2,8 @@ namespace Drupal\foia_upload_xml; -use Drupal\file\FileInterface; use Drupal\Core\Entity\EntityTypeManager; +use Drupal\file\FileInterface; use Drupal\migrate_plus\DataParserPluginManager; /** diff --git a/docroot/modules/custom/foia_upload_xml/src/Form/AgencyXmlUploadForm.php b/docroot/modules/custom/foia_upload_xml/src/Form/AgencyXmlUploadForm.php index 252de8ecf..570407491 100644 --- a/docroot/modules/custom/foia_upload_xml/src/Form/AgencyXmlUploadForm.php +++ b/docroot/modules/custom/foia_upload_xml/src/Form/AgencyXmlUploadForm.php @@ -2,14 +2,14 @@ namespace Drupal\foia_upload_xml\Form; -use Drupal\file\FileInterface; -use Drupal\Core\File\FileSystemInterface; -use Drupal\foia_upload_xml\ReportUploadValidator; use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\Core\File\FileSystemInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\file\FileInterface; +use Drupal\foia_upload_xml\ReportUploadValidator; use Drupal\user\Entity\User; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Class AgencyXmlUploadForm. diff --git a/docroot/modules/custom/foia_upload_xml/src/Plugin/QueueWorker/FoiaXmlReportImportWorker.php b/docroot/modules/custom/foia_upload_xml/src/Plugin/QueueWorker/FoiaXmlReportImportWorker.php index 800390331..2bc798160 100644 --- a/docroot/modules/custom/foia_upload_xml/src/Plugin/QueueWorker/FoiaXmlReportImportWorker.php +++ b/docroot/modules/custom/foia_upload_xml/src/Plugin/QueueWorker/FoiaXmlReportImportWorker.php @@ -2,11 +2,11 @@ namespace Drupal\foia_upload_xml\Plugin\QueueWorker; -use Drupal\file\Entity\File; -use Drupal\user\Entity\User; +use Drupal\Core\File\Exception\FileNotExistsException; use Drupal\Core\Queue\QueueWorkerBase; use Drupal\Core\Queue\RequeueException; -use Drupal\Core\File\Exception\FileNotExistsException; +use Drupal\file\Entity\File; +use Drupal\user\Entity\User; /** * Import uploaded report xml files on cron. diff --git a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/FoiaUploadXmlMigration.php b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/FoiaUploadXmlMigration.php index 76faf24b4..fd8328724 100644 --- a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/FoiaUploadXmlMigration.php +++ b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/FoiaUploadXmlMigration.php @@ -2,10 +2,10 @@ namespace Drupal\foia_upload_xml\Plugin\migrate; +use Drupal\migrate\Exception\RequirementsException; use Drupal\migrate\Plugin\Migration; use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Plugin\RequirementsInterface; -use Drupal\migrate\Exception\RequirementsException; /** * Custom migration plugin for report xml upload processing. diff --git a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ArrayPad.php b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ArrayPad.php index 13c4e73a1..dac35707e 100644 --- a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ArrayPad.php +++ b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ArrayPad.php @@ -2,8 +2,8 @@ namespace Drupal\foia_upload_xml\Plugin\migrate\process; -use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; /** diff --git a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ComponentLookup.php b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ComponentLookup.php index 5aee0f993..7562b774e 100644 --- a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ComponentLookup.php +++ b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/ComponentLookup.php @@ -4,8 +4,8 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/FilterValues.php b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/FilterValues.php index bfb74ef8e..0f8404553 100644 --- a/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/FilterValues.php +++ b/docroot/modules/custom/foia_upload_xml/src/Plugin/migrate/process/FilterValues.php @@ -2,8 +2,8 @@ namespace Drupal\foia_upload_xml\Plugin\migrate\process; -use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; /** diff --git a/docroot/modules/custom/foia_upload_xml/src/ReportUploadValidator.php b/docroot/modules/custom/foia_upload_xml/src/ReportUploadValidator.php index 5a217a54b..68cf397a0 100644 --- a/docroot/modules/custom/foia_upload_xml/src/ReportUploadValidator.php +++ b/docroot/modules/custom/foia_upload_xml/src/ReportUploadValidator.php @@ -2,12 +2,12 @@ namespace Drupal\foia_upload_xml; -use Drupal\node\Entity\Node; -use Drupal\file\FileInterface; -use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\DependencyInjection\DependencySerializationTrait; use Drupal\Core\Entity\EntityTypeManager; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\Exception\MissingDataException; -use Drupal\Core\DependencyInjection\DependencySerializationTrait; +use Drupal\file\FileInterface; +use Drupal\node\Entity\Node; /** * Validates that an uploaded report can overwrite existing report data. diff --git a/docroot/modules/custom/foia_users/foia_users.module b/docroot/modules/custom/foia_users/foia_users.module index 720953265..114088fcf 100644 --- a/docroot/modules/custom/foia_users/foia_users.module +++ b/docroot/modules/custom/foia_users/foia_users.module @@ -6,9 +6,9 @@ */ use Drupal\Core\Access\AccessResult; -use Drupal\user\Entity\User; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Session\AccountInterface; +use Drupal\user\Entity\User; /** * Validates Office NID matching for users. diff --git a/docroot/modules/custom/foia_webform/foia_webform.module b/docroot/modules/custom/foia_webform/foia_webform.module index e0b1da4c0..508ed5e40 100644 --- a/docroot/modules/custom/foia_webform/foia_webform.module +++ b/docroot/modules/custom/foia_webform/foia_webform.module @@ -5,8 +5,8 @@ * FOIA Webform module. */ -use Drupal\webform\WebformInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\webform\WebformInterface; /** * Programmatically add the foia_submission_queue handler to new webforms. diff --git a/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php b/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php index cbd6f7ca3..ad288f1fd 100644 --- a/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php +++ b/docroot/modules/custom/foia_webform/src/FoiaSubmissionPrettyFormatter.php @@ -2,9 +2,9 @@ namespace Drupal\foia_webform; -use Drupal\webform\WebformSubmissionInterface; use Dompdf\Dompdf; use Drupal\file\Entity\File; +use Drupal\webform\WebformSubmissionInterface; /** * Class FoiaSubmissionPrettyFormatter. diff --git a/docroot/modules/custom/foia_webform/src/FoiaSubmissionQueueingService.php b/docroot/modules/custom/foia_webform/src/FoiaSubmissionQueueingService.php index 560d75dea..7f7e9097c 100644 --- a/docroot/modules/custom/foia_webform/src/FoiaSubmissionQueueingService.php +++ b/docroot/modules/custom/foia_webform/src/FoiaSubmissionQueueingService.php @@ -2,8 +2,8 @@ namespace Drupal\foia_webform; -use Drupal\foia_request\Entity\FoiaRequestInterface; use Drupal\Core\Queue\QueueFactory; +use Drupal\foia_request\Entity\FoiaRequestInterface; use Psr\Log\LoggerInterface; /** diff --git a/docroot/modules/custom/foia_webform/src/Plugin/WebformHandler/FoiaEmailWebformHandler.php b/docroot/modules/custom/foia_webform/src/Plugin/WebformHandler/FoiaEmailWebformHandler.php index 028673f27..84ad5a2ca 100644 --- a/docroot/modules/custom/foia_webform/src/Plugin/WebformHandler/FoiaEmailWebformHandler.php +++ b/docroot/modules/custom/foia_webform/src/Plugin/WebformHandler/FoiaEmailWebformHandler.php @@ -3,10 +3,10 @@ namespace Drupal\foia_webform\Plugin\WebformHandler; use Drupal\Core\Render\Markup; +use Drupal\foia_webform\FoiaSubmissionPrettyFormatter; use Drupal\node\NodeInterface; use Drupal\webform\Plugin\WebformHandler\EmailWebformHandler; use Drupal\webform\WebformSubmissionInterface; -use Drupal\foia_webform\FoiaSubmissionPrettyFormatter; /** * Emails a webform submission. diff --git a/docroot/modules/custom/foia_webform/tests/src/Kernel/AgencyLookupServiceTest.php b/docroot/modules/custom/foia_webform/tests/src/Kernel/AgencyLookupServiceTest.php index dc93a048b..28824b4a3 100644 --- a/docroot/modules/custom/foia_webform/tests/src/Kernel/AgencyLookupServiceTest.php +++ b/docroot/modules/custom/foia_webform/tests/src/Kernel/AgencyLookupServiceTest.php @@ -2,12 +2,12 @@ namespace Drupal\Tests\foia_webform\Kernel; -use Drupal\KernelTests\KernelTestBase; +use Drupal\field\Entity\FieldConfig; +use Drupal\field\Entity\FieldStorageConfig; use Drupal\foia_webform\AgencyLookupService; -use Drupal\node\Entity\NodeType; +use Drupal\KernelTests\KernelTestBase; use Drupal\node\Entity\Node; -use Drupal\field\Entity\FieldStorageConfig; -use Drupal\field\Entity\FieldConfig; +use Drupal\node\Entity\NodeType; use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; diff --git a/docroot/modules/custom/foia_webform/tests/src/Kernel/FieldInstallTrait.php b/docroot/modules/custom/foia_webform/tests/src/Kernel/FieldInstallTrait.php index 8180c5839..6bf2a0177 100644 --- a/docroot/modules/custom/foia_webform/tests/src/Kernel/FieldInstallTrait.php +++ b/docroot/modules/custom/foia_webform/tests/src/Kernel/FieldInstallTrait.php @@ -2,8 +2,8 @@ namespace Drupal\Tests\foia_webform\Kernel; -use Drupal\field\Entity\FieldStorageConfig; use Drupal\field\Entity\FieldConfig; +use Drupal\field\Entity\FieldStorageConfig; /** * Trait FieldInstallTrait installs fields from config. diff --git a/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueHandlerTest.php b/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueHandlerTest.php index 73b45dd44..2b17ed2f0 100644 --- a/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueHandlerTest.php +++ b/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueHandlerTest.php @@ -2,16 +2,16 @@ namespace Drupal\Tests\foia_webform\Kernel; +use Drupal\file\Entity\File; use Drupal\foia_request\Entity\FoiaRequest; use Drupal\foia_request\Entity\FoiaRequestInterface; use Drupal\KernelTests\KernelTestBase; +use Drupal\node\Entity\Node; +use Drupal\node\Entity\NodeType; +use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; use Drupal\webform\Entity\Webform; use Drupal\webform\Entity\WebformSubmission; -use Drupal\node\Entity\NodeType; -use Drupal\node\Entity\Node; -use Drupal\taxonomy\Entity\Term; -use Drupal\file\Entity\File; /** * Class FoiaSubmissionQueueHandlerTest testing for FoiaSubmissionQueueHandler. diff --git a/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueWorkerTest.php b/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueWorkerTest.php index 12fedd85e..fdff56aba 100644 --- a/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueWorkerTest.php +++ b/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionQueueWorkerTest.php @@ -2,10 +2,10 @@ namespace Drupal\Tests\foia_webform\Kernel; +use Drupal\foia_request\Entity\FoiaRequest; use Drupal\foia_request\Entity\FoiaRequestInterface; use Drupal\foia_webform\FoiaSubmissionServiceApi; use Drupal\foia_webform\Plugin\QueueWorker\FoiaSubmissionQueueWorker; -use Drupal\foia_request\Entity\FoiaRequest; /** * Class FoiaSubmissionQueueWorkerTest. diff --git a/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionServiceApiTest.php b/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionServiceApiTest.php index b555c7fc9..29890da4f 100644 --- a/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionServiceApiTest.php +++ b/docroot/modules/custom/foia_webform/tests/src/Kernel/FoiaSubmissionServiceApiTest.php @@ -6,14 +6,16 @@ use Drupal\file_entity\Entity\FileEntity; use Drupal\file_entity\Entity\FileType; use Drupal\foia_request\Entity\FoiaRequest; +use Drupal\foia_webform\AgencyLookupService; use Drupal\foia_webform\FoiaSubmissionServiceApi; use Drupal\foia_webform\FoiaSubmissionServiceInterface; use Drupal\KernelTests\KernelTestBase; +use Drupal\node\Entity\Node; +use Drupal\node\Entity\NodeType; +use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; use Drupal\webform\Entity\Webform; use Drupal\webform\Entity\WebformSubmission; -use Drupal\node\Entity\NodeType; -use Drupal\node\Entity\Node; use Drupal\webform\WebformInterface; use GuzzleHttp\Client; use GuzzleHttp\Exception\RequestException; @@ -21,8 +23,6 @@ use GuzzleHttp\HandlerStack; use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Response; -use Drupal\foia_webform\AgencyLookupService; -use Drupal\taxonomy\Entity\Term; /** * Class FoiaSubmissionServiceApiTest. diff --git a/docroot/modules/custom/foia_workflow/foia_workflow.module b/docroot/modules/custom/foia_workflow/foia_workflow.module index 36937e79b..72bbd4da8 100644 --- a/docroot/modules/custom/foia_workflow/foia_workflow.module +++ b/docroot/modules/custom/foia_workflow/foia_workflow.module @@ -6,8 +6,8 @@ */ use Drupal\core\Access\AccessResult; -use Drupal\node\NodeInterface; use Drupal\Core\Session\AccountInterface; +use Drupal\node\NodeInterface; use Drupal\user\Entity\User; /** diff --git a/docroot/modules/custom/node_to_docx/node_to_docx.theme.inc b/docroot/modules/custom/node_to_docx/node_to_docx.theme.inc index 8369db792..6b9eb9c5b 100644 --- a/docroot/modules/custom/node_to_docx/node_to_docx.theme.inc +++ b/docroot/modules/custom/node_to_docx/node_to_docx.theme.inc @@ -6,8 +6,8 @@ */ use Drupal\Core\Render\Element; -use Drupal\node\Entity\Node; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\node\Entity\Node; /** * Set variables. diff --git a/docroot/modules/custom/node_to_docx/src/EventSubscriber/AutoloaderSubscriber.php b/docroot/modules/custom/node_to_docx/src/EventSubscriber/AutoloaderSubscriber.php index 7c8568e68..a69544f58 100644 --- a/docroot/modules/custom/node_to_docx/src/EventSubscriber/AutoloaderSubscriber.php +++ b/docroot/modules/custom/node_to_docx/src/EventSubscriber/AutoloaderSubscriber.php @@ -3,8 +3,8 @@ namespace Drupal\node_to_docx\EventSubscriber; use Drupal\Component\Render\FormattableMarkup; -use Phpdocx\AutoLoader; use Drupal\Core\Logger\RfcLogLevel; +use Phpdocx\AutoLoader; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; diff --git a/docroot/modules/custom/node_to_docx/src/NodeToDocxHandler.php b/docroot/modules/custom/node_to_docx/src/NodeToDocxHandler.php index 4b4257fae..1db3ebacf 100644 --- a/docroot/modules/custom/node_to_docx/src/NodeToDocxHandler.php +++ b/docroot/modules/custom/node_to_docx/src/NodeToDocxHandler.php @@ -3,8 +3,8 @@ namespace Drupal\node_to_docx; use Drupal\Core\Url; -use Phpdocx\Create\CreateDocx; use Drupal\node\NodeInterface; +use Phpdocx\Create\CreateDocx; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerAwareTrait; use Symfony\Component\HttpFoundation\RedirectResponse; diff --git a/docroot/modules/custom/webform_serialization/src/Plugin/jsonapi/FieldEnhancer/WebformElementsEnhancer.php b/docroot/modules/custom/webform_serialization/src/Plugin/jsonapi/FieldEnhancer/WebformElementsEnhancer.php index 68965bf9d..bc43323e3 100644 --- a/docroot/modules/custom/webform_serialization/src/Plugin/jsonapi/FieldEnhancer/WebformElementsEnhancer.php +++ b/docroot/modules/custom/webform_serialization/src/Plugin/jsonapi/FieldEnhancer/WebformElementsEnhancer.php @@ -4,8 +4,8 @@ use Drupal\Core\Serialization\Yaml; use Drupal\jsonapi_extras\Plugin\ResourceFieldEnhancerBase; -use Shaper\Util\Context; use Drupal\webform\Entity\WebformOptions; +use Shaper\Util\Context; /** * Decode YAML content. diff --git a/docroot/modules/custom/webform_serialization/tests/src/Functional/WebformNormalizerTest.php b/docroot/modules/custom/webform_serialization/tests/src/Functional/WebformNormalizerTest.php index ebde50545..653907cde 100644 --- a/docroot/modules/custom/webform_serialization/tests/src/Functional/WebformNormalizerTest.php +++ b/docroot/modules/custom/webform_serialization/tests/src/Functional/WebformNormalizerTest.php @@ -2,10 +2,10 @@ namespace Drupal\Tests\webform_serialization\Functional; +use Drupal\Component\Serialization\Json; use Drupal\Core\Session\AccountInterface; use Drupal\Tests\BrowserTestBase; use Drupal\webform\Entity\Webform; -use Drupal\Component\Serialization\Json; use Drupal\webform\Entity\WebformOptions; /** diff --git a/docroot/modules/custom/webform_template/src/WebformTemplateController.php b/docroot/modules/custom/webform_template/src/WebformTemplateController.php index 5772796e0..49ec21fb8 100644 --- a/docroot/modules/custom/webform_template/src/WebformTemplateController.php +++ b/docroot/modules/custom/webform_template/src/WebformTemplateController.php @@ -2,11 +2,11 @@ namespace Drupal\webform_template; -use Drupal\webform\Entity\Webform; -use Drupal\webform\WebformInterface; -use Drupal\Core\Serialization\Yaml; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Serialization\Yaml; +use Drupal\webform\Entity\Webform; +use Drupal\webform\WebformInterface; /** * The Webform Template Controller. diff --git a/docroot/modules/custom/webform_template/webform_template.module b/docroot/modules/custom/webform_template/webform_template.module index 3d3870274..0b1f3d2a8 100644 --- a/docroot/modules/custom/webform_template/webform_template.module +++ b/docroot/modules/custom/webform_template/webform_template.module @@ -6,8 +6,8 @@ */ use Drupal\Core\Entity\EntityInterface; -use Drupal\webform\WebformInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\webform\WebformInterface; /** * Implements hook_webform_insert(). From 708d3a29d70f5fa59347aebd1bcb8f2c92c83f5c Mon Sep 17 00:00:00 2001 From: Amir Meshkin Date: Tue, 10 Oct 2023 09:23:35 -0400 Subject: [PATCH 22/22] FOIA-440: Updating drupal to 9.5.11 for security update. --- composer.json | 6 +- composer.lock | 539 +++++++++++++++++++++++++------------------------- 2 files changed, 271 insertions(+), 274 deletions(-) diff --git a/composer.json b/composer.json index 793c6dc28..1adf61d7c 100644 --- a/composer.json +++ b/composer.json @@ -25,9 +25,9 @@ "drupal/cog": "^1.15", "drupal/config_split": "^1.7.0", "drupal/core": "^9.5.8", - "drupal/core-composer-scaffold": "^9.5.8", - "drupal/core-project-message": "^9.5.8", - "drupal/core-recommended": "^9.5.8", + "drupal/core-composer-scaffold": "9.5.11", + "drupal/core-project-message": "9.5.11", + "drupal/core-recommended": "9.5.11", "drupal/devel": "^5.0.2", "drupal/entity_clone": "^2.0@beta", "drupal/entity_embed": "^1.0", diff --git a/composer.lock b/composer.lock index 3c18a4887..29f7dd2dd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a3d7aef34d3ff699eff179b23cdd5f56", + "content-hash": "be94357df3f96e8e5d8803ec399bb494", "packages": [ { "name": "acquia/blt", @@ -2402,25 +2402,29 @@ }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -2439,9 +2443,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/event-manager", @@ -2711,20 +2715,20 @@ }, { "name": "doctrine/reflection", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/reflection.git", - "reference": "1034e5e71f89978b80f9c1570e7226f6c3b9b6fb" + "reference": "6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/1034e5e71f89978b80f9c1570e7226f6c3b9b6fb", - "reference": "1034e5e71f89978b80f9c1570e7226f6c3b9b6fb", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7", + "reference": "6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", + "doctrine/annotations": "^1.0 || ^2.0", "ext-tokenizer": "*", "php": "^7.1 || ^8.0" }, @@ -2782,10 +2786,10 @@ ], "support": { "issues": "https://github.com/doctrine/reflection/issues", - "source": "https://github.com/doctrine/reflection/tree/1.2.3" + "source": "https://github.com/doctrine/reflection/tree/1.2.4" }, "abandoned": "roave/better-reflection", - "time": "2022-05-31T18:46:25+00:00" + "time": "2023-07-27T18:11:59+00:00" }, { "name": "dompdf/dompdf", @@ -4025,16 +4029,16 @@ }, { "name": "drupal/core", - "version": "9.5.8", + "version": "9.5.11", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "a9a1e4e1fe23fb8c83fd6aeafb740c1462a218fc" + "reference": "8afcb233c2a71501b35fed2713167c37831d5c19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/a9a1e4e1fe23fb8c83fd6aeafb740c1462a218fc", - "reference": "a9a1e4e1fe23fb8c83fd6aeafb740c1462a218fc", + "url": "https://api.github.com/repos/drupal/core/zipball/8afcb233c2a71501b35fed2713167c37831d5c19", + "reference": "8afcb233c2a71501b35fed2713167c37831d5c19", "shasum": "" }, "require": { @@ -4057,8 +4061,8 @@ "ext-tokenizer": "*", "ext-xml": "*", "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "laminas/laminas-diactoros": "^2.14", "laminas/laminas-feed": "^2.17", + "longwave/laminas-diactoros": "^2.14", "masterminds/html5": "^2.7", "pear/archive_tar": "^1.4.14", "php": ">=7.3.0", @@ -4186,22 +4190,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.8" + "source": "https://github.com/drupal/core/tree/9.5.11" }, - "time": "2023-04-19T16:14:39+00:00" + "time": "2023-09-19T17:58:28+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "9.5.8", + "version": "9.5.11", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "c78779acff7b39fc0f29ff1edd710361c15ed87b" + "reference": "08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/c78779acff7b39fc0f29ff1edd710361c15ed87b", - "reference": "c78779acff7b39fc0f29ff1edd710361c15ed87b", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7", + "reference": "08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7", "shasum": "" }, "require": { @@ -4236,13 +4240,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.8" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.11" }, - "time": "2023-03-09T21:29:23+00:00" + "time": "2023-04-30T16:17:33+00:00" }, { "name": "drupal/core-project-message", - "version": "9.5.8", + "version": "9.5.11", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -4277,22 +4281,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/9.5.8" + "source": "https://github.com/drupal/core-project-message/tree/9.5.11" }, "time": "2022-02-24T17:40:53+00:00" }, { "name": "drupal/core-recommended", - "version": "9.5.8", + "version": "9.5.11", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "74db3999d3432b7433b399fe76fa6ff6f126bed9" + "reference": "af3521be5376e333ddcdbd31c5a169f16423b46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/74db3999d3432b7433b399fe76fa6ff6f126bed9", - "reference": "74db3999d3432b7433b399fe76fa6ff6f126bed9", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/af3521be5376e333ddcdbd31c5a169f16423b46f", + "reference": "af3521be5376e333ddcdbd31c5a169f16423b46f", "shasum": "" }, "require": { @@ -4301,15 +4305,12 @@ "doctrine/annotations": "~1.13.3", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.5.8", + "drupal/core": "9.5.11", "egulias/email-validator": "~3.2.1", "guzzlehttp/guzzle": "~6.5.8", "guzzlehttp/promises": "~1.5.2", - "guzzlehttp/psr7": "~1.9.0", - "laminas/laminas-diactoros": "~2.14.0", - "laminas/laminas-escaper": "~2.9.0", - "laminas/laminas-feed": "~2.17.0", - "laminas/laminas-stdlib": "~3.11.0", + "guzzlehttp/psr7": "~1.9.1", + "longwave/laminas-diactoros": "~2.14.2", "masterminds/html5": "~2.7.6", "pear/archive_tar": "~1.4.14", "pear/console_getopt": "~v1.4.3", @@ -4363,9 +4364,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.5.8" + "source": "https://github.com/drupal/core-recommended/tree/9.5.11" }, - "time": "2023-04-19T16:14:39+00:00" + "time": "2023-09-19T17:58:28+00:00" }, { "name": "drupal/crop", @@ -11646,16 +11647,16 @@ }, { "name": "egulias/email-validator", - "version": "3.2.5", + "version": "3.2.6", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "b531a2311709443320c786feb4519cfaf94af796" + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796", - "reference": "b531a2311709443320c786feb4519cfaf94af796", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", "shasum": "" }, "require": { @@ -11701,7 +11702,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.5" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.6" }, "funding": [ { @@ -11709,7 +11710,7 @@ "type": "github" } ], - "time": "2023-01-02T17:26:14+00:00" + "time": "2023-06-01T07:04:22+00:00" }, { "name": "enlightn/security-checker", @@ -12394,16 +12395,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -12413,11 +12414,6 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -12458,7 +12454,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/1.5.3" }, "funding": [ { @@ -12474,7 +12470,7 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", @@ -12809,134 +12805,35 @@ }, "time": "2022-04-13T08:02:27+00:00" }, - { - "name": "laminas/laminas-diactoros", - "version": "2.14.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "6cb35f61913f06b2c91075db00f67cfd78869e28" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6cb35f61913f06b2c91075db00f67cfd78869e28", - "reference": "6cb35f61913f06b2c91075db00f67cfd78869e28", - "shasum": "" - }, - "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0" - }, - "conflict": { - "phpspec/prophecy": "<1.9.0", - "zendframework/zend-diactoros": "*" - }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-curl": "*", - "ext-dom": "*", - "ext-gd": "*", - "ext-libxml": "*", - "http-interop/http-factory-tests": "^0.9.0", - "laminas/laminas-coding-standard": "~2.3.0", - "php-http/psr7-integration-tests": "^1.1.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.24.0" - }, - "type": "library", - "extra": { - "laminas": { - "config-provider": "Laminas\\Diactoros\\ConfigProvider", - "module": "Laminas\\Diactoros" - } - }, - "autoload": { - "files": [ - "src/functions/create_uploaded_file.php", - "src/functions/marshal_headers_from_sapi.php", - "src/functions/marshal_method_from_sapi.php", - "src/functions/marshal_protocol_version_from_sapi.php", - "src/functions/marshal_uri_from_sapi.php", - "src/functions/normalize_server.php", - "src/functions/normalize_uploaded_files.php", - "src/functions/parse_cookie_header.php", - "src/functions/create_uploaded_file.legacy.php", - "src/functions/marshal_headers_from_sapi.legacy.php", - "src/functions/marshal_method_from_sapi.legacy.php", - "src/functions/marshal_protocol_version_from_sapi.legacy.php", - "src/functions/marshal_uri_from_sapi.legacy.php", - "src/functions/normalize_server.legacy.php", - "src/functions/normalize_uploaded_files.legacy.php", - "src/functions/parse_cookie_header.legacy.php" - ], - "psr-4": { - "Laminas\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://laminas.dev", - "keywords": [ - "http", - "laminas", - "psr", - "psr-17", - "psr-7" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-diactoros/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-diactoros/issues", - "rss": "https://github.com/laminas/laminas-diactoros/releases.atom", - "source": "https://github.com/laminas/laminas-diactoros" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2022-07-28T12:23:48+00:00" - }, { "name": "laminas/laminas-escaper", - "version": "2.9.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f" + "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/891ad70986729e20ed2e86355fcf93c9dc238a5f", - "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/af459883f4018d0f8a0c69c7a209daef3bf973ba", + "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "ext-ctype": "*", + "ext-mbstring": "*", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-escaper": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.12.2", - "vimeo/psalm": "^3.16" - }, - "suggest": { - "ext-iconv": "*", - "ext-mbstring": "*" + "infection/infection": "^0.27.0", + "laminas/laminas-coding-standard": "~2.5.0", + "maglnet/composer-require-checker": "^3.8.0", + "phpunit/phpunit": "^9.6.7", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.9" }, "type": "library", "autoload": { @@ -12968,20 +12865,20 @@ "type": "community_bridge" } ], - "time": "2021-09-02T17:10:53+00:00" + "time": "2023-10-10T08:35:13+00:00" }, { "name": "laminas/laminas-feed", - "version": "2.17.0", + "version": "2.21.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-feed.git", - "reference": "1ccb024ea615606ed1d676ba0fa3f22a398f3ac0" + "reference": "52918789a417bc292ccd6fbb4b91bd78a65d50ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/1ccb024ea615606ed1d676ba0fa3f22a398f3ac0", - "reference": "1ccb024ea615606ed1d676ba0fa3f22a398f3ac0", + "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/52918789a417bc292ccd6fbb4b91bd78a65d50ab", + "reference": "52918789a417bc292ccd6fbb4b91bd78a65d50ab", "shasum": "" }, "require": { @@ -12989,23 +12886,24 @@ "ext-libxml": "*", "laminas/laminas-escaper": "^2.9", "laminas/laminas-stdlib": "^3.6", - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "php": "~8.1.0 || ~8.2.0" }, "conflict": { "laminas/laminas-servicemanager": "<3.3", "zendframework/zend-feed": "*" }, "require-dev": { - "laminas/laminas-cache": "^2.7.2", - "laminas/laminas-coding-standard": "~2.2.1", - "laminas/laminas-db": "^2.13.3", - "laminas/laminas-http": "^2.15", - "laminas/laminas-servicemanager": "^3.7", - "laminas/laminas-validator": "^2.15", - "phpunit/phpunit": "^9.5.5", - "psalm/plugin-phpunit": "^0.13.0", - "psr/http-message": "^1.0.1", - "vimeo/psalm": "^4.1" + "laminas/laminas-cache": "^2.13.2 || ^3.10.1", + "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.2", + "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-db": "^2.18", + "laminas/laminas-http": "^2.18", + "laminas/laminas-servicemanager": "^3.21.0", + "laminas/laminas-validator": "^2.30.1", + "phpunit/phpunit": "^10.2.6", + "psalm/plugin-phpunit": "^0.18.4", + "psr/http-message": "^2.0", + "vimeo/psalm": "^5.13.1" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests", @@ -13025,11 +12923,13 @@ "license": [ "BSD-3-Clause" ], - "description": "provides functionality for consuming RSS and Atom feeds", + "description": "provides functionality for creating and consuming RSS and Atom feeds", "homepage": "https://laminas.dev", "keywords": [ + "atom", "feed", - "laminas" + "laminas", + "rss" ], "support": { "chat": "https://laminas.dev/chat", @@ -13045,30 +12945,30 @@ "type": "community_bridge" } ], - "time": "2022-03-24T10:26:04+00:00" + "time": "2023-07-24T09:21:16+00:00" }, { "name": "laminas/laminas-servicemanager", - "version": "3.20.0", + "version": "3.21.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59" + "reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", - "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/625f2aa3bc6dd02688b2da5155b3a69870812bda", + "reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda", "shasum": "" }, "require": { - "laminas/laminas-stdlib": "^3.2.1", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "laminas/laminas-stdlib": "^3.17", + "php": "~8.1.0 || ~8.2.0", "psr/container": "^1.0" }, "conflict": { "ext-psr": "*", - "laminas/laminas-code": "<3.3.1", + "laminas/laminas-code": "<4.10.0", "zendframework/zend-code": "<3.3.1", "zendframework/zend-servicemanager": "*" }, @@ -13080,18 +12980,19 @@ }, "require-dev": { "composer/package-versions-deprecated": "^1.11.99.5", - "laminas/laminas-coding-standard": "~2.4.0", + "friendsofphp/proxy-manager-lts": "^1.0.14", + "laminas/laminas-code": "^4.10.0", + "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-container-config-test": "^0.8", "laminas/laminas-dependency-plugin": "^2.2", - "mikey179/vfsstream": "^1.6.11@alpha", - "ocramius/proxy-manager": "^2.14.1", - "phpbench/phpbench": "^1.2.7", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "mikey179/vfsstream": "^1.6.11", + "phpbench/phpbench": "^1.2.9", + "phpunit/phpunit": "^10.0.17", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.8.0" }, "suggest": { - "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" + "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services" }, "bin": [ "bin/generate-deps-for-config-factory", @@ -13135,34 +13036,34 @@ "type": "community_bridge" } ], - "time": "2022-12-01T17:03:38+00:00" + "time": "2023-05-14T12:24:54+00:00" }, { "name": "laminas/laminas-stdlib", - "version": "3.11.0", + "version": "3.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f" + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f", - "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "phpbench/phpbench": "^1.0", - "phpunit/phpunit": "^9.3.7", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.7" + "laminas/laminas-coding-standard": "^2.5", + "phpbench/phpbench": "^1.2.14", + "phpunit/phpunit": "^10.3.3", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.15.0" }, "type": "library", "autoload": { @@ -13194,7 +13095,7 @@ "type": "community_bridge" } ], - "time": "2022-07-27T12:28:58+00:00" + "time": "2023-09-19T10:15:21+00:00" }, { "name": "laminas/laminas-text", @@ -13867,6 +13768,102 @@ ], "time": "2021-06-28T04:27:21+00:00" }, + { + "name": "longwave/laminas-diactoros", + "version": "2.14.2", + "source": { + "type": "git", + "url": "https://github.com/longwave/laminas-diactoros.git", + "reference": "ae4f0becf249ae8eea8f2f8f9fb927104e55a885" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/longwave/laminas-diactoros/zipball/ae4f0becf249ae8eea8f2f8f9fb927104e55a885", + "reference": "ae4f0becf249ae8eea8f2f8f9fb927104e55a885", + "shasum": "" + }, + "require": { + "php": "^7.3 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0" + }, + "conflict": { + "phpspec/prophecy": "<1.9.0", + "zendframework/zend-diactoros": "*" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" + }, + "replace": { + "laminas/laminas-diactoros": "2.18.1" + }, + "require-dev": { + "ext-curl": "*", + "ext-dom": "*", + "ext-gd": "*", + "ext-libxml": "*", + "http-interop/http-factory-tests": "^0.9.0", + "laminas/laminas-coding-standard": "~2.3.0", + "php-http/psr7-integration-tests": "^1.1.1", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" + }, + "type": "library", + "extra": { + "laminas": { + "config-provider": "Laminas\\Diactoros\\ConfigProvider", + "module": "Laminas\\Diactoros" + } + }, + "autoload": { + "files": [ + "src/functions/create_uploaded_file.php", + "src/functions/marshal_headers_from_sapi.php", + "src/functions/marshal_method_from_sapi.php", + "src/functions/marshal_protocol_version_from_sapi.php", + "src/functions/marshal_uri_from_sapi.php", + "src/functions/normalize_server.php", + "src/functions/normalize_uploaded_files.php", + "src/functions/parse_cookie_header.php", + "src/functions/create_uploaded_file.legacy.php", + "src/functions/marshal_headers_from_sapi.legacy.php", + "src/functions/marshal_method_from_sapi.legacy.php", + "src/functions/marshal_protocol_version_from_sapi.legacy.php", + "src/functions/marshal_uri_from_sapi.legacy.php", + "src/functions/normalize_server.legacy.php", + "src/functions/normalize_uploaded_files.legacy.php", + "src/functions/parse_cookie_header.legacy.php" + ], + "psr-4": { + "Laminas\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://laminas.dev", + "keywords": [ + "http", + "laminas", + "psr", + "psr-17", + "psr-7" + ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-diactoros/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-diactoros/issues", + "rss": "https://github.com/laminas/laminas-diactoros/releases.atom", + "source": "https://github.com/laminas/laminas-diactoros" + }, + "time": "2023-04-26T21:27:14+00:00" + }, { "name": "loophp/phposinfo", "version": "1.8.0", @@ -14889,16 +14886,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.1", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714" + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", "shasum": "" }, "require": { @@ -14941,9 +14938,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" }, - "time": "2023-03-27T19:02:04+00:00" + "time": "2023-08-12T11:01:26+00:00" }, { "name": "phpfastcache/riak-client", @@ -15103,16 +15100,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.20.2", + "version": "1.20.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "90490bd8fd8530a272043c4950c180b6d0cf5f81" + "reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/90490bd8fd8530a272043c4950c180b6d0cf5f81", - "reference": "90490bd8fd8530a272043c4950c180b6d0cf5f81", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd", + "reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd", "shasum": "" }, "require": { @@ -15142,9 +15139,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.20.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.4" }, - "time": "2023-04-22T12:59:35+00:00" + "time": "2023-05-02T09:19:37+00:00" }, { "name": "phpstan/phpstan", @@ -20083,16 +20080,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -20101,7 +20098,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -20139,7 +20136,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" }, "funding": [ { @@ -20155,20 +20152,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -20177,7 +20174,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -20218,7 +20215,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -20234,7 +20231,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", @@ -20321,16 +20318,16 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -20339,7 +20336,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -20380,7 +20377,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -20396,7 +20393,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", @@ -21206,16 +21203,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.22", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65", + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65", "shasum": "" }, "require": { @@ -21224,12 +21221,12 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<4.4" }, "require-dev": { "ext-iconv": "*", "symfony/console": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/process": "^4.4|^5.0|^6.0", "symfony/uid": "^5.1|^6.0", "twig/twig": "^2.13|^3.0.4" @@ -21275,7 +21272,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.29" }, "funding": [ { @@ -21291,20 +21288,20 @@ "type": "tidelift" } ], - "time": "2023-03-25T09:27:28+00:00" + "time": "2023-09-12T10:09:58+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.21", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "be74908a6942fdd331554b3cec27ff41b45ccad4" + "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/be74908a6942fdd331554b3cec27ff41b45ccad4", - "reference": "be74908a6942fdd331554b3cec27ff41b45ccad4", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/11401fe94f960249b3c63a488c63ba73091c1e4a", + "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a", "shasum": "" }, "require": { @@ -21348,7 +21345,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.21" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.26" }, "funding": [ { @@ -21364,7 +21361,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-07-20T07:21:16+00:00" }, { "name": "symfony/yaml", @@ -21603,16 +21600,16 @@ }, { "name": "twig/twig", - "version": "v2.15.4", + "version": "v2.15.5", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3" + "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e059001d6d597dd50ea7c74dd2464b4adea48d3", - "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", + "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", "shasum": "" }, "require": { @@ -21667,7 +21664,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.4" + "source": "https://github.com/twigphp/Twig/tree/v2.15.5" }, "funding": [ { @@ -21679,7 +21676,7 @@ "type": "tidelift" } ], - "time": "2022-12-27T12:26:20+00:00" + "time": "2023-05-03T17:49:41+00:00" }, { "name": "typo3/phar-stream-wrapper",