Update Composer, update everything

web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php

@@ -67,6 +67,21 @@ class TelephoneLinkFormatter extends FormatterBase {
     $title_setting = $this->getSetting('title');
 
     foreach ($items as $delta => $item) {
+      // If the telephone number is 5 or less digits, parse_url() will think
+      // it's a port number rather than a phone number which causes the link
+      // formatter to throw an InvalidArgumentException. Avoid this by inserting
+      // a dash (-) after the first digit - RFC 3966 defines the dash as a
+      // visual separator character and so will be removed before the phone
+      // number is used. See https://bugs.php.net/bug.php?id=70588 for more.
+      // While the bug states this only applies to numbers <= 65535, a 5 digit
+      // number greater than 65535 will cause parse_url() to return FALSE so
+      // we need the work around on any 5 digit (or less) number.
+      // First we strip whitespace so we're counting actual digits.
+      $phone_number = preg_replace('/\s+/', '', $item->value);
+      if (strlen($phone_number) <= 5) {
+        $phone_number = substr_replace($phone_number, '-', 1, 0);
+      }
+
       // Render each element as link.
       $element[$delta] = [
         '#type' => 'link',
@@ -74,7 +89,7 @@ class TelephoneLinkFormatter extends FormatterBase {
         // itself as title.
         '#title' => $title_setting ?: $item->value,
         // Prepend 'tel:' to the telephone number.
-        '#url' => Url::fromUri('tel:' . rawurlencode(preg_replace('/\s+/', '', $item->value))),
+        '#url' => Url::fromUri('tel:' . rawurlencode($phone_number)),
         '#options' => ['external' => TRUE],
       ];
 

web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php

@@ -67,7 +67,7 @@ class TelephoneItem extends FieldItemBase {
         'Length' => [
           'max' => $max_length,
           'maxMessage' => t('%name: the telephone number may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
-        ]
+        ],
       ],
     ]);
 

web/core/modules/telephone/src/Plugin/migrate/field/d7/PhoneField.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\telephone\Plugin\migrate\field\d7;
+
+use Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase;
+
+/**
+ * @MigrateField(
+ *   id = "phone",
+ *   type_map = {
+ *     "phone" = "telephone",
+ *   },
+ *   core = {7},
+ *   source_module = "phone",
+ *   destination_module = "telephone"
+ * )
+ */
+class PhoneField extends FieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterMap() {
+    return [
+      'phone' => 'basic_string',
+    ];
+  }
+
+}