Skip to content

Commit 144b491

Browse files
committed
Satisfy static tests
1 parent a9aab20 commit 144b491

File tree

1 file changed

+20
-11
lines changed
  • lib/internal/Magento/Framework/View/Element/Html

1 file changed

+20
-11
lines changed

lib/internal/Magento/Framework/View/Element/Html/Calendar.php

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,7 @@ protected function _toHtml()
109109
);
110110

111111
$this->assignFieldsValues($localeData);
112-
113-
// get "am" & "pm" words
114-
// AmPmMarkers and AmPmMarkersAbbr aren't guaranteed to exist, so fallback to null if neither exist
115-
$amWord = $localeData['calendar']['gregorian']['AmPmMarkers'][0] ??
116-
$localeData['calendar']['gregorian']['AmPmMarkersAbbr'][0] ??
117-
null;
118-
$pmWord = $localeData['calendar']['gregorian']['AmPmMarkers'][1] ??
119-
$localeData['calendar']['gregorian']['AmPmMarkersAbbr'][1] ??
120-
null;
121-
$this->assign('am', $this->encoder->encode($amWord));
122-
$this->assign('pm', $this->encoder->encode($pmWord));
112+
$this->assignAmPmWords($localeData);
123113

124114
// get first day of week and weekend days
125115
$this->assign(
@@ -216,4 +206,23 @@ private function assignFieldsValues(\ResourceBundle $localeData): void
216206
$this->assign('week', $this->encoder->encode($localeData['fields']['week']['dn']));
217207
}
218208
}
209+
210+
/**
211+
* Assign "am" & "pm" words from the ICU data
212+
*
213+
* @param \ResourceBundle $localeData
214+
*/
215+
private function assignAmPmWords(\ResourceBundle $localeData): void
216+
{
217+
// AmPmMarkers and AmPmMarkersAbbr aren't guaranteed to exist, so fallback to null if neither exist
218+
$amWord = $localeData['calendar']['gregorian']['AmPmMarkers'][0] ??
219+
$localeData['calendar']['gregorian']['AmPmMarkersAbbr'][0] ??
220+
null;
221+
$pmWord = $localeData['calendar']['gregorian']['AmPmMarkers'][1] ??
222+
$localeData['calendar']['gregorian']['AmPmMarkersAbbr'][1] ??
223+
null;
224+
225+
$this->assign('am', $this->encoder->encode($amWord));
226+
$this->assign('pm', $this->encoder->encode($pmWord));
227+
}
219228
}

0 commit comments

Comments
 (0)