WebSVN – Moodle – Diff – /lib/classes/date.php

             return $tz;
+        }
         // Is server timezone usable?
         if (isset($CFG->timezone) and !is_numeric($CFG->timezone)) {
-            $result = @timezone_open($CFG->timezone); // Hide notices if invalid.
+            $result = timezone_open($CFG->timezone); // Hide notices if invalid.
             if ($result !== false) {
                 return $result->getName();
+            }
      */
     public static function phpunit_override_default_php_timezone($tz) {
         if (!defined('PHPUNIT_TEST')) {
             throw new coding_exception('core_date::phpunit_override_default_php_timezone() must be used only from unit tests');
+        }
-        $result = timezone_open($tz ?? ''); // This triggers error if $tz invalid.
+        $result = @timezone_open($tz ?? ''); // This triggers error if $tz invalid.
         if ($result !== false) {
             self::$defaultphptimezone = $tz;
         } else {
             self::$defaultphptimezone = 'Australia/Perth';
+        }
         $locale = preg_replace('/[^\w-].*$/', '', $locale);
         $intl_formats = [
           '%a' => 'EEE',	// An abbreviated textual representation of the day	Sun through Sat
-          '%A' => 'EEEE',	// A full textual representation of the day	Sunday through Saturday
-          '%b' => 'MMM',	// Abbreviated month name, based on the locale	Jan through Dec
-          '%B' => 'MMMM',	// Full month name, based on the locale	January through December
-          '%h' => 'MMM',	// Abbreviated month name, based on the locale (an alias of %b)	Jan through Dec
+          '%A' => 'EEEE',	// A full textual representation of the day	Sunday through Saturday
+        ];
-        ];
+        $originalformat = $format;
+        $intl_formatter = function (DateTimeInterface $timestamp, string $format) use (
+            $intl_formats,
+            $locale,
-        $intl_formatter = function (DateTimeInterface $timestamp, string $format) use ($intl_formats, $locale) {
+            $originalformat,
         ) {
           // Map IANA timezone DB names (used by PHP) to those used internally by the "intl" extension. The extension uses its
           // own data based on ICU timezones, which may not necessarily be in-sync with IANA depending on the version installed
           // on the local system. See: https://unicode-org.github.io/icu/userguide/datetime/timezone/#updating-the-time-zone-data
           $tz = $timestamp->getTimezone();
           $intltz = IntlTimeZone::fromDateTimeZone($tz);
           if ($intltz === null) {
+              // Where intl doesn't know about a recent timezone, map it to an equivalent existing zone.
-              // Where intl doesn't know about a recent timezone, map it to an equivalent existing zone.
+              $intltzname = strtr($tz->getName(), [
-              $intltzname = strtr($tz->getName(), [
+                  'America/Coyhaique' => 'America/Santiago',
                   'America/Ciudad_Juarez' => 'America/Denver',
                   'America/Nuuk' => 'America/Godthab',
                   'Europe/Kyiv' => 'Europe/Kiev',
             case '%X':
               $date_type = IntlDateFormatter::NONE;
               $time_type = IntlDateFormatter::MEDIUM;
               break;
+            case "%B":
+            case "%b":
+            case "%h":
+                // Check for any day (%d, or %e) in the string.
+                if (preg_match('/%[de]/', $originalformat)) {
+                    // The day is present so use the standard format.
+                    $pattern = $format === '%B' ? 'MMMM' : 'MMM';
+                } else {
+                    // The day is not present so use the stand-alone format.
+                    $pattern = $format === '%B' ? 'LLLL' : 'LLL';
+                }
+                break;
             default:
               $pattern = $intl_formats[$format];
+          }
           //  in formatted strings.
           // To adjust for this, a custom calendar can be supplied with a cutover date arbitrarily far in the past.
           $calendar = IntlGregorianCalendar::createInstance($intltz);
           $calendar->setGregorianChange(PHP_INT_MIN);
+          // We need to account for invalid locales here in recent PHP versions, and ensure we catch errors and switch
+          // back to a default value where an invalid locale is provided.
+          try {
+              $formatter = new IntlDateFormatter($locale, $date_type, $time_type, $intltz, $calendar, $pattern);
+              $result = $formatter->format($timestamp);
+          } catch (Error $e) {
+              $formatter = new IntlDateFormatter(null, $date_type, $time_type, $intltz, $calendar, $pattern);
+              $result = $formatter->format($timestamp);
+          }
-          return (new IntlDateFormatter($locale, $date_type, $time_type, $intltz, $calendar, $pattern))->format($timestamp);
+          return $result;
         };
         // Same order as https://www.php.net/manual/en/function.strftime.php

Proyectos de Subversion Moodle

(root)/lib/classes/date.php – Rev 1 → 1441