Skip to content

Commit

Permalink
upgrade symfony from 4.4 to 5.4 (openemr#6012)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bradymiller
bradymiller authored Dec 13, 2022
1 parent 164a706 commit 9dc161d
Showing 51 changed files with 416 additions and 564 deletions.
2 changes: 1 addition & 1 deletion apis/dispatch.php
View file
Original file line number Diff line number Diff line change
@@ -318,7 +318,7 @@

//Extend API using RestApiCreateEvent
$restApiCreateEvent = new RestApiCreateEvent($gbl::$ROUTE_MAP, $gbl::$FHIR_ROUTE_MAP, $gbl::$PORTAL_ROUTE_MAP, $restRequest);
$restApiCreateEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch(RestApiCreateEvent::EVENT_HANDLE, $restApiCreateEvent, 10);
$restApiCreateEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch($restApiCreateEvent, RestApiCreateEvent::EVENT_HANDLE, 10);
$gbl::$ROUTE_MAP = $restApiCreateEvent->getRouteMap();
$gbl::$FHIR_ROUTE_MAP = $restApiCreateEvent->getFHIRRouteMap();
$gbl::$PORTAL_ROUTE_MAP = $restApiCreateEvent->getPortalRouteMap();
15 changes: 7 additions & 8 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -62,14 +62,13 @@
"smarty/smarty": "4.3.0",
"steverhoades/oauth2-openid-connect-server": "2.4.0",
"stripe/stripe-php": "7.128.0",
"symfony/config": "4.4.44",
"symfony/console": "4.4.49",
"symfony/dependency-injection": "4.4.49",
"symfony/event-dispatcher": "4.4.44",
"symfony/event-dispatcher-contracts": "1.1.13",
"symfony/http-client": "4.4.49",
"symfony/http-foundation": "4.4.49",
"symfony/yaml": "4.4.45",
"symfony/config": "5.4.11",
"symfony/console": "5.4.16",
"symfony/dependency-injection": "5.4.16",
"symfony/event-dispatcher": "5.4.9",
"symfony/http-client": "5.4.16",
"symfony/http-foundation": "5.4.16",
"symfony/yaml": "5.4.16",
"twig/twig": "3.4.3",
"vlucas/phpdotenv": "5.5.0",
"waryway/php-traits-library": "1.0.4",
793 changes: 323 additions & 470 deletions composer.lock
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions interface/main/calendar/add_edit_event.php
View file
Original file line number Diff line number Diff line change
@@ -742,7 +742,7 @@ function setEventDate($start_date, $recurrence)
//Tell subscribers that a new multi appointment has been set
$patientAppointmentSetEvent = new AppointmentSetEvent($_POST);
$patientAppointmentSetEvent->eid = $e2f; //setting the appointment id to an object
$eventDispatcher->dispatch(AppointmentSetEvent::EVENT_HANDLE, $patientAppointmentSetEvent, 10);
$eventDispatcher->dispatch($patientAppointmentSetEvent, AppointmentSetEvent::EVENT_HANDLE, 10);
} else {
/* =======================================================
* INSERT NEW EVENT(S)
@@ -752,7 +752,7 @@ function setEventDate($start_date, $recurrence)
//Tell subscribers that a new single appointment has been set
$patientAppointmentSetEvent = new AppointmentSetEvent($_POST);
$patientAppointmentSetEvent->eid = $eid; //setting the appointment id to an object
$eventDispatcher->dispatch(AppointmentSetEvent::EVENT_HANDLE, $patientAppointmentSetEvent, 10);
$eventDispatcher->dispatch($patientAppointmentSetEvent, AppointmentSetEvent::EVENT_HANDLE, 10);
}

// done with EVENT insert/update statements
@@ -1094,7 +1094,7 @@ function sel_patient() {

// This invokes javascript listener.
<?php
$eventDispatcher->dispatch(AppointmentRenderEvent::RENDER_JAVASCRIPT, new AppointmentRenderEvent($row), 10);
$eventDispatcher->dispatch(new AppointmentRenderEvent($row), AppointmentRenderEvent::RENDER_JAVASCRIPT, 10);
?>

// This is for callback by the find-group popup.
@@ -1492,7 +1492,7 @@ function find_available(extra) {
</div>
<?php
// This invokes render below patient listener.
$eventDispatcher->dispatch(AppointmentRenderEvent::RENDER_BELOW_PATIENT, new AppointmentRenderEvent($row), 10);
$eventDispatcher->dispatch(new AppointmentRenderEvent($row), AppointmentRenderEvent::RENDER_BELOW_PATIENT, 10);
?>
</div>
</div> <!-- End Jumbotron !-->
2 changes: 1 addition & 1 deletion interface/main/calendar/modules/PostCalendar/pnuserapi.php
View file
Original file line number Diff line number Diff line change
@@ -926,7 +926,7 @@ function &postcalendar_userapi_pcQueryEvents($args)

// Custom filtering
$calFilterEvent = new CalendarFilterEvent();
$calFilterEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch(CalendarFilterEvent::EVENT_HANDLE, $calFilterEvent, 10);
$calFilterEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch($calFilterEvent, CalendarFilterEvent::EVENT_HANDLE, 10);
$calFilter = $calFilterEvent->getCustomWhereFilter();
$sql .= " AND $calFilter ";

2 changes: 1 addition & 1 deletion interface/main/finder/dynamic_finder_ajax.php
View file
Original file line number Diff line number Diff line change
@@ -201,7 +201,7 @@ function dateSearch($sSearch)
// This allows a module to subscribe to a 'patient-finder.filter' event and
// add filtering before data ever gets to the user
$patientFinderFilterEvent = new PatientFinderFilterEvent(new BoundFilter(), $aColumns, $columnFilters);
$patientFinderFilterEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch(PatientFinderFilterEvent::EVENT_HANDLE, $patientFinderFilterEvent, 10);
$patientFinderFilterEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch($patientFinderFilterEvent, PatientFinderFilterEvent::EVENT_HANDLE, 10);
$boundFilter = $patientFinderFilterEvent->getBoundFilter();
$customWhere = $boundFilter->getFilterClause();
$srch_bind = array_merge($boundFilter->getBoundValues(), $srch_bind);
2 changes: 1 addition & 1 deletion interface/main/finder/patient_select.php
View file
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@ function submitList(offset) {

// Custom filtering which enables module developer to filter patients out of search
$patientSelectFilterEvent = new PatientSelectFilterEvent(new BoundFilter());
$patientSelectFilterEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch(PatientSelectFilterEvent::EVENT_HANDLE, $patientSelectFilterEvent, 10);
$patientSelectFilterEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch($patientSelectFilterEvent, PatientSelectFilterEvent::EVENT_HANDLE, 10);
$boundFilter = $patientSelectFilterEvent->getBoundFilter();
$sqlBindArray = array_merge($boundFilter->getBoundValues(), $sqlBindArray);
$customWhere = $boundFilter->getFilterClause();
4 changes: 2 additions & 2 deletions interface/patient_file/report/patient_report.php
View file
Original file line number Diff line number Diff line change
@@ -272,7 +272,7 @@ function show_date_fun(){

<?php

$eventDispatcher->dispatch(PatientReportEvent::ACTIONS_RENDER_POST, new GenericEvent());
$eventDispatcher->dispatch(new GenericEvent(), PatientReportEvent::ACTIONS_RENDER_POST);

?>
<input type='hidden' name='pdf' value='0' />
@@ -755,7 +755,7 @@ function(data) {

<?php
//event dispatch
$eventDispatcher->dispatch(PatientReportEvent::JAVASCRIPT_READY_POST, new GenericEvent());
$eventDispatcher->dispatch(new GenericEvent(), PatientReportEvent::JAVASCRIPT_READY_POST);

?>

44 changes: 22 additions & 22 deletions interface/patient_file/summary/demographics.php
View file
Original file line number Diff line number Diff line change
@@ -965,7 +965,7 @@ function setMyPatient() {
<?php
// Create and fire the patient demographics view event
$viewEvent = new ViewEvent($pid);
$viewEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch(ViewEvent::EVENT_HANDLE, $viewEvent, 10);
$viewEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch($viewEvent, ViewEvent::EVENT_HANDLE, 10);
$thisauth = AclMain::aclCheckCore('patients', 'demo');

if (!$thisauth || !$viewEvent->authorized()) {
@@ -1011,7 +1011,7 @@ function setMyPatient() {
]);
endif;

$sectionRenderEvents = $ed->dispatch(SectionEvent::EVENT_HANDLE, new SectionEvent('primary'));
$sectionRenderEvents = $ed->dispatch(new SectionEvent('primary'), SectionEvent::EVENT_HANDLE);
$sectionCards = $sectionRenderEvents->getCards();

$t = $twig->getTwig();
@@ -1049,7 +1049,7 @@ function setMyPatient() {
$insurancebalance = get_patient_balance($pid, true) - $patientbalance;
$totalbalance = $patientbalance + $insurancebalance;
$id = "billing_ps_expand";
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('billing'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('billing'), CardRenderEvent::EVENT_HANDLE);
$viewArgs = [
'title' => xl('Billing'),
'id' => $id,
@@ -1078,10 +1078,10 @@ function setMyPatient() {
endif; // End the hide_billing_widget

// if anyone wants to render anything before the patient demographic list
$GLOBALS["kernel"]->getEventDispatcher()->dispatch(RenderEvent::EVENT_SECTION_LIST_RENDER_BEFORE, new RenderEvent($pid), 10);
$GLOBALS["kernel"]->getEventDispatcher()->dispatch(new RenderEvent($pid), RenderEvent::EVENT_SECTION_LIST_RENDER_BEFORE, 10);

if (AclMain::aclCheckCore('patients', 'demo')) :
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('demographic'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('demographic'), CardRenderEvent::EVENT_HANDLE);
// Render the Demographics box
$viewArgs = [
'title' => xl("Demographics"),
@@ -1166,7 +1166,7 @@ function setMyPatient() {
}

$id = "insurance_ps_expand";
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('insurance'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('insurance'), CardRenderEvent::EVENT_HANDLE);
$viewArgs = [
'title' => xl("Insurance"),
'id' => $id,
@@ -1188,7 +1188,7 @@ function setMyPatient() {
endif; // end if demographics authorized

if (AclMain::aclCheckCore('patients', 'notes')) :
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('note'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('note'), CardRenderEvent::EVENT_HANDLE);
// Notes expand collapse widget
$id = "pnotes_ps_expand";
$viewArgs = [
@@ -1208,7 +1208,7 @@ function setMyPatient() {

if (AclMain::aclCheckCore('patients', 'reminder') && $GLOBALS['enable_cdr'] && $GLOBALS['enable_cdr_prw']) :
// patient reminders collapse widget
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('reminder'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('reminder'), CardRenderEvent::EVENT_HANDLE);
$id = "patient_reminders_ps_expand";
$viewArgs = [
'title' => xl('Patient Reminders'),
@@ -1228,7 +1228,7 @@ function setMyPatient() {
if (AclMain::aclCheckCore('patients', 'disclosure')) :
$authWriteDisclosure = AclMain::aclCheckCore('patients', 'disclosure', '', 'write');
$authAddonlyDisclosure = AclMain::aclCheckCore('patients', 'disclosure', '', 'addonly');
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('disclosure'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('disclosure'), CardRenderEvent::EVENT_HANDLE);
// disclosures expand collapse widget
$id = "disclosures_ps_expand";
$viewArgs = [
@@ -1247,7 +1247,7 @@ function setMyPatient() {
endif; // end if disclosures authorized

if ($GLOBALS['amendments'] && AclMain::aclCheckCore('patients', 'amendment')) :
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('amendment'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('amendment'), CardRenderEvent::EVENT_HANDLE);
// Amendments widget
$sql = "SELECT * FROM amendments WHERE pid = ? ORDER BY amendment_date DESC";
$result = sqlStatement($sql, [$pid]);
@@ -1275,7 +1275,7 @@ function setMyPatient() {
endif; // end amendments authorized

if (AclMain::aclCheckCore('patients', 'lab')) :
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('lab'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('lab'), CardRenderEvent::EVENT_HANDLE);
// labdata expand collapse widget
// check to see if any labdata exist
$spruch = "SELECT procedure_report.date_collected AS date
@@ -1303,7 +1303,7 @@ function setMyPatient() {
endif; // end labs authorized

if ($vitals_is_registered && AclMain::aclCheckCore('patients', 'med')) :
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('vital_sign'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('vital_sign'), CardRenderEvent::EVENT_HANDLE);
// vitals expand collapse widget
// check to see if any vitals exist
$existVitals = sqlQuery("SELECT * FROM form_vitals WHERE pid=?", array($pid));
@@ -1326,7 +1326,7 @@ function setMyPatient() {
endif; // end vitals

// if anyone wants to render anything after the patient demographic list
$GLOBALS["kernel"]->getEventDispatcher()->dispatch(RenderEvent::EVENT_SECTION_LIST_RENDER_AFTER, new RenderEvent($pid), 10);
$GLOBALS["kernel"]->getEventDispatcher()->dispatch(new RenderEvent($pid), RenderEvent::EVENT_SECTION_LIST_RENDER_AFTER, 10);

// This generates a section similar to Vitals for each LBF form that
// supports charting. The form ID is used as the "widget label".
@@ -1353,7 +1353,7 @@ function setMyPatient() {
$widgetAuth = $existVitals;
}

$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent($gfrow['title']));
$dispatchResult = $ed->dispatch(new CardRenderEvent($gfrow['title']), CardRenderEvent::EVENT_HANDLE);
$viewArgs = [
'title' => xl($gfrow['title']),
'id' => $vitals_form_id,
@@ -1376,7 +1376,7 @@ function setMyPatient() {
// it's important enough to always show it
$portalCard = new PortalCard($GLOBALS);

$sectionRenderEvents = $ed->dispatch(SectionEvent::EVENT_HANDLE, new SectionEvent('secondary'));
$sectionRenderEvents = $ed->dispatch(new SectionEvent('secondary'), SectionEvent::EVENT_HANDLE);
$sectionCards = $sectionRenderEvents->getCards();

$t = $twig->getTwig();
@@ -1413,7 +1413,7 @@ function setMyPatient() {
}

if ($GLOBALS['erx_enable']) :
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('demographics'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('demographics'), CardRenderEvent::EVENT_HANDLE);
echo $twig->getTwig()->render('patient/partials/erx.html.twig', [
'prependedInjection' => $dispatchResult->getPrependedInjection(),
'appendedInjection' => $dispatchResult->getAppendedInjection(),
@@ -1424,7 +1424,7 @@ function setMyPatient() {
$photos = pic_array($pid, $GLOBALS['patient_photo_category_name']);
if ($photos or $idcard_doc_id) {
$id = "photos_ps_expand";
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('patient_photo'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('patient_photo'), CardRenderEvent::EVENT_HANDLE);
$viewArgs = [
'title' => xl("ID Card / Photos"),
'id' => $id,
@@ -1487,7 +1487,7 @@ function setMyPatient() {

$id = "adv_directives_ps_expand";

$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('advance_directive'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('advance_directive'), CardRenderEvent::EVENT_HANDLE);
$viewArgs = [
'title' => xl("Advance Directives"),
'id' => $id,
@@ -1513,7 +1513,7 @@ function setMyPatient() {
if (!empty($clin_rem_check) && $cdr && $cdr_crw && AclMain::aclCheckCore('patients', 'alert')) {
// clinical summary expand collapse widget
$id = "clinical_reminders_ps_expand";
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('clinical_reminders'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('clinical_reminders'), CardRenderEvent::EVENT_HANDLE);
$viewArgs = [
'title' => xl("Clinical Reminders"),
'id' => $id,
@@ -1685,7 +1685,7 @@ function setMyPatient() {
$count2++;
}
$id = "recall_ps_expand";
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('recall'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('recall'), CardRenderEvent::EVENT_HANDLE);
echo $twig->getTwig()->render('patient/card/recall.html.twig', [
'title' => xl('Recall'),
'id' => $id,
@@ -1779,7 +1779,7 @@ function setMyPatient() {

// Display the Appt card
$id = "appointments_ps_expand";
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('appointment'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('appointment'), CardRenderEvent::EVENT_HANDLE);
echo $twig->getTwig()->render('patient/card/appointments.html.twig', [
'title' => xl("Appointments"),
'id' => $id,
@@ -1811,7 +1811,7 @@ function setMyPatient() {
$spruch = "SELECT id FROM forms WHERE pid = ? AND formdir = ?";
$existTracks = sqlQuery($spruch, array($pid, "track_anything"));
$id = "track_anything_ps_expand";
$dispatchResult = $ed->dispatch(CardRenderEvent::EVENT_HANDLE, new CardRenderEvent('track_anything'));
$dispatchResult = $ed->dispatch(new CardRenderEvent('track_anything'), CardRenderEvent::EVENT_HANDLE);
echo $twig->getTwig()->render('patient/card/loader.html.twig', [
'title' => xl("Tracks"),
'id' => $id,
2 changes: 1 addition & 1 deletion interface/patient_file/summary/demographics_full.php
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
if ($pid) {
// Create and fire the patient demographics update event
$updateEvent = new UpdateEvent($pid);
$updateEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch(UpdateEvent::EVENT_HANDLE, $updateEvent, 10);
$updateEvent = $GLOBALS["kernel"]->getEventDispatcher()->dispatch($updateEvent, UpdateEvent::EVENT_HANDLE, 10);

if (
!$updateEvent->authorized() ||
Loading

0 comments on commit 9dc161d

Please sign in to comment.