diff --git a/payment/uc_2checkout/uc_2checkout.module b/payment/uc_2checkout/uc_2checkout.module
index 2799b66..ab58284 100644
--- a/payment/uc_2checkout/uc_2checkout.module
+++ b/payment/uc_2checkout/uc_2checkout.module
@@ -5,6 +5,7 @@
* Integrates 2Checkout.com's redirected payment service.
*/
+use Drupal\Component\Utility\Unicode;
/**
* Implements hook_help().
@@ -175,15 +176,15 @@ function uc_2checkout_form($form, &$form_state, $order) {
'x_receipt_link_url' => url('cart/2checkout/complete/' . uc_cart_get_id(), array('absolute' => TRUE)),
'merchant_order_id' => $order->id(),
'pay_method' => isset($_SESSION['pay_method']) ? $_SESSION['pay_method'] : 'CC',
- 'card_holder_name' => \Drupal\Component\Utility\Unicode::substr($order->billing_first_name . ' ' . $order->billing_last_name, 0, 128),
- 'street_address' => \Drupal\Component\Utility\Unicode::substr($order->billing_street1, 0, 64),
- 'street_address2' => \Drupal\Component\Utility\Unicode::substr($order->billing_street2, 0, 64),
- 'city' => \Drupal\Component\Utility\Unicode::substr($order->billing_city, 0, 64),
+ 'card_holder_name' => Unicode::substr($order->billing_first_name . ' ' . $order->billing_last_name, 0, 128),
+ 'street_address' => Unicode::substr($order->billing_street1, 0, 64),
+ 'street_address2' => Unicode::substr($order->billing_street2, 0, 64),
+ 'city' => Unicode::substr($order->billing_city, 0, 64),
'state' => uc_get_zone_code($order->billing_zone),
- 'zip' => \Drupal\Component\Utility\Unicode::substr($order->billing_postal_code, 0, 16),
+ 'zip' => Unicode::substr($order->billing_postal_code, 0, 16),
'country' => $country[0]['country_iso_code_3'],
- 'email' => \Drupal\Component\Utility\Unicode::substr($order->getEmail(), 0, 64),
- 'phone' => \Drupal\Component\Utility\Unicode::substr($order->billing_phone, 0, 16),
+ 'email' => Unicode::substr($order->getEmail(), 0, 64),
+ 'phone' => Unicode::substr($order->billing_phone, 0, 16),
'id_type' => 1,
);
diff --git a/payment/uc_paypal/uc_paypal.pages.inc b/payment/uc_paypal/uc_paypal.pages.inc
index 23c6899..ccf5e2a 100644
--- a/payment/uc_paypal/uc_paypal.pages.inc
+++ b/payment/uc_paypal/uc_paypal.pages.inc
@@ -5,6 +5,8 @@
* Paypal administration menu items.
*/
+use Drupal\Component\Utility\Unicode;
+
/**
* Processes Instant Payment Notifiations from PayPal.
*/
@@ -54,7 +56,7 @@ function uc_paypal_ipn() {
// Express Checkout IPNs may not have the WPS email stored. But if it is,
// make sure that the right account is being paid.
$uc_paypal_wps_email = trim(variable_get('uc_paypal_wps_email', ''));
- if (!empty($uc_paypal_wps_email) && \Drupal\Component\Utility\Unicode::strtolower($receiver_email) != \Drupal\Component\Utility\Unicode::strtolower($uc_paypal_wps_email)) {
+ if (!empty($uc_paypal_wps_email) && Unicode::strtolower($receiver_email) != Unicode::strtolower($uc_paypal_wps_email)) {
watchdog('uc_paypal', 'IPN for a different PayPal account attempted.', array(), WATCHDOG_ERROR);
return;
}
diff --git a/shipping/uc_shipping/uc_shipping.admin.inc b/shipping/uc_shipping/uc_shipping.admin.inc
index 6c69043..5667f5b 100644
--- a/shipping/uc_shipping/uc_shipping.admin.inc
+++ b/shipping/uc_shipping/uc_shipping.admin.inc
@@ -5,6 +5,8 @@
* Shipping administration menu items.
*/
+use Drupal\Component\Utility\Unicode;
+
/**
* Displays a list of an order's packaged products.
*/
@@ -760,7 +762,7 @@ function uc_shipment_address($order, $type) {
);
if (\Drupal::config('uc_store.settings')->get('capitalize_address')) {
- $address = \Drupal\Component\Utility\Unicode::strtoupper($address);
+ $address = Unicode::strtoupper($address);
}
return $address;
@@ -1034,7 +1036,7 @@ function uc_shipping_shipment_edit_validate($form, &$form_state) {
foreach ($form_state['values']['packages'] as $key => $package) {
foreach (array('length', 'width', 'height') as $property) {
if (!empty($package['dimensions'][$property]) && (!is_numeric($package['dimensions'][$property]) || $package['dimensions'][$property] < 0)) {
- form_set_error('packages][' . $key . '][dimensions][' . $property, $form_state, t('@property must be a positive number. No commas and only one decimal point.', array('@property' => \Drupal\Component\Utility\Unicode::ucfirst($property))));
+ form_set_error('packages][' . $key . '][dimensions][' . $property, $form_state, t('@property must be a positive number. No commas and only one decimal point.', array('@property' => Unicode::ucfirst($property))));
}
}
}
diff --git a/shipping/uc_shipping/uc_shipping.module b/shipping/uc_shipping/uc_shipping.module
index 4cd19bd..0fbe5cf 100644
--- a/shipping/uc_shipping/uc_shipping.module
+++ b/shipping/uc_shipping/uc_shipping.module
@@ -7,6 +7,7 @@
* and tracking numbers.
*/
+use Drupal\Component\Utility\Json;
use Drupal\uc_store\Address;
/**
@@ -700,16 +701,16 @@ function uc_shipping_select_address($addresses, $onchange = '', $title = NULL) {
'country' => 0,
'zone' => 0,
);
- $options = array(\Drupal\Component\Utility\Json::encode($blank) => t('- Reset fields -'));
+ $options = array(Json::encode($blank) => t('- Reset fields -'));
foreach ($addresses as $address) {
- $options[\Drupal\Component\Utility\Json::encode($address)] = $address->company . ' ' . $address->street1 . ' ' . $address->city;
+ $options[Json::encode($address)] = $address->company . ' ' . $address->street1 . ' ' . $address->city;
}
$select = array(
'#type' => 'select',
'#title' => is_null($title) ? t('Address book') : $title,
'#options' => $options,
- '#default_value' => \Drupal\Component\Utility\Json::encode($addresses[0]),
+ '#default_value' => Json::encode($addresses[0]),
'#attributes' => array('onchange' => $onchange),
);
diff --git a/shipping/uc_shipping/uc_shipping.views.inc b/shipping/uc_shipping/uc_shipping.views.inc
index 03b8242..f153a32 100644
--- a/shipping/uc_shipping/uc_shipping.views.inc
+++ b/shipping/uc_shipping/uc_shipping.views.inc
@@ -5,6 +5,8 @@
* Views hooks for Ubercart shipping.
*/
+use Drupal\Component\Utility\Unicode;
+
/**
* Implements hook_views_data().
*/
@@ -237,7 +239,7 @@ function uc_shipping_views_data() {
$data['uc_shipments'][$prefix . '_' . $field] = array(
'group' => $group,
'title' => $label,
- 'help' => t('The !field of the !address of the shipment.', array('!field' => \Drupal\Component\Utility\Unicode::strtolower($label), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => Unicode::strtolower($label), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -254,7 +256,7 @@ function uc_shipping_views_data() {
$data['uc_shipments'][$prefix . '_full_name'] = array(
'group' => $group,
'title' => t('Full name'),
- 'help' => t('The !field of the !address of the shipment.', array('!field' => t('full name'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => t('full name'), '!address' => Unicode::strtolower($address))),
'field' => array(
'additional fields' => array(
$prefix . '_first_name',
@@ -273,7 +275,7 @@ function uc_shipping_views_data() {
);
$data['uc_shipments_' . $prefix . '_countries']['country_id'] = array(
'title' => t('ISO country code (numeric)'),
- 'help' => t('The !field of the !address of the shipment.', array('!field' => t('numeric ISO country code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => t('numeric ISO country code'), '!address' => Unicode::strtolower($address))),
'argument' => array(
'id' => 'numeric',
'name field' => 'country_iso_code_2',
@@ -286,7 +288,7 @@ function uc_shipping_views_data() {
);
$data['uc_shipments_' . $prefix . '_countries']['country_name'] = array(
'title' => t('Country'),
- 'help' => t('The !field of the !address of the shipment.', array('!field' => t('country name'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => t('country name'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -300,7 +302,7 @@ function uc_shipping_views_data() {
);
$data['uc_shipments_' . $prefix . '_countries']['country_iso_code_2'] = array(
'title' => t('ISO country code (2 characters)'),
- 'help' => t('The !field of the !address of the shipment.', array('!field' => t('ISO country code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => t('ISO country code'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -314,7 +316,7 @@ function uc_shipping_views_data() {
);
$data['uc_shipments_' . $prefix . '_countries']['country_iso_code_3'] = array(
'title' => t('ISO country code (3 characters)'),
- 'help' => t('The !field of the !address of the shipment.', array('!field' => t('ISO country code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => t('ISO country code'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -335,7 +337,7 @@ function uc_shipping_views_data() {
);
$data['uc_shipments_' . $prefix . '_zones']['zone_name'] = array(
'title' => t('State/Province'),
- 'help' => t('The !field of the !address of the shipment.', array('!field' => t('state or province'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => t('state or province'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -349,7 +351,7 @@ function uc_shipping_views_data() {
);
$data['uc_shipments_' . $prefix . '_zones']['zone_code'] = array(
'title' => t('State/Province code'),
- 'help' => t('The !field of the !address of the shipment.', array('!field' => t('state or province code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the shipment.', array('!field' => t('state or province code'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
diff --git a/shipping/uc_usps/uc_usps.module b/shipping/uc_usps/uc_usps.module
index 201f3ab..6500feb 100644
--- a/shipping/uc_usps/uc_usps.module
+++ b/shipping/uc_usps/uc_usps.module
@@ -5,6 +5,7 @@
* United States Postal Service (USPS) shipping quote module.
*/
+use Drupal\Component\Utility\Url;
use Drupal\uc_store\Address;
/******************************************************************************
@@ -491,7 +492,7 @@ function uc_usps_rate_request($packages, $origin, $destination) {
}
$request .= '';
- return 'API=RateV4&XML=' . \Drupal\Component\Utility\Url::encodePath($request);
+ return 'API=RateV4&XML=' . Url::encodePath($request);
}
/**
@@ -548,7 +549,7 @@ function uc_usps_intl_rate_request($packages, $origin, $destination) {
}
$request .= '';
- $request = 'API=IntlRateV2&XML=' . \Drupal\Component\Utility\Url::encodePath($request);
+ $request = 'API=IntlRateV2&XML=' . Url::encodePath($request);
return $request;
}
diff --git a/uc_file/uc_file.admin.inc b/uc_file/uc_file.admin.inc
index 98bed39..fbbe2cc 100644
--- a/uc_file/uc_file.admin.inc
+++ b/uc_file/uc_file.admin.inc
@@ -5,6 +5,8 @@
* File administration menu items.
*/
+use Drupal\Component\Utility\Json;
+
/**
* Form step values.
*/
@@ -523,8 +525,8 @@ function _uc_file_build_js_file_display($file_ids) {
// Set up some JS to dynamically update the list based on the
// recursion checkbox state.
- drupal_add_js('uc_file_list[false] = ' . \Drupal\Component\Utility\Json::encode('' . implode('', $no_recursion) . '') . ';', 'inline');
- drupal_add_js('uc_file_list[true] = ' . \Drupal\Component\Utility\Json::encode('' . implode('', $recursion) . '') . ';', 'inline');
+ drupal_add_js('uc_file_list[false] = ' . Json::encode('' . implode('', $no_recursion) . '') . ';', 'inline');
+ drupal_add_js('uc_file_list[true] = ' . Json::encode('' . implode('', $recursion) . '') . ';', 'inline');
return $result;
}
diff --git a/uc_googleanalytics/uc_googleanalytics.module b/uc_googleanalytics/uc_googleanalytics.module
index ad03dbd..b8b619e 100644
--- a/uc_googleanalytics/uc_googleanalytics.module
+++ b/uc_googleanalytics/uc_googleanalytics.module
@@ -10,6 +10,8 @@
* Google Analytics.
*/
+use Drupal\Component\Utility\Json;
+
/**
* Implements hook_enable().
*/
@@ -143,13 +145,13 @@ function uc_googleanalytics_ecommerce_js($order) {
// Put the arguments into an array that is safe to implode directly.
$args = array(
'"' . $trans['order_id'] . '"',
- \Drupal\Component\Utility\Json::encode($trans['store']),
+ Json::encode($trans['store']),
'"' . $trans['total'] . '"',
'"' . $trans['tax'] . '"',
'"' . $trans['shipping'] . '"',
- \Drupal\Component\Utility\Json::encode($trans['city']),
- \Drupal\Component\Utility\Json::encode($trans['state']),
- \Drupal\Component\Utility\Json::encode($trans['country']),
+ Json::encode($trans['city']),
+ Json::encode($trans['state']),
+ Json::encode($trans['country']),
);
// Add the transaction line to the JS.
@@ -189,9 +191,9 @@ function uc_googleanalytics_ecommerce_js($order) {
// Put the arguments into an array that is safe to implode directly.
$args = array(
'"' . $item['order_id'] . '"',
- \Drupal\Component\Utility\Json::encode($item['sku']),
- \Drupal\Component\Utility\Json::encode($item['name']),
- \Drupal\Component\Utility\Json::encode((string) $item['category']),
+ Json::encode($item['sku']),
+ Json::encode($item['name']),
+ Json::encode((string) $item['category']),
'"' . $item['price'] . '"',
'"' . $item['qty'] . '"',
);
diff --git a/uc_order/uc_order.views.inc b/uc_order/uc_order.views.inc
index 44a61e1..f7cccf2 100644
--- a/uc_order/uc_order.views.inc
+++ b/uc_order/uc_order.views.inc
@@ -5,6 +5,8 @@
* Views hooks and callback registries.
*/
+use Drupal\Component\Utility\Unicode;
+
/**
* Implements hook_views_data().
*/
@@ -205,7 +207,7 @@ function uc_order_views_data() {
$data['uc_orders'][$prefix . '_' . $field] = array(
'group' => $group,
'title' => $label,
- 'help' => t('The !field of the !address of the order.', array('!field' => \Drupal\Component\Utility\Unicode::strtolower($label), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => Unicode::strtolower($label), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -222,7 +224,7 @@ function uc_order_views_data() {
$data['uc_orders'][$prefix . '_full_name'] = array(
'group' => $group,
'title' => t('Full name'),
- 'help' => t('The !field of the !address of the order.', array('!field' => t('full name'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => t('full name'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'uc_order_full_name',
'real field' => $prefix . '_first_name',
@@ -242,7 +244,7 @@ function uc_order_views_data() {
);
$data[$prefix . '_countries']['country_id'] = array(
'title' => t('ISO country code (numeric)'),
- 'help' => t('The !field of the !address of the order.', array('!field' => t('numeric ISO country code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => t('numeric ISO country code'), '!address' => Unicode::strtolower($address))),
'argument' => array(
'id' => 'numeric',
'name field' => 'country_iso_code_2',
@@ -255,7 +257,7 @@ function uc_order_views_data() {
);
$data[$prefix . '_countries']['country_name'] = array(
'title' => t('Country'),
- 'help' => t('The !field of the !address of the order.', array('!field' => t('country name'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => t('country name'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -271,7 +273,7 @@ function uc_order_views_data() {
);
$data[$prefix . '_countries']['country_iso_code_2'] = array(
'title' => t('ISO country code (2 characters)'),
- 'help' => t('The !field of the !address of the order.', array('!field' => t('ISO country code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => t('ISO country code'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -285,7 +287,7 @@ function uc_order_views_data() {
);
$data[$prefix . '_countries']['country_iso_code_3'] = array(
'title' => t('ISO country code (3 characters)'),
- 'help' => t('The !field of the !address of the order.', array('!field' => t('ISO country code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => t('ISO country code'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -306,7 +308,7 @@ function uc_order_views_data() {
);
$data[$prefix . '_zones']['zone_name'] = array(
'title' => t('State/Province'),
- 'help' => t('The !field of the !address of the order.', array('!field' => t('state or province'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => t('state or province'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
@@ -322,7 +324,7 @@ function uc_order_views_data() {
);
$data[$prefix . '_zones']['zone_code'] = array(
'title' => t('State/Province code'),
- 'help' => t('The !field of the !address of the order.', array('!field' => t('state or province code'), '!address' => \Drupal\Component\Utility\Unicode::strtolower($address))),
+ 'help' => t('The !field of the !address of the order.', array('!field' => t('state or province code'), '!address' => Unicode::strtolower($address))),
'field' => array(
'id' => 'standard',
'click sortable' => TRUE,
diff --git a/uc_store/uc_store.module b/uc_store/uc_store.module
index b088281..46cb9d9 100644
--- a/uc_store/uc_store.module
+++ b/uc_store/uc_store.module
@@ -9,7 +9,9 @@
* settings pages for use in store administration.
*/
+use Drupal\Component\Utility\Json;
use Drupal\Component\Utility\NestedArray;
+use Drupal\Component\Utility\Unicode;
use Drupal\uc_store\Address;
/**
@@ -1133,7 +1135,7 @@ function uc_select_address($uid, $type = 'billing', $onchange = '', $title = NUL
(isset($addresses[$key + 1]) && $option == $addresses[$key + 1]['street1'])) {
$option .= ' - ' . $address['first_name'] . ' ' . $address['last_name'];
}
- $options[\Drupal\Component\Utility\Json::encode($address)] = check_plain($option);
+ $options[Json::encode($address)] = check_plain($option);
}
$select = array(
@@ -1338,7 +1340,7 @@ function uc_store_email_from() {
*/
function uc_store_rfc2822_display_name($name) {
// Base64 encode $name string if it contains non-ASCII characters.
- $name = \Drupal\Component\Utility\Unicode::mimeHeaderEncode($name);
+ $name = Unicode::mimeHeaderEncode($name);
// From RFC2822, section 3.4.2, define valid characters for an atom.
$valid_chars = "[a-zA-Z0-9\!\#\$\%\&\'\*\+\-\/\=\?\^\_\`\{\|\}\~]";
// Display name is composed of 0 or more atoms separated by white space.