diff --git a/core/cron.php b/core/cron.php index fa9aa14..e08940a 100644 --- a/core/cron.php +++ b/core/cron.php @@ -16,7 +16,7 @@ define('DRUPAL_ROOT', getcwd()); include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); -if (!isset($_GET['cron_key']) || variable_get('cron_key', 'drupal') != $_GET['cron_key']) { +if (!isset($_GET['cron_key']) || variable_get('cron_key', 'drupal') !== $_GET['cron_key']) { watchdog('cron', 'Cron could not run because an invalid key was used.', array(), WATCHDOG_NOTICE); drupal_access_denied(); } diff --git a/core/includes/actions.inc b/core/includes/actions.inc index 75cda42..e77d6e3 100644 --- a/core/includes/actions.inc +++ b/core/includes/actions.inc @@ -240,7 +240,7 @@ function actions_function_lookup($hash) { // Check for a function name match. $actions_list = actions_list(); foreach ($actions_list as $function => $array) { - if (drupal_hash_base64($function) == $hash) { + if (drupal_hash_base64($function) === $hash) { return $function; } } @@ -248,7 +248,7 @@ function actions_function_lookup($hash) { // Must be a configurable action; check database. $result = db_query("SELECT aid FROM {actions} WHERE parameters <> ''")->fetchAll(PDO::FETCH_ASSOC); foreach ($result as $row) { - if (drupal_hash_base64($row['aid']) == $hash) { + if (drupal_hash_base64($row['aid']) === $hash) { $aid = $row['aid']; break; } diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc index 8817356..cd2f4a1 100644 --- a/core/includes/ajax.inc +++ b/core/includes/ajax.inc @@ -520,7 +520,7 @@ function ajax_prepare_response($page_callback_result) { break; } } - elseif (is_array($page_callback_result) && isset($page_callback_result['#type']) && ($page_callback_result['#type'] == 'ajax')) { + elseif (is_array($page_callback_result) && isset($page_callback_result['#type']) && ($page_callback_result['#type'] === 'ajax')) { // Complex Ajax callbacks can return a result that contains an error message // or a specific set of commands to send to the browser. $page_callback_result += element_info('ajax'); @@ -564,7 +564,7 @@ function ajax_footer() { // Even for Ajax requests, invoke hook_exit() implementations. There may be // modules that need very fast Ajax responses, and therefore, run Ajax // requests with an early bootstrap. - if (drupal_get_bootstrap_phase() == DRUPAL_BOOTSTRAP_FULL && (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update')) { + if (drupal_get_bootstrap_phase() === DRUPAL_BOOTSTRAP_FULL && (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE !== 'update')) { module_invoke_all('exit'); } @@ -691,7 +691,7 @@ function ajax_pre_render_element($element) { ); // @todo Legacy support. Remove in Drupal 8. - if (isset($settings['method']) && $settings['method'] == 'replace') { + if (isset($settings['method']) && $settings['method'] === 'replace') { $settings['method'] = 'replaceWith'; } diff --git a/core/includes/authorize.inc b/core/includes/authorize.inc index cf55624..0cb7bd4 100644 --- a/core/includes/authorize.inc +++ b/core/includes/authorize.inc @@ -102,7 +102,7 @@ function authorize_filetransfer_form($form, &$form_state) { $form['connection_settings'][$name] += _authorize_filetransfer_connection_settings($name); // Start non-JS code. - if (isset($form_state['values']['connection_settings']['authorize_filetransfer_default']) && $form_state['values']['connection_settings']['authorize_filetransfer_default'] == $name) { + if (isset($form_state['values']['connection_settings']['authorize_filetransfer_default']) && $form_state['values']['connection_settings']['authorize_filetransfer_default'] === $name) { // If the user switches from JS to non-JS, Drupal (and Batch API) will // barf. This is a known bug: http://drupal.org/node/229825. @@ -176,7 +176,7 @@ function _authorize_filetransfer_connection_settings($backend) { function _authorize_filetransfer_connection_settings_set_defaults(&$element, $key, array $defaults) { // If we're operating on a form element which isn't a fieldset, and we have // a default setting saved, stash it in #default_value. - if (!empty($key) && isset($defaults[$key]) && isset($element['#type']) && $element['#type'] != 'fieldset') { + if (!empty($key) && isset($defaults[$key]) && isset($element['#type']) && $element['#type'] !== 'fieldset') { $element['#default_value'] = $defaults[$key]; } // Now, we walk through all the child elements, and recursively invoke @@ -199,7 +199,7 @@ function _authorize_filetransfer_connection_settings_set_defaults(&$element, $ke function authorize_filetransfer_form_validate($form, &$form_state) { // Only validate the form if we have collected all of the user input and are // ready to proceed with updating or installing. - if ($form_state['triggering_element']['#name'] != 'process_updates') { + if ($form_state['triggering_element']['#name'] !== 'process_updates') { return; } @@ -249,7 +249,7 @@ function authorize_filetransfer_form_submit($form, &$form_state) { // property. Otherwise, we store everything that's not explicitly // marked with #filetransfer_save set to FALSE. if (!isset($form['connection_settings'][$filetransfer_backend][$key]['#filetransfer_save'])) { - if ($form['connection_settings'][$filetransfer_backend][$key]['#type'] != 'password') { + if ($form['connection_settings'][$filetransfer_backend][$key]['#type'] !== 'password') { $connection_settings[$key] = $value; } } diff --git a/core/includes/batch.inc b/core/includes/batch.inc index 83ddd30..ddb957b 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -151,7 +151,7 @@ function _batch_progress_page_js() { */ function _batch_do() { // HTTP POST required. - if ($_SERVER['REQUEST_METHOD'] != 'POST') { + if ($_SERVER['REQUEST_METHOD'] !== 'POST') { drupal_set_message(t('HTTP POST is required.'), 'error'); drupal_set_title(t('Error')); return ''; @@ -201,7 +201,7 @@ function _batch_progress_page_nojs() { // Perform actual processing. list($percentage, $message) = _batch_process($batch); - if ($percentage == 100) { + if ($percentage === 100) { $new_op = 'finished'; } @@ -389,7 +389,7 @@ function _batch_process() { * @see _batch_process() */ function _batch_api_percentage($total, $current) { - if (!$total || $total == $current) { + if (!$total || $total === $current) { // If $total doesn't evaluate as true or is equal to the current set, then // we're finished, and we can return "100". $percentage = "100"; @@ -407,7 +407,7 @@ function _batch_api_percentage($total, $current) { // may be erroneously rounded up to 100%. To prevent that, we add one // more decimal place and try again. $decimal_places++; - } while ($percentage == '100'); + } while ($percentage === '100'); } return $percentage; } diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 12b1d80..0ad089f 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -529,7 +529,7 @@ function drupal_environment_initialize() { if (!isset($_SERVER['HTTP_REFERER'])) { $_SERVER['HTTP_REFERER'] = ''; } - if (!isset($_SERVER['SERVER_PROTOCOL']) || ($_SERVER['SERVER_PROTOCOL'] != 'HTTP/1.0' && $_SERVER['SERVER_PROTOCOL'] != 'HTTP/1.1')) { + if (!isset($_SERVER['SERVER_PROTOCOL']) || ($_SERVER['SERVER_PROTOCOL'] !== 'HTTP/1.0' && $_SERVER['SERVER_PROTOCOL'] !== 'HTTP/1.1')) { $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.0'; } @@ -605,7 +605,7 @@ function drupal_settings_initialize() { if (file_exists(DRUPAL_ROOT . '/' . conf_path() . '/settings.php')) { include_once DRUPAL_ROOT . '/' . conf_path() . '/settings.php'; } - $is_https = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on'; + $is_https = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) === 'on'; if (isset($base_url)) { // Parse fixed base URL from settings.php. @@ -631,7 +631,7 @@ function drupal_settings_initialize() { // Remove "core" directory if present, allowing install.php, update.php, // cron.php and others to auto-detect a base path. $core_position = strrpos($dir, '/core'); - if ($core_position !== FALSE && strlen($dir) - 5 == $core_position) { + if ($core_position !== FALSE && strlen($dir) - 5 === $core_position) { $base_path = substr($dir, 0, $core_position); } else { @@ -721,7 +721,7 @@ function drupal_get_filename($type, $name, $filename = NULL) { static $files = array(), $dirs = array(); // Profiles are a special case: they have a fixed location and naming. - if ($type == 'profile') { + if ($type === 'profile') { $profile_filename = "profiles/$name/$name.profile"; $files[$type][$name] = file_exists($profile_filename) ? $profile_filename : FALSE; } @@ -758,11 +758,11 @@ function drupal_get_filename($type, $name, $filename = NULL) { if (!isset($files[$type][$name])) { // We have a consistent directory naming: modules, themes... $dir = $type . 's'; - if ($type == 'theme_engine') { + if ($type === 'theme_engine') { $dir = 'themes/engines'; $extension = 'engine'; } - elseif ($type == 'theme') { + elseif ($type === 'theme') { $extension = 'info'; } else { @@ -949,7 +949,7 @@ function drupal_page_is_cacheable($allow_caching = NULL) { $allow_caching_static = $allow_caching; } - return $allow_caching_static && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD') + return $allow_caching_static && ($_SERVER['REQUEST_METHOD'] === 'GET' || $_SERVER['REQUEST_METHOD'] === 'HEAD') && !drupal_is_cli(); } @@ -1110,7 +1110,7 @@ function drupal_send_headers($default_headers = array(), $only_default = FALSE) } } foreach ($headers as $name_lower => $value) { - if ($name_lower == 'status') { + if ($name_lower === 'status') { header($_SERVER['SERVER_PROTOCOL'] . ' ' . $value); } // Skip headers that have been unset. @@ -1216,8 +1216,8 @@ function drupal_serve_page_from_cache(stdClass $cache) { $if_none_match = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : FALSE; if ($if_modified_since && $if_none_match - && $if_none_match == $etag // etag must match - && $if_modified_since == $cache->created) { // if-modified-since must match + && $if_none_match === $etag // etag must match + && $if_modified_since === $cache->created) { // if-modified-since must match header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified'); drupal_send_headers($default_headers); return; @@ -1376,7 +1376,7 @@ function t($string, array $args = array(), array $options = array()) { $string = $custom_strings[$options['langcode']][$options['context']][$string]; } // Translate with locale module if enabled. - elseif ($options['langcode'] != LANGUAGE_SYSTEM && ($options['langcode'] != 'en' || variable_get('locale_translate_english', FALSE)) && function_exists('locale')) { + elseif ($options['langcode'] !== LANGUAGE_SYSTEM && ($options['langcode'] !== 'en' || variable_get('locale_translate_english', FALSE)) && function_exists('locale')) { $string = locale($string, $options['context'], $options['langcode']); } if (empty($args)) { @@ -1474,13 +1474,13 @@ function check_plain($text) { * TRUE if the text is valid UTF-8, FALSE if not. */ function drupal_validate_utf8($text) { - if (strlen($text) == 0) { + if (strlen($text) === 0) { return TRUE; } // With the PCRE_UTF8 modifier 'u', preg_match() fails silently on strings // containing invalid UTF-8 byte sequences. It does not reject character // codes above U+10FFFF (represented by 4 or more octets), though. - return (preg_match('/^./us', $text) == 1); + return (preg_match('/^./us', $text) === 1); } /** @@ -1725,7 +1725,7 @@ function drupal_set_title($title = NULL, $output = CHECK_PLAIN) { $stored_title = &drupal_static(__FUNCTION__); if (isset($title)) { - $stored_title = ($output == PASS_THROUGH) ? $title : check_plain($title); + $stored_title = ($output === PASS_THROUGH) ? $title : check_plain($title); } return $stored_title; @@ -2330,7 +2330,7 @@ function drupal_valid_test_ua() { $time_diff = REQUEST_TIME - $time; // Since we are making a local request a 5 second time window is allowed, // and the HMAC must match. - if ($time_diff >= 0 && $time_diff <= 5 && $hmac == drupal_hmac_base64($check_string, $key)) { + if ($time_diff >= 0 && $time_diff <= 5 && $hmac === drupal_hmac_base64($check_string, $key)) { $test_prefix = $prefix; return $test_prefix; } @@ -2404,7 +2404,7 @@ function drupal_fast_404() { * Returns TRUE if a Drupal installation is currently being attempted. */ function drupal_installation_attempted() { - return defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install'; + return defined('MAINTENANCE_MODE') && MAINTENANCE_MODE === 'install'; } /** @@ -2531,7 +2531,7 @@ function language_list($only_enabled = FALSE) { // save the same object without data loss. Also fill in the filtered list // of enabled languages only. foreach ($languages['all'] as $langcode => $language) { - $languages['all'][$langcode]->default = ($langcode == $default->langcode); + $languages['all'][$langcode]->default = ($langcode === $default->langcode); if ($language->enabled) { $languages['enabled'][$langcode] = $languages['all'][$langcode]; } @@ -2565,7 +2565,7 @@ function language_load($langcode) { * The printed name of the language. */ function language_name($langcode) { - if ($langcode == LANGUAGE_NOT_SPECIFIED) { + if ($langcode === LANGUAGE_NOT_SPECIFIED) { return t('None'); } @@ -2638,7 +2638,7 @@ function request_path() { // explicitly provided in the URL, or because the server added it to // $_SERVER['REQUEST_URI'] even when it wasn't provided in the URL (some // versions of Microsoft IIS do this), the front page should be served. - if ($path == basename($_SERVER['PHP_SELF'])) { + if ($path === basename($_SERVER['PHP_SELF'])) { $path = ''; } } @@ -2860,7 +2860,7 @@ function drupal_autoload_class($class) { function _registry_check_code($type, $name = NULL) { static $lookup_cache, $cache_update_needed; - if ($type == 'class' && class_exists($name) || $type == 'interface' && interface_exists($name)) { + if ($type === 'class' && class_exists($name) || $type === 'interface' && interface_exists($name)) { return TRUE; } @@ -2873,7 +2873,7 @@ function _registry_check_code($type, $name = NULL) { // When we rebuild the registry, we need to reset this cache so // we don't keep lookups for resources that changed during the rebuild. - if ($type == REGISTRY_RESET_LOOKUP_CACHE) { + if ($type === REGISTRY_RESET_LOOKUP_CACHE) { $cache_update_needed = TRUE; $lookup_cache = NULL; return; @@ -2881,7 +2881,7 @@ function _registry_check_code($type, $name = NULL) { // Called from drupal_page_footer, we write to permanent storage if there // changes to the lookup cache for this request. - if ($type == REGISTRY_WRITE_LOOKUP_CACHE) { + if ($type === REGISTRY_WRITE_LOOKUP_CACHE) { if ($cache_update_needed) { cache('bootstrap')->set('lookup_cache', $lookup_cache); } @@ -3092,7 +3092,7 @@ function &drupal_static($name, $default_value = NULL, $reset = FALSE) { $default[$name] = $data[$name] = $default_value; return $data[$name]; } - // Reset all: ($name == NULL). This needs to be done one at a time so that + // Reset all: ($name === NULL). This needs to be done one at a time so that // references returned by earlier invocations of drupal_static() also get // reset. foreach ($default as $name => $value) { @@ -3117,7 +3117,7 @@ function drupal_static_reset($name = NULL) { * Detects whether the current script is running in a command-line environment. */ function drupal_is_cli() { - return (!isset($_SERVER['SERVER_SOFTWARE']) && (php_sapi_name() == 'cli' || (is_numeric($_SERVER['argc']) && $_SERVER['argc'] > 0))); + return (!isset($_SERVER['SERVER_SOFTWARE']) && (php_sapi_name() === 'cli' || (is_numeric($_SERVER['argc']) && $_SERVER['argc'] > 0))); } /** diff --git a/core/includes/common.inc b/core/includes/common.inc index 5ff6167..91cfef4 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -519,7 +519,7 @@ function drupal_get_destination() { else { $path = $_GET['q']; $query = drupal_http_build_query(drupal_get_query_parameters()); - if ($query != '') { + if ($query !== '') { $path .= '?' . $query; } $destination = array('destination' => $path); @@ -772,7 +772,7 @@ function drupal_http_request($url, array $options = array()) { // Parse the URL and make sure we can handle the schema. $uri = @parse_url($url); - if ($uri == FALSE) { + if ($uri === FALSE) { $result->error = 'unable to parse URL'; $result->code = -1001; return $result; @@ -806,13 +806,13 @@ function drupal_http_request($url, array $options = array()) { // RFC 2616: "non-standard ports MUST, default ports MAY be included". // We don't add the standard port to prevent from breaking rewrite rules // checking the host that do not take into account the port number. - $options['headers']['Host'] = $uri['host'] . ($port != 80 ? ':' . $port : ''); + $options['headers']['Host'] = $uri['host'] . ($port !== 80 ? ':' . $port : ''); break; case 'https': // Note: Only works when PHP is compiled with OpenSSL support. $port = isset($uri['port']) ? $uri['port'] : 443; $socket = 'ssl://' . $uri['host'] . ':' . $port; - $options['headers']['Host'] = $uri['host'] . ($port != 443 ? ':' . $port : ''); + $options['headers']['Host'] = $uri['host'] . ($port !== 443 ? ':' . $port : ''); break; default: $result->error = 'invalid schema ' . $uri['scheme']; @@ -860,7 +860,7 @@ function drupal_http_request($url, array $options = array()) { // at least HEAD/GET requests, and Squid always requires Content-Length in // POST/PUT requests. $content_length = strlen($options['data']); - if ($content_length > 0 || $options['method'] == 'POST' || $options['method'] == 'PUT') { + if ($content_length > 0 || $options['method'] === 'POST' || $options['method'] === 'PUT') { $options['headers']['Content-Length'] = $content_length; } @@ -937,7 +937,7 @@ function drupal_http_request($url, array $options = array()) { while ($line = trim(array_shift($response))) { list($name, $value) = explode(':', $line, 2); $name = strtolower($name); - if (isset($result->headers[$name]) && $name == 'set-cookie') { + if (isset($result->headers[$name]) && $name === 'set-cookie') { // RFC 2109: the Set-Cookie response header comprises the token Set- // Cookie:, followed by a comma-separated list of one or more cookies. $result->headers[$name] .= ',' . trim($value); @@ -1062,7 +1062,7 @@ function _fix_gpc_magic(&$item) { * @see http://php.net/manual/features.file-upload.php#42280 */ function _fix_gpc_magic_files(&$item, $key) { - if ($key != 'tmp_name') { + if ($key !== 'tmp_name') { if (is_array($item)) { array_walk($item, '_fix_gpc_magic_files'); } @@ -1333,7 +1333,7 @@ function drupal_strip_dangerous_protocols($uri) { $uri = substr($uri, $colonpos + 1); } } - } while ($before != $uri); + } while ($before !== $uri); return $uri; } @@ -1457,11 +1457,11 @@ function _filter_xss_split($m, $store = FALSE) { $string = $m[1]; - if (substr($string, 0, 1) != '<') { + if (substr($string, 0, 1) !== '<') { // We matched a lone ">" character. return '>'; } - elseif (strlen($string) == 1) { + elseif (strlen($string) === 1) { // We matched a lone "<" character. return '<'; } @@ -1489,7 +1489,7 @@ function _filter_xss_split($m, $store = FALSE) { return $comment; } - if ($slash != '') { + if ($slash !== '') { return ""; } @@ -1516,7 +1516,7 @@ function _filter_xss_attributes($attr) { $mode = 0; $attrname = ''; - while (strlen($attr) != 0) { + while (strlen($attr) !== 0) { // Was the last operation successful? $working = 0; @@ -1525,7 +1525,7 @@ function _filter_xss_attributes($attr) { // Attribute name, href for instance. if (preg_match('/^([-a-zA-Z]+)/', $attr, $match)) { $attrname = strtolower($match[1]); - $skip = ($attrname == 'style' || substr($attrname, 0, 2) == 'on'); + $skip = ($attrname === 'style' || substr($attrname, 0, 2) === 'on'); $working = $mode = 1; $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr); } @@ -1585,7 +1585,7 @@ function _filter_xss_attributes($attr) { break; } - if ($working == 0) { + if ($working === 0) { // Not well formed; remove and try again. $attr = preg_replace('/ ^ @@ -1603,7 +1603,7 @@ function _filter_xss_attributes($attr) { } // The attribute list ends with a valueless attribute like "selected". - if ($mode == 1 && !$skip) { + if ($mode === 1 && !$skip) { $attrarr[] = $attrname; } return $attrarr; @@ -1712,7 +1712,7 @@ function format_xml_elements($array) { $output .= drupal_attributes($value['attributes']); } - if (isset($value['value']) && $value['value'] != '') { + if (isset($value['value']) && $value['value'] !== '') { $output .= '>' . (is_array($value['value']) ? format_xml_elements($value['value']) : check_plain($value['value'])) . '\n"; } else { @@ -1781,14 +1781,14 @@ function format_plural($count, $singular, $plural, array $args = array(), array // Split joined translation strings into array. $translated_array = explode(LOCALE_PLURAL_DELIMITER, $translated_strings); - if ($count == 1) { + if ($count === 1) { return $translated_array[0]; } // Get the plural index through the gettext formula. // @todo implement static variable to minimize function_exists() usage. $index = (function_exists('locale_get_plural')) ? locale_get_plural($count, isset($options['langcode']) ? $options['langcode'] : NULL) : -1; - if ($index == 0) { + if ($index === 0) { // Singular form. return $translated_array[0]; } @@ -1901,7 +1901,7 @@ function format_interval($interval, $granularity = 2, $langcode = NULL) { $granularity--; } - if ($granularity == 0) { + if ($granularity === 0) { break; } } @@ -2005,7 +2005,7 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL case 'medium': default: // Retrieve the format of the custom $type passed. - if ($type != 'medium') { + if ($type !== 'medium') { $format = variable_get('date_format_' . $type, ''); } // Fall back to 'medium'. @@ -2076,11 +2076,11 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) { 'langcode' => $langcode, ); - if ($code == 'F') { + if ($code === 'F') { $options['context'] = 'Long month name'; } - if ($code == '') { + if ($code === '') { $cache[$langcode][$code][$string] = $string; } else { @@ -2174,7 +2174,7 @@ function url($path = NULL, array $options = array()) { // that would require another function call, and performance inside url() is // critical. $colonpos = strpos($path, ':'); - $options['external'] = ($colonpos !== FALSE && !preg_match('![/?#]!', substr($path, 0, $colonpos)) && drupal_strip_dangerous_protocols($path) == $path); + $options['external'] = ($colonpos !== FALSE && !preg_match('![/?#]!', substr($path, 0, $colonpos)) && drupal_strip_dangerous_protocols($path) === $path); } // Preserve the original path before altering or aliasing. @@ -2232,13 +2232,13 @@ function url($path = NULL, array $options = array()) { } // The special path '' links to the default front page. - if ($path == '') { + if ($path === '') { $path = ''; } elseif (!empty($path) && !$options['alias']) { $langcode = isset($options['language']) && isset($options['language']->langcode) ? $options['language']->langcode : ''; $alias = drupal_get_path_alias($original_path, $langcode); - if ($alias != $original_path) { + if ($alias !== $original_path) { $path = $alias; } } @@ -2292,7 +2292,7 @@ function url_is_external($path) { // Avoid calling drupal_strip_dangerous_protocols() if there is any // slash (/), hash (#) or question_mark (?) before the colon (:) // occurrence - if any - as this would clearly mean it is not a URL. - return $colonpos !== FALSE && !preg_match('![/?#]!', substr($path, 0, $colonpos)) && drupal_strip_dangerous_protocols($path) == $path; + return $colonpos !== FALSE && !preg_match('![/?#]!', substr($path, 0, $colonpos)) && drupal_strip_dangerous_protocols($path) === $path; } /** @@ -2408,8 +2408,8 @@ function l($text, $path, array $options = array()) { ); // Append active class. - if (($path == $_GET['q'] || ($path == '' && drupal_is_front_page())) && - (empty($options['language']) || $options['language']->langcode == $language_url->langcode)) { + if (($path === $_GET['q'] || ($path === '' && drupal_is_front_page())) && + (empty($options['language']) || $options['language']->langcode === $language_url->langcode)) { $options['attributes']['class'][] = 'active'; } @@ -2438,7 +2438,7 @@ function l($text, $path, array $options = array()) { // the overriding of theme_link() with an alternate function or template, // the presence of preprocess or process functions, or the presence of // include files. - $use_theme = !isset($registry['link']['function']) || ($registry['link']['function'] != 'theme_link'); + $use_theme = !isset($registry['link']['function']) || ($registry['link']['function'] !== 'theme_link'); $use_theme = $use_theme || !empty($registry['link']['preprocess functions']) || !empty($registry['link']['process functions']) || !empty($registry['link']['includes']); } else { @@ -2588,14 +2588,14 @@ function drupal_deliver_html_page($page_callback_result) { } $path = drupal_get_normal_path(variable_get('site_404', '')); - if ($path && $path != $_GET['q']) { + if ($path && $path !== $_GET['q']) { // Custom 404 handler. Set the active item in case there are tabs to // display, or other dependencies on the path. menu_set_active_item($path); $return = menu_execute_active_handler($path, FALSE); } - if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) { + if (empty($return) || $return === MENU_NOT_FOUND || $return === MENU_ACCESS_DENIED) { // Standard 404 handler. drupal_set_title(t('Page not found')); $return = t('The requested page "@path" could not be found.', array('@path' => request_uri())); @@ -2617,14 +2617,14 @@ function drupal_deliver_html_page($page_callback_result) { } $path = drupal_get_normal_path(variable_get('site_403', '')); - if ($path && $path != $_GET['q']) { + if ($path && $path !== $_GET['q']) { // Custom 403 handler. Set the active item in case there are tabs to // display or other dependencies on the path. menu_set_active_item($path); $return = menu_execute_active_handler($path, FALSE); } - if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) { + if (empty($return) || $return === MENU_NOT_FOUND || $return === MENU_ACCESS_DENIED) { // Standard 403 handler. drupal_set_title(t('Access denied')); $return = t('You are not authorized to access this page.'); @@ -2694,8 +2694,8 @@ function drupal_page_footer() { * This should be passed along to hook_exit() implementations. */ function drupal_exit($destination = NULL) { - if (drupal_get_bootstrap_phase() == DRUPAL_BOOTSTRAP_FULL) { - if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update') { + if (drupal_get_bootstrap_phase() === DRUPAL_BOOTSTRAP_FULL) { + if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE !== 'update') { module_invoke_all('exit', $destination); } drupal_session_commit(); @@ -3052,7 +3052,7 @@ function drupal_get_css($css = NULL, $skip_alter = FALSE) { // Remove the overridden CSS files. Later CSS files override former ones. $previous_item = array(); foreach ($css as $key => $item) { - if ($item['type'] == 'file') { + if ($item['type'] === 'file') { // If defined, force a unique basename for this file. $basename = isset($item['basename']) ? $item['basename'] : drupal_basename($item['data']); if (isset($previous_item[$basename])) { @@ -3533,7 +3533,7 @@ function drupal_build_css_cache($css) { // Build aggregate CSS file. foreach ($css as $stylesheet) { // Only 'file' stylesheets can be aggregated. - if ($stylesheet['type'] == 'file') { + if ($stylesheet['type'] === 'file') { $contents = drupal_load_stylesheet($stylesheet['data'], TRUE); // Build the base URL of this CSS file: start with the full URL. @@ -3542,7 +3542,7 @@ function drupal_build_css_cache($css) { $css_base_url = substr($css_base_url, 0, strrpos($css_base_url, '/')); // Simplify to a relative URL if the stylesheet URL starts with the // base URL of the website. - if (substr($css_base_url, 0, strlen($GLOBALS['base_root'])) == $GLOBALS['base_root']) { + if (substr($css_base_url, 0, strlen($GLOBALS['base_root'])) === $GLOBALS['base_root']) { $css_base_url = substr($css_base_url, strlen($GLOBALS['base_root'])); } @@ -3599,7 +3599,7 @@ function _drupal_build_css_path($matches, $base = NULL) { // Prefix with base and remove '../' segments where possible. $path = $_base . $matches[1]; $last = ''; - while ($path != $last) { + while ($path !== $last) { $last = $path; $path = preg_replace('`(^|/)(?!\.\./)([^/]+)/\.\./`', '$1', $path); } @@ -3734,7 +3734,7 @@ function _drupal_load_stylesheet($matches) { $directory = dirname($filename); // If the file is in the current directory, make sure '.' doesn't appear in // the url() path. - $directory = $directory == '.' ? '' : $directory .'/'; + $directory = $directory === '.' ? '' : $directory .'/'; // Alter all internal url() paths. Leave external paths alone. We don't need // to normalize absolute paths here (i.e. remove folder/... segments) because @@ -4235,7 +4235,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS // Filter out elements of the given scope. $items = array(); foreach ($javascript as $key => $item) { - if ($item['scope'] == $scope) { + if ($item['scope'] === $scope) { $items[$key] = $item; } } @@ -4255,7 +4255,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS // because drupal_get_js() was intentionally passed a $javascript argument // stripped of settings, potentially in order to override how settings get // output, so in this case, do not add the setting to this output. - if ($scope == 'header' && isset($items['settings'])) { + if ($scope === 'header' && isset($items['settings'])) { $items['settings']['data'][] = $setting; } @@ -4334,7 +4334,7 @@ function drupal_pre_render_scripts($elements) { // If a group of files has been aggregated into a single file, // $group['data'] contains the URI of the aggregate file. Add a single // script element for this file. - if ($group['type'] == 'file' && isset($group['data'])) { + if ($group['type'] === 'file' && isset($group['data'])) { $element = $element_defaults; $element['#attributes']['src'] = file_create_url($group['data']); $element['#browsers'] = $group['browsers']; @@ -4497,7 +4497,7 @@ function drupal_aggregate_js(&$js_groups) { if ($preprocess_js) { foreach ($js_groups as $key => $group) { - if ($group['type'] == 'file' && $group['preprocess']) { + if ($group['type'] === 'file' && $group['preprocess']) { $js_groups[$key]['data'] = drupal_build_js_cache($group['items']); } } @@ -5168,7 +5168,7 @@ function drupal_get_token($value = '') { */ function drupal_valid_token($token, $value = '', $skip_anonymous = FALSE) { global $user; - return (($skip_anonymous && $user->uid == 0) || ($token == drupal_get_token($value))); + return (($skip_anonymous && $user->uid === 0) || ($token === drupal_get_token($value))); } function _drupal_bootstrap_full() { @@ -5216,7 +5216,7 @@ function _drupal_bootstrap_full() { // Let all modules take action before the menu system handles the request. // We do not want this while running update.php. - if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update') { + if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE !== 'update') { // Prior to invoking hook_init(), initialize the theme (potentially a custom // one for this page), so that: // - Modules with hook_init() implementations that call theme() or @@ -5264,7 +5264,7 @@ function drupal_page_set_cache() { $header_names = _drupal_set_preferred_header_name(); foreach (drupal_get_http_header() as $name_lower => $value) { $cache->data['headers'][$header_names[$name_lower]] = $value; - if ($name_lower == 'expires') { + if ($name_lower === 'expires') { // Use the actual timestamp from an Expires header if available. $cache->expire = strtotime($value); } @@ -5443,7 +5443,7 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) // test runs are triggered). if (drupal_valid_test_ua()) { $testing_profile = variable_get('simpletest_parent_profile', FALSE); - if ($testing_profile && $testing_profile != $profile) { + if ($testing_profile && $testing_profile !== $profile) { $profiles[] = $testing_profile; } } @@ -5487,7 +5487,7 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) // If the module or theme is incompatible with Drupal core, remove it // from the array for the current search directory, so it is not // overwritten when merged with the $files array. - if (isset($info['core']) && $info['core'] != DRUPAL_CORE_COMPATIBILITY) { + if (isset($info['core']) && $info['core'] !== DRUPAL_CORE_COMPATIBILITY) { unset($files_to_add[$file_key]); } } @@ -5791,7 +5791,7 @@ function drupal_render_page($page) { // Allow menu callbacks to return strings or arbitrary arrays to render. // If the array returned is not of #type page directly, we need to fill // in the page with defaults. - if (is_string($page) || (is_array($page) && (!isset($page['#type']) || ($page['#type'] != 'page')))) { + if (is_string($page) || (is_array($page) && (!isset($page['#type']) || ($page['#type'] !== 'page')))) { drupal_set_page_content($page); $page = element_info('page'); } @@ -5952,7 +5952,7 @@ function drupal_render(&$elements) { // If #theme was not set and the element has children, render them now. // This is the same process as drupal_render_children() but is inlined // for speed. - if ($elements['#children'] == '') { + if ($elements['#children'] === '') { foreach ($children as $key) { $elements['#children'] .= drupal_render($elements[$key]); } @@ -6346,7 +6346,7 @@ function drupal_render_cid_create($elements) { function element_sort($a, $b) { $a_weight = (is_array($a) && isset($a['#weight'])) ? $a['#weight'] : 0; $b_weight = (is_array($b) && isset($b['#weight'])) ? $b['#weight'] : 0; - if ($a_weight == $b_weight) { + if ($a_weight === $b_weight) { return 0; } return ($a_weight < $b_weight) ? -1 : 1; @@ -6431,7 +6431,7 @@ function element_info_property($type, $property_name, $default = NULL) { function drupal_sort_weight($a, $b) { $a_weight = (is_array($a) && isset($a['weight'])) ? $a['weight'] : 0; $b_weight = (is_array($b) && isset($b['weight'])) ? $b['weight'] : 0; - if ($a_weight == $b_weight) { + if ($a_weight === $b_weight) { return 0; } return ($a_weight < $b_weight) ? -1 : 1; @@ -6462,7 +6462,7 @@ function drupal_sort_title($a, $b) { * Checks if the key is a property. */ function element_property($key) { - return $key[0] == '#'; + return $key[0] === '#'; } /** @@ -6476,7 +6476,7 @@ function element_properties($element) { * Checks if the key is a child. */ function element_child($key) { - return !isset($key[0]) || $key[0] != '#'; + return !isset($key[0]) || $key[0] !== '#'; } /** @@ -7182,7 +7182,7 @@ function drupal_parse_info_format($data) { // Create nested arrays. foreach ($keys as $key) { - if ($key == '') { + if ($key === '') { $key = count($parent); } if (!isset($parent[$key]) || !is_array($parent[$key])) { @@ -7197,7 +7197,7 @@ function drupal_parse_info_format($data) { } // Insert actual value. - if ($last == '') { + if ($last === '') { $last = count($parent); } $parent[$last] = $value; @@ -7249,7 +7249,7 @@ function drupal_explode_tags($tags) { // or includes a comma or quote character), we remove the escape // formatting so to save the term into the database as the user intends. $tag = trim(str_replace('""', '"', preg_replace('/^"(.*)"$/', '\1', $tag))); - if ($tag != "") { + if ($tag !== "") { $tags[] = $tag; } } @@ -7370,7 +7370,7 @@ function debug($data, $label = NULL, $print_r = FALSE) { * - 'original_version' contains the original version string (which can be * used in the UI for reporting incompatibilities). * - 'versions' is a list of associative arrays, each containing the keys - * 'op' and 'version'. 'op' can be one of: '=', '==', '!=', '<>', '<', + * 'op' and 'version'. 'op' can be one of: '=', '===', '!=', '<>', '<', * '<=', '>', or '>='. 'version' is one piece like '4.5-beta3'. * Callers should pass this structure to drupal_check_incompatibility(). * @@ -7379,7 +7379,7 @@ function debug($data, $label = NULL, $print_r = FALSE) { function drupal_parse_dependency($dependency) { // We use named subpatterns and support every op that version_compare // supports. Also, op is optional and defaults to equals. - $p_op = '(?P!=|==|=|<|<=|>|>=|<>)?'; + $p_op = '(?P!=|===|=|<|<=|>|>=|<>)?'; // Core version is always optional: 8.x-2.x and 2.x is treated the same. $p_core = '(?:' . preg_quote(DRUPAL_CORE_COMPATIBILITY) . '-)?'; $p_major = '(?P\d+)'; @@ -7393,18 +7393,18 @@ function drupal_parse_dependency($dependency) { foreach (explode(',', $parts[1]) as $version) { if (preg_match("/^\s*$p_op\s*$p_core$p_major\.$p_minor/", $version, $matches)) { $op = !empty($matches['operation']) ? $matches['operation'] : '='; - if ($matches['minor'] == 'x') { + if ($matches['minor'] === 'x') { // Drupal considers "2.x" to mean any version that begins with // "2" (e.g. 2.0, 2.9 are all "2.x"). PHP's version_compare(), // on the other hand, treats "x" as a string; so to // version_compare(), "2.x" is considered less than 2.0. This // means that >=2.x and <2.x are handled by version_compare() // as we need, but > and <= are not. - if ($op == '>' || $op == '<=') { + if ($op === '>' || $op === '<=') { $matches['major']++; } // Equivalence can be checked by adding two restrictions. - if ($op == '=' || $op == '==') { + if ($op === '=' || $op === '===') { $value['versions'][] = array('op' => '<', 'version' => ($matches['major'] + 1) . '.x'); $op = '>='; } diff --git a/core/includes/database.inc b/core/includes/database.inc index c2df949..3b3eff2 100644 --- a/core/includes/database.inc +++ b/core/includes/database.inc @@ -161,7 +161,7 @@ use Drupal\Core\Database\Query\Condition; * function my_other_function($id) { * // The transaction is still open here. * - * if ($id % 2 == 0) { + * if ($id % 2 === 0) { * db_update('example') * ->condition('id', $id) * ->fields(array('field2' => 10)) @@ -289,7 +289,7 @@ function db_query_temporary($query, array $args = array(), array $options = arra * A new InsertQuery object for this connection. */ function db_insert($table, array $options = array()) { - if (empty($options['target']) || $options['target'] == 'slave') { + if (empty($options['target']) || $options['target'] === 'slave') { $options['target'] = 'default'; } return Database::getConnection($options['target'])->insert($table, $options); @@ -307,7 +307,7 @@ function db_insert($table, array $options = array()) { * A new MergeQuery object for this connection. */ function db_merge($table, array $options = array()) { - if (empty($options['target']) || $options['target'] == 'slave') { + if (empty($options['target']) || $options['target'] === 'slave') { $options['target'] = 'default'; } return Database::getConnection($options['target'])->merge($table, $options); @@ -325,7 +325,7 @@ function db_merge($table, array $options = array()) { * A new UpdateQuery object for this connection. */ function db_update($table, array $options = array()) { - if (empty($options['target']) || $options['target'] == 'slave') { + if (empty($options['target']) || $options['target'] === 'slave') { $options['target'] = 'default'; } return Database::getConnection($options['target'])->update($table, $options); @@ -343,7 +343,7 @@ function db_update($table, array $options = array()) { * A new DeleteQuery object for this connection. */ function db_delete($table, array $options = array()) { - if (empty($options['target']) || $options['target'] == 'slave') { + if (empty($options['target']) || $options['target'] === 'slave') { $options['target'] = 'default'; } return Database::getConnection($options['target'])->delete($table, $options); @@ -361,7 +361,7 @@ function db_delete($table, array $options = array()) { * A new TruncateQuery object for this connection. */ function db_truncate($table, array $options = array()) { - if (empty($options['target']) || $options['target'] == 'slave') { + if (empty($options['target']) || $options['target'] === 'slave') { $options['target'] = 'default'; } return Database::getConnection($options['target'])->truncate($table, $options); diff --git a/core/includes/errors.inc b/core/includes/errors.inc index 0524170..362e001 100644 --- a/core/includes/errors.inc +++ b/core/includes/errors.inc @@ -85,7 +85,7 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line, $c '%file' => $caller['file'], '%line' => $caller['line'], 'severity_level' => $severity_level, - ), $error_level == E_RECOVERABLE_ERROR); + ), $error_level === E_RECOVERABLE_ERROR); } } @@ -164,10 +164,10 @@ function _drupal_render_exception_safe($exception) { */ function error_displayable($error = NULL) { $error_level = variable_get('error_level', ERROR_REPORTING_DISPLAY_ALL); - $updating = (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'update'); - $all_errors_displayed = ($error_level == ERROR_REPORTING_DISPLAY_ALL); - $error_needs_display = ($error_level == ERROR_REPORTING_DISPLAY_SOME && - isset($error) && $error['%type'] != 'Notice' && $error['%type'] != 'Strict warning'); + $updating = (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE === 'update'); + $all_errors_displayed = ($error_level === ERROR_REPORTING_DISPLAY_ALL); + $error_needs_display = ($error_level === ERROR_REPORTING_DISPLAY_SOME && + isset($error) && $error['%type'] !== 'Notice' && $error['%type'] !== 'Strict warning'); return ($updating || $all_errors_displayed || $error_needs_display); } @@ -185,7 +185,7 @@ function error_displayable($error = NULL) { function _drupal_log_error($error, $fatal = FALSE) { // Initialize a maintenance theme if the boostrap was not complete. // Do it early because drupal_set_message() triggers a drupal_theme_initialize(). - if ($fatal && (drupal_get_bootstrap_phase() != DRUPAL_BOOTSTRAP_FULL)) { + if ($fatal && (drupal_get_bootstrap_phase() !== DRUPAL_BOOTSTRAP_FULL)) { unset($GLOBALS['theme']); if (!defined('MAINTENANCE_MODE')) { define('MAINTENANCE_MODE', 'error'); @@ -227,7 +227,7 @@ function _drupal_log_error($error, $fatal = FALSE) { } } - if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') { + if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest') { if ($fatal) { // When called from JavaScript, simply output the error message. print t('%type: !message in %function (line %line of %file).', $error); @@ -242,7 +242,7 @@ function _drupal_log_error($error, $fatal = FALSE) { // If error type is 'User notice' then treat it as debug information // instead of an error message, see dd(). - if ($error['%type'] == 'User notice') { + if ($error['%type'] === 'User notice') { $error['%type'] = 'Debug'; $class = 'status'; } diff --git a/core/includes/file.inc b/core/includes/file.inc index eaff634..618a021 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -206,7 +206,7 @@ function file_get_stream_wrappers($filter = STREAM_WRAPPERS_ALL) { else { $wrappers[$scheme]['override'] = FALSE; } - if (($info['type'] & STREAM_WRAPPERS_LOCAL) == STREAM_WRAPPERS_LOCAL) { + if (($info['type'] & STREAM_WRAPPERS_LOCAL) === STREAM_WRAPPERS_LOCAL) { stream_wrapper_register($scheme, $info['class']); } else { @@ -215,7 +215,7 @@ function file_get_stream_wrappers($filter = STREAM_WRAPPERS_ALL) { } // Pre-populate the static cache with the filters most typically used. $wrappers_storage[STREAM_WRAPPERS_ALL][$scheme] = $wrappers[$scheme]; - if (($info['type'] & STREAM_WRAPPERS_WRITE_VISIBLE) == STREAM_WRAPPERS_WRITE_VISIBLE) { + if (($info['type'] & STREAM_WRAPPERS_WRITE_VISIBLE) === STREAM_WRAPPERS_WRITE_VISIBLE) { $wrappers_storage[STREAM_WRAPPERS_WRITE_VISIBLE][$scheme] = $wrappers[$scheme]; } } @@ -225,7 +225,7 @@ function file_get_stream_wrappers($filter = STREAM_WRAPPERS_ALL) { $wrappers_storage[$filter] = array(); foreach ($wrappers_storage[STREAM_WRAPPERS_ALL] as $scheme => $info) { // Bit-wise filter. - if (($info['type'] & $filter) == $filter) { + if (($info['type'] & $filter) === $filter) { $wrappers_storage[$filter][$scheme] = $info; } } @@ -308,7 +308,7 @@ function file_uri_target($uri) { $data = explode('://', $uri, 2); // Remove erroneous leading or trailing, forward-slashes and backslashes. - return count($data) == 2 ? trim($data[1], '\/') : FALSE; + return count($data) === 2 ? trim($data[1], '\/') : FALSE; } /** @@ -452,7 +452,7 @@ function file_create_url($uri) { // HTTP and to https://example.com/bar.jpg when viewing a HTTPS page) // Both types of relative URIs are characterized by a leading slash, hence // we can use a single check. - if (drupal_substr($uri, 0, 1) == '/') { + if (drupal_substr($uri, 0, 1) === '/') { return $uri; } else { @@ -461,7 +461,7 @@ function file_create_url($uri) { return $GLOBALS['base_url'] . '/' . drupal_encode_path($uri); } } - elseif ($scheme == 'http' || $scheme == 'https') { + elseif ($scheme === 'http' || $scheme === 'https') { // Check for http so that we don't have to implement getExternalUrl() for // the http wrapper. return $uri; @@ -841,7 +841,7 @@ function file_copy(stdClass $source, $destination = NULL, $replace = FILE_EXISTS $file->uri = $uri; $file->filename = drupal_basename($uri); // If we are replacing an existing file re-use its database record. - if ($replace == FILE_EXISTS_REPLACE) { + if ($replace === FILE_EXISTS_REPLACE) { $existing_files = file_load_multiple(array(), array('uri' => $uri)); if (count($existing_files)) { $existing = reset($existing_files); @@ -851,7 +851,7 @@ function file_copy(stdClass $source, $destination = NULL, $replace = FILE_EXISTS } // If we are renaming around an existing file (rather than a directory), // use its basename for the filename. - elseif ($replace == FILE_EXISTS_RENAME && is_file($destination)) { + elseif ($replace === FILE_EXISTS_RENAME && is_file($destination)) { $file->filename = drupal_basename($destination); } @@ -971,7 +971,7 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST // Assert that the source and destination filenames are not the same. $real_source = drupal_realpath($source); $real_destination = drupal_realpath($destination); - if ($source == $destination || ($real_source !== FALSE) && ($real_source == $real_destination)) { + if ($source === $destination || ($real_source !== FALSE) && ($real_source === $real_destination)) { drupal_set_message(t('The specified file %file was not copied because it would overwrite itself.', array('%file' => $source)), 'error'); watchdog('file', 'File %file could not be copied because it would overwrite itself.', array('%file' => $source)); return FALSE; @@ -1090,7 +1090,7 @@ function file_move(stdClass $source, $destination = NULL, $replace = FILE_EXISTS $file = clone $source; $file->uri = $uri; // If we are replacing an existing file re-use its database record. - if ($replace == FILE_EXISTS_REPLACE) { + if ($replace === FILE_EXISTS_REPLACE) { $existing_files = file_load_multiple(array(), array('uri' => $uri)); if (count($existing_files)) { $existing = reset($existing_files); @@ -1100,7 +1100,7 @@ function file_move(stdClass $source, $destination = NULL, $replace = FILE_EXISTS } // If we are renaming around an existing file (rather than a directory), // use its basename for the filename. - elseif ($replace == FILE_EXISTS_RENAME && is_file($destination)) { + elseif ($replace === FILE_EXISTS_RENAME && is_file($destination)) { $file->filename = drupal_basename($destination); } @@ -1142,7 +1142,7 @@ function file_move(stdClass $source, $destination = NULL, $replace = FILE_EXISTS */ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXISTS_RENAME) { $filepath = file_unmanaged_copy($source, $destination, $replace); - if ($filepath == FALSE || file_unmanaged_delete($source) == FALSE) { + if ($filepath === FALSE || file_unmanaged_delete($source) === FALSE) { return FALSE; } return $filepath; @@ -1204,7 +1204,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) { } $filename = $new_filename . '.' . $final_extension; - if ($alerts && $original != $filename) { + if ($alerts && $original !== $filename) { drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $filename))); } } @@ -1244,13 +1244,13 @@ function file_create_filename($basename, $directory) { // Strip control characters (ASCII value < 32). Though these are allowed in // some filesystems, not many applications handle them well. $basename = preg_replace('/[\x00-\x1F]/u', '_', $basename); - if (substr(PHP_OS, 0, 3) == 'WIN') { + if (substr(PHP_OS, 0, 3) === 'WIN') { // These characters are not allowed in Windows filenames $basename = str_replace(array(':', '*', '?', '"', '<', '>', '|'), '_', $basename); } // A URI or path may already have a trailing slash or look like "public://". - if (substr($directory, -1) == '/') { + if (substr($directory, -1) === '/') { $separator = ''; } else { @@ -1402,7 +1402,7 @@ function file_unmanaged_delete_recursive($path) { if (is_dir($path)) { $dir = dir($path); while (($entry = $dir->read()) !== FALSE) { - if ($entry == '.' || $entry == '..') { + if ($entry === '.' || $entry === '..') { continue; } $entry_path = $path . '/' . $entry; @@ -1559,7 +1559,7 @@ function file_save_upload($source, $validators = array(), $destination = FALSE, // rename filename.php.foo and filename.php to filename.php.foo.txt and // filename.php.txt, respectively). Don't rename if 'allow_insecure_uploads' // evaluates to TRUE. - if (!variable_get('allow_insecure_uploads', 0) && preg_match('/\.(php|pl|py|cgi|asp|js)(\.|$)/i', $file->filename) && (substr($file->filename, -4) != '.txt')) { + if (!variable_get('allow_insecure_uploads', 0) && preg_match('/\.(php|pl|py|cgi|asp|js)(\.|$)/i', $file->filename) && (substr($file->filename, -4) !== '.txt')) { $file->filemime = 'text/plain'; $file->uri .= '.txt'; $file->filename .= '.txt'; @@ -1585,11 +1585,11 @@ function file_save_upload($source, $validators = array(), $destination = FALSE, $file->source = $source; // A URI may already have a trailing slash or look like "public://". - if (substr($destination, -1) != '/') { + if (substr($destination, -1) !== '/') { $destination .= '/'; } $file->destination = file_destination($destination . $file->filename, $replace); - // If file_destination() returns FALSE then $replace == FILE_EXISTS_ERROR and + // If file_destination() returns FALSE then $replace === FILE_EXISTS_ERROR and // there's an existing file so we need to bail. if ($file->destination === FALSE) { drupal_set_message(t('The file %source could not be uploaded because a file by that name already exists in the destination %directory.', array('%source' => $source, '%directory' => $destination)), 'error'); @@ -1629,7 +1629,7 @@ function file_save_upload($source, $validators = array(), $destination = FALSE, drupal_chmod($file->uri); // If we are replacing an existing file re-use its database record. - if ($replace == FILE_EXISTS_REPLACE) { + if ($replace === FILE_EXISTS_REPLACE) { $existing_files = file_load_multiple(array(), array('uri' => $file->uri)); if (count($existing_files)) { $existing = reset($existing_files); @@ -1789,7 +1789,7 @@ function file_validate_size(stdClass $file, $file_limit = 0, $user_limit = 0) { $errors = array(); // Bypass validation for uid = 1. - if ($user->uid != 1) { + if ($user->uid !== 1) { if ($file_limit && $file->filesize > $file_limit) { $errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->filesize), '%maxsize' => format_size($file_limit))); } @@ -1927,7 +1927,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM $file->uid = $user->uid; $file->status = FILE_STATUS_PERMANENT; // If we are replacing an existing file re-use its database record. - if ($replace == FILE_EXISTS_REPLACE) { + if ($replace === FILE_EXISTS_REPLACE) { $existing_files = file_load_multiple(array(), array('uri' => $uri)); if (count($existing_files)) { $existing = reset($existing_files); @@ -1937,7 +1937,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM } // If we are renaming around an existing file (rather than a directory), // use its basename for the filename. - elseif ($replace == FILE_EXISTS_RENAME && is_file($destination)) { + elseif ($replace === FILE_EXISTS_RENAME && is_file($destination)) { $file->filename = drupal_basename($destination); } @@ -2045,7 +2045,7 @@ function file_download() { foreach (module_implements('file_download') as $module) { $function = $module . '_file_download'; $result = $function($uri); - if ($result == -1) { + if ($result === -1) { return drupal_access_denied(); } if (isset($result) && is_array($result)) { @@ -2108,7 +2108,7 @@ function file_scan_directory($dir, $mask, $options = array(), $depth = 0) { $files = array(); if (is_dir($dir) && $handle = opendir($dir)) { while (FALSE !== ($filename = readdir($handle))) { - if (!preg_match($options['nomask'], $filename) && $filename[0] != '.') { + if (!preg_match($options['nomask'], $filename) && $filename[0] !== '.') { $uri = "$dir/$filename"; $uri = file_stream_wrapper_uri_normalize($uri); if (is_dir($uri) && $options['recurse']) { @@ -2263,7 +2263,7 @@ function drupal_chmod($uri, $mode = NULL) { */ function drupal_unlink($uri, $context = NULL) { $scheme = file_uri_scheme($uri); - if ((!$scheme || !file_stream_wrapper_valid_scheme($scheme)) && (substr(PHP_OS, 0, 3) == 'WIN')) { + if ((!$scheme || !file_stream_wrapper_valid_scheme($scheme)) && (substr(PHP_OS, 0, 3) === 'WIN')) { chmod($uri, 0600); } if ($context) { @@ -2357,7 +2357,7 @@ function drupal_dirname($uri) { */ function drupal_basename($uri, $suffix = NULL) { $separators = '/'; - if (DIRECTORY_SEPARATOR != '/') { + if (DIRECTORY_SEPARATOR !== '/') { // For Windows OS add special separator. $separators .= DIRECTORY_SEPARATOR; } @@ -2429,7 +2429,7 @@ function drupal_mkdir($uri, $mode = NULL, $recursive = FALSE, $context = NULL) { */ function drupal_rmdir($uri, $context = NULL) { $scheme = file_uri_scheme($uri); - if ((!$scheme || !file_stream_wrapper_valid_scheme($scheme)) && (substr(PHP_OS, 0, 3) == 'WIN')) { + if ((!$scheme || !file_stream_wrapper_valid_scheme($scheme)) && (substr(PHP_OS, 0, 3) === 'WIN')) { chmod($uri, 0700); } if ($context) { @@ -2496,7 +2496,7 @@ function file_directory_temp() { } // Operating system specific dirs. - if (substr(PHP_OS, 0, 3) == 'WIN') { + if (substr(PHP_OS, 0, 3) === 'WIN') { $directories[] = 'c:\\windows\\temp'; $directories[] = 'c:\\winnt\\temp'; } diff --git a/core/includes/form.inc b/core/includes/form.inc index ae04144..2991381 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -304,7 +304,7 @@ function drupal_build_form($form_id, &$form_state) { $form_state += form_state_defaults(); if (!isset($form_state['input'])) { - $form_state['input'] = $form_state['method'] == 'get' ? $_GET : $_POST; + $form_state['input'] = $form_state['method'] === 'get' ? $_GET : $_POST; } if (isset($_SESSION['batch_form_state'])) { @@ -320,7 +320,7 @@ function drupal_build_form($form_id, &$form_state) { // form to proceed. In addition, if there is stored form_state data from a // previous step, we'll retrieve it so it can be passed on to the form // processing code. - $check_cache = isset($form_state['input']['form_id']) && $form_state['input']['form_id'] == $form_id && !empty($form_state['input']['form_build_id']); + $check_cache = isset($form_state['input']['form_id']) && $form_state['input']['form_id'] === $form_id && !empty($form_state['input']['form_build_id']); if ($check_cache) { $form = form_get_cache($form_state['input']['form_build_id'], $form_state); } @@ -828,7 +828,7 @@ function drupal_process_form($form_id, &$form, &$form_state) { $form_state['values'] = array(); // With $_GET, these forms are always submitted if requested. - if ($form_state['method'] == 'get' && !empty($form_state['always_process'])) { + if ($form_state['method'] === 'get' && !empty($form_state['always_process'])) { if (!isset($form_state['input']['form_build_id'])) { $form_state['input']['form_build_id'] = $form['#build_id']; } @@ -969,7 +969,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) { $form_state['programmed'] = isset($form_state['programmed']) ? $form_state['programmed'] : FALSE; // Fix the form method, if it is 'get' in $form_state, but not in $form. - if ($form_state['method'] == 'get' && !isset($form['#method'])) { + if ($form_state['method'] === 'get' && !isset($form['#method'])) { $form['#method'] = 'get'; } @@ -1296,7 +1296,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) { } if (isset($elements['#options']) && isset($elements['#value'])) { - if ($elements['#type'] == 'select') { + if ($elements['#type'] === 'select') { $options = form_options_flatten($elements['#options']); } else { @@ -1320,7 +1320,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) { // identical to the empty option's value, we reset the element's value // to NULL to trigger the regular #required handling below. // @see form_process_select() - elseif ($elements['#type'] == 'select' && !$elements['#multiple'] && $elements['#required'] && !isset($elements['#default_value']) && $elements['#value'] === $elements['#empty_value']) { + elseif ($elements['#type'] === 'select' && !$elements['#multiple'] && $elements['#required'] && !isset($elements['#default_value']) && $elements['#value'] === $elements['#empty_value']) { $elements['#value'] = NULL; form_set_value($elements, NULL, $form_state); } @@ -1372,7 +1372,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) { // An unchecked checkbox has a #value of integer 0, different than string // '0', which could be a valid value. $is_empty_multiple = (!count($elements['#value'])); - $is_empty_string = (is_string($elements['#value']) && drupal_strlen(trim($elements['#value'])) == 0); + $is_empty_string = (is_string($elements['#value']) && drupal_strlen(trim($elements['#value'])) === 0); $is_empty_value = ($elements['#value'] === 0); if ($is_empty_multiple || $is_empty_string || $is_empty_value) { // Although discouraged, a #title is not mandatory for form elements. In @@ -1442,7 +1442,7 @@ function form_execute_handlers($type, &$form, &$form_state) { // Check if a previous _submit handler has set a batch, but make sure we // do not react to a batch that is already being processed (for instance // if a batch operation performs a drupal_form_submit()). - if ($type == 'submit' && ($batch =& batch_get()) && !isset($batch['id'])) { + if ($type === 'submit' && ($batch =& batch_get()) && !isset($batch['id'])) { // Some previous submit handler has set a batch. To ensure correct // execution order, store the call in a special 'control' batch set. // See _batch_next_set(). @@ -1748,7 +1748,7 @@ function form_builder($form_id, &$element, &$form_state) { ); // Special handling if we're on the top level form element. - if (isset($element['#type']) && $element['#type'] == 'form') { + if (isset($element['#type']) && $element['#type'] === 'form') { if (!empty($element['#https']) && variable_get('https', FALSE) && !url_is_external($element['#action'])) { global $base_root; @@ -1765,7 +1765,7 @@ function form_builder($form_id, &$element, &$form_state) { // Set a flag if we have a correct form submission. This is always TRUE for // programmed forms coming from drupal_form_submit(), or if the form_id coming // from the POST data is set and matches the current form_id. - if ($form_state['programmed'] || (!empty($form_state['input']) && (isset($form_state['input']['form_id']) && ($form_state['input']['form_id'] == $form_id)))) { + if ($form_state['programmed'] || (!empty($form_state['input']) && (isset($form_state['input']['form_id']) && ($form_state['input']['form_id'] === $form_id)))) { $form_state['process_input'] = TRUE; } else { @@ -1864,13 +1864,13 @@ function form_builder($form_id, &$element, &$form_state) { // If there is a file element, we need to flip a flag so later the // form encoding can be set. - if (isset($element['#type']) && $element['#type'] == 'file') { + if (isset($element['#type']) && $element['#type'] === 'file') { $form_state['has_file_element'] = TRUE; } // Final tasks for the form element after form_builder() has run for all other // elements. - if (isset($element['#type']) && $element['#type'] == 'form') { + if (isset($element['#type']) && $element['#type'] === 'form') { // If there is a file element, we set the form encoding. if (isset($form_state['has_file_element'])) { $element['#attributes']['enctype'] = 'multipart/form-data'; @@ -1927,7 +1927,7 @@ function _form_builder_handle_input_element($form_id, &$element, &$form_state) { if (!isset($element['#name'])) { $name = array_shift($element['#parents']); $element['#name'] = $name; - if ($element['#type'] == 'file') { + if ($element['#type'] === 'file') { // To make it easier to handle $_FILES in file.inc, we place all // file fields in the 'files' array. Also, we do not support // nested file names. @@ -2071,8 +2071,8 @@ function _form_builder_handle_input_element($form_id, &$element, &$form_state) { * named 'op', and only differing in their value. */ function _form_element_triggered_scripted_submission($element, &$form_state) { - if (!empty($form_state['input']['_triggering_element_name']) && $element['#name'] == $form_state['input']['_triggering_element_name']) { - if (empty($form_state['input']['_triggering_element_value']) || $form_state['input']['_triggering_element_value'] == $element['#value']) { + if (!empty($form_state['input']['_triggering_element_name']) && $element['#name'] === $form_state['input']['_triggering_element_name']) { + if (empty($form_state['input']['_triggering_element_value']) || $form_state['input']['_triggering_element_value'] === $element['#value']) { return TRUE; } } @@ -2105,7 +2105,7 @@ function _form_button_was_clicked($element, &$form_state) { // and the specific return value is used to determine which was // clicked. This ONLY works as long as $form['#name'] puts the // value at the top level of the tree of $_POST data. - if (isset($form_state['input'][$element['#name']]) && $form_state['input'][$element['#name']] == $element['#value']) { + if (isset($form_state['input'][$element['#name']]) && $form_state['input'][$element['#name']] === $element['#value']) { return TRUE; } // When image buttons are clicked, browsers do NOT pass the form element @@ -2205,7 +2205,7 @@ function form_type_image_button_value($form, $input, $form_state) { $input = $form_state['input']; foreach (explode('[', $form['#name']) as $element_name) { // chop off the ] that may exist. - if (substr($element_name, -1) == ']') { + if (substr($element_name, -1) === ']') { $element_name = substr($element_name, 0, -1); } @@ -2360,7 +2360,7 @@ function form_type_radios_value(&$element, $input = FALSE) { * for this element. Return nothing to use the default. */ function form_type_tableselect_value($element, $input = FALSE) { - // If $element['#multiple'] == FALSE, then radio buttons are displayed and + // If $element['#multiple'] === FALSE, then radio buttons are displayed and // the default value handling is used. if (isset($element['#multiple']) && $element['#multiple']) { // Checkboxes are being displayed with the default value coming from the @@ -2733,7 +2733,7 @@ function form_get_options($element, $key) { $keys[] = $index; } } - elseif ($index == $key) { + elseif ($index === $key) { $keys[] = $index; } } @@ -2793,7 +2793,7 @@ function theme_radio($variables) { $element['#attributes']['type'] = 'radio'; element_set_attributes($element, array('id', 'name', '#return_value' => 'value')); - if (isset($element['#return_value']) && $element['#value'] !== FALSE && $element['#value'] == $element['#return_value']) { + if (isset($element['#return_value']) && $element['#value'] !== FALSE && $element['#value'] === $element['#return_value']) { $element['#attributes']['checked'] = 'checked'; } _form_set_class($element, array('form-radio')); @@ -3103,7 +3103,7 @@ function theme_checkboxes($variables) { function form_pre_render_conditional_form_element($element) { $t = get_t(); // Set the element's title attribute to show #title as a tooltip, if needed. - if (isset($element['#title']) && $element['#title_display'] == 'attribute') { + if (isset($element['#title']) && $element['#title_display'] === 'attribute') { $element['#attributes']['title'] = $element['#title']; if (!empty($element['#required'])) { // Append an indication that this field is required. @@ -3164,7 +3164,7 @@ function form_process_checkboxes($element) { $value = is_array($element['#value']) ? $element['#value'] : array(); $element['#tree'] = TRUE; if (count($element['#options']) > 0) { - if (!isset($element['#default_value']) || $element['#default_value'] == 0) { + if (!isset($element['#default_value']) || $element['#default_value'] === 0) { $element['#default_value'] = array(); } $weight = 0; @@ -3402,7 +3402,7 @@ function form_process_tableselect($element) { '#type' => 'radio', '#title' => '', '#return_value' => $key, - '#default_value' => ($element['#default_value'] == $key) ? $key : NULL, + '#default_value' => ($element['#default_value'] === $key) ? $key : NULL, '#attributes' => $element['#attributes'], '#parents' => $element['#parents'], '#id' => drupal_html_id('edit-' . implode('-', $parents_for_id)), @@ -3544,7 +3544,7 @@ function form_validate_machine_name(&$element, &$form_state) { if (!isset($element['#machine_name']['error'])) { // Since a hyphen is the most common alternative replacement character, // a corresponding validation error message is supported here. - if ($element['#machine_name']['replace'] == '-') { + if ($element['#machine_name']['replace'] === '-') { form_error($element, t('The machine-readable name must contain only lowercase letters, numbers, and hyphens.')); } // Otherwise, we assume the default (underscore). @@ -3968,7 +3968,7 @@ function form_validate_number(&$element, &$form_state) { form_error($element, t('%name must be below or equal to %max.', array('%name' => $name, '%max' => $element['#max']))); } - if (isset($element['#step']) && strtolower($element['#step']) != 'any') { + if (isset($element['#step']) && strtolower($element['#step']) !== 'any') { // Check that the input is an allowed multiple of #step (offset by #min if // #min is set). $offset = isset($element['#min']) ? $element['#min'] : 0.0; @@ -4346,11 +4346,11 @@ function theme_form_element_label($variables) { $attributes = array(); // Style the label as class option to display inline with the element. - if ($element['#title_display'] == 'after') { + if ($element['#title_display'] === 'after') { $attributes['class'] = 'option'; } // Show label only to screen readers to avoid disruption in visual flows. - elseif ($element['#title_display'] == 'invisible') { + elseif ($element['#title_display'] === 'invisible') { $attributes['class'] = 'element-invisible'; } @@ -4482,7 +4482,7 @@ function _form_set_class(&$element, $class = array()) { * $context['sandbox']['current_node'] = $node->nid; * $context['message'] = check_plain($node->title); * } - * if ($context['sandbox']['progress'] != $context['sandbox']['max']) { + * if ($context['sandbox']['progress'] !== $context['sandbox']['max']) { * $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max']; * } * } diff --git a/core/includes/gettext.inc b/core/includes/gettext.inc index a8498dc..732728c 100644 --- a/core/includes/gettext.inc +++ b/core/includes/gettext.inc @@ -128,7 +128,7 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N // A line should not be longer than 10 * 1024. $line = fgets($fd, 10 * 1024); - if ($lineno == 0) { + if ($lineno === 0) { // The first line might come with a UTF-8 BOM, which should be removed. $line = str_replace("\xEF\xBB\xBF", '', $line); } @@ -141,11 +141,11 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N if (!strncmp('#', $line, 1)) { // Lines starting with '#' are comments. - if ($context == 'COMMENT') { + if ($context === 'COMMENT') { // Already in comment token, insert the comment. $current['#'][] = substr($line, 1); } - elseif (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { + elseif (($context === 'MSGSTR') || ($context === 'MSGSTR_ARR')) { // We are currently in string token, close it out. _locale_import_one_string($op, $current, $overwrite_options, $lang, $file, $customized); @@ -164,7 +164,7 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N elseif (!strncmp('msgid_plural', $line, 12)) { // A plural form for the current message. - if ($context != 'MSGID') { + if ($context !== 'MSGID') { // A plural form cannot be added to anything else but the id directly. _locale_import_message('The translation file %filename contains an error: "msgid_plural" was expected but not found on line %line.', $file, $lineno); return FALSE; @@ -189,14 +189,14 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N elseif (!strncmp('msgid', $line, 5)) { // Starting a new message. - if (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { + if (($context === 'MSGSTR') || ($context === 'MSGSTR_ARR')) { // We are currently in a message string, close it out. _locale_import_one_string($op, $current, $overwrite_options, $lang, $file, $customized); // Start a new context for the id. $current = array(); } - elseif ($context == 'MSGID') { + elseif ($context === 'MSGID') { // We are currently already in the context, meaning we passed an id with no data. _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno); return FALSE; @@ -219,7 +219,7 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N elseif (!strncmp('msgctxt', $line, 7)) { // Starting a new context. - if (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { + if (($context === 'MSGSTR') || ($context === 'MSGSTR_ARR')) { // We are currently in a message, start a new one. _locale_import_one_string($op, $current, $overwrite_options, $lang, $file, $customized); $current = array(); @@ -248,7 +248,7 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N elseif (!strncmp('msgstr[', $line, 7)) { // A message string for a specific plurality. - if (($context != 'MSGID') && ($context != 'MSGCTXT') && ($context != 'MSGID_PLURAL') && ($context != 'MSGSTR_ARR')) { + if (($context !== 'MSGID') && ($context !== 'MSGCTXT') && ($context !== 'MSGID_PLURAL') && ($context !== 'MSGSTR_ARR')) { // Message strings must come after msgid, msgxtxt, msgid_plural, or other msgstr[] entries. _locale_import_message('The translation file %filename contains an error: "msgstr[]" is unexpected on line %line.', $file, $lineno); return FALSE; @@ -281,7 +281,7 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N elseif (!strncmp("msgstr", $line, 6)) { // A string for the an id or context. - if (($context != 'MSGID') && ($context != 'MSGCTXT')) { + if (($context !== 'MSGID') && ($context !== 'MSGCTXT')) { // Strings are only valid within an id or context scope. _locale_import_message('The translation file %filename contains an error: "msgstr" is unexpected on line %line.', $file, $lineno); return FALSE; @@ -302,7 +302,7 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N $context = 'MSGSTR'; } - elseif ($line != '') { + elseif ($line !== '') { // Anything that is not a token may be a continuation of a previous token. $quoted = _locale_import_parse_quoted($line); @@ -313,16 +313,16 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N } // Append the string to the current context. - if (($context == 'MSGID') || ($context == 'MSGID_PLURAL')) { + if (($context === 'MSGID') || ($context === 'MSGID_PLURAL')) { $current['msgid'] .= $quoted; } - elseif ($context == 'MSGCTXT') { + elseif ($context === 'MSGCTXT') { $current['msgctxt'] .= $quoted; } - elseif ($context == 'MSGSTR') { + elseif ($context === 'MSGSTR') { $current['msgstr'] .= $quoted; } - elseif ($context == 'MSGSTR_ARR') { + elseif ($context === 'MSGSTR_ARR') { $current['msgstr'][$plural] .= $quoted; } else { @@ -334,10 +334,10 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N } // End of PO file, closed out the last entry. - if (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { + if (($context === 'MSGSTR') || ($context === 'MSGSTR_ARR')) { _locale_import_one_string($op, $current, $overwrite_options, $lang, $file, $customized); } - elseif ($context != 'COMMENT') { + elseif ($context !== 'COMMENT') { _locale_import_message('The translation file %filename ended unexpectedly at line %line.', $file, $lineno); return FALSE; } @@ -404,7 +404,7 @@ function _locale_import_one_string($op, $value = NULL, $overwrite_options = NULL // Store the string we got in the database. case 'db-store': - if ($value['msgid'] == '') { + if ($value['msgid'] === '') { // If 'msgid' is empty, it means we got values for the header of the // file as per the structure of the Gettext format. $locale_plurals = variable_get('locale_translation_plurals', array()); @@ -653,7 +653,7 @@ function _locale_import_parse_plural_forms($pluralforms, $filepath) { */ function _locale_import_parse_arithmetic($string) { // Operator precedence table - $precedence = array("(" => -1, ")" => -1, "?" => 1, ":" => 1, "||" => 3, "&&" => 4, "==" => 5, "!=" => 5, "<" => 6, ">" => 6, "<=" => 6, ">=" => 6, "+" => 7, "-" => 7, "*" => 8, "/" => 8, "%" => 8); + $precedence = array("(" => -1, ")" => -1, "?" => 1, ":" => 1, "||" => 3, "&&" => 4, "===" => 5, "!=" => 5, "<" => 6, ">" => 6, "<=" => 6, ">=" => 6, "+" => 7, "-" => 7, "*" => 8, "/" => 8, "%" => 8); // Right associativity $right_associativity = array("?" => 1, ":" => 1); @@ -672,15 +672,15 @@ function _locale_import_parse_arithmetic($string) { if (is_numeric($token)) { $element_stack[] = $current_token; } - elseif ($current_token == "n") { + elseif ($current_token === "n") { $element_stack[] = '$n'; } - elseif ($current_token == "(") { + elseif ($current_token === "(") { $operator_stack[] = $current_token; } - elseif ($current_token == ")") { + elseif ($current_token === ")") { $topop = array_pop($operator_stack); - while (isset($topop) && ($topop != "(")) { + while (isset($topop) && ($topop !== "(")) { $element_stack[] = $topop; $topop = array_pop($operator_stack); } @@ -689,7 +689,7 @@ function _locale_import_parse_arithmetic($string) { // If it's an operator, then pop from $operator_stack into $element_stack until the // precedence in $operator_stack is less than current, then push into $operator_stack $topop = array_pop($operator_stack); - while (isset($topop) && ($precedence[$topop] >= $precedence[$current_token]) && !(($precedence[$topop] == $precedence[$current_token]) && !empty($right_associativity[$topop]) && !empty($right_associativity[$current_token]))) { + while (isset($topop) && ($precedence[$topop] >= $precedence[$current_token]) && !(($precedence[$topop] === $precedence[$current_token]) && !empty($right_associativity[$topop]) && !empty($right_associativity[$current_token]))) { $element_stack[] = $topop; $topop = array_pop($operator_stack); } @@ -705,7 +705,7 @@ function _locale_import_parse_arithmetic($string) { // Flush operator stack $topop = array_pop($operator_stack); - while ($topop != NULL) { + while ($topop !== NULL) { $element_stack[] = $topop; $topop = array_pop($operator_stack); } @@ -718,10 +718,10 @@ function _locale_import_parse_arithmetic($string) { $op = $element_stack[$i]; if (!empty($precedence[$op])) { $f = ""; - if ($op == ":") { + if ($op === ":") { $f = $element_stack[$i - 2] . "):" . $element_stack[$i - 1] . ")"; } - elseif ($op == "?") { + elseif ($op === "?") { $f = "(" . $element_stack[$i - 2] . "?(" . $element_stack[$i - 1]; } else { @@ -734,7 +734,7 @@ function _locale_import_parse_arithmetic($string) { } // If only one element is left, the number of operators is appropriate - if (count($element_stack) == 1) { + if (count($element_stack) === 1) { return $element_stack[0]; } else { @@ -772,7 +772,7 @@ function _locale_import_tokenize_formula($formula) { case 2: case 3: case 4: - if ($next == '=') { + if ($next === '=') { $tokens[] = $formula[$i] . '='; $i++; } @@ -781,7 +781,7 @@ function _locale_import_tokenize_formula($formula) { } break; case 5: - if ($next == '&') { + if ($next === '&') { $tokens[] = '&&'; $i++; } @@ -790,7 +790,7 @@ function _locale_import_tokenize_formula($formula) { } break; case 6: - if ($next == '|') { + if ($next === '|') { $tokens[] = '||'; $i++; } @@ -840,15 +840,15 @@ function _locale_import_shorten_comments($comment) { * The string parsed from inside the quotes. */ function _locale_import_parse_quoted($string) { - if (substr($string, 0, 1) != substr($string, -1, 1)) { + if (substr($string, 0, 1) !== substr($string, -1, 1)) { return FALSE; // Start and end quotes must be the same } $quote = substr($string, 0, 1); $string = substr($string, 1, -1); - if ($quote == '"') { // Double quotes: strip slashes + if ($quote === '"') { // Double quotes: strip slashes return stripcslashes($string); } - elseif ($quote == "'") { // Simple quote: return as-is + elseif ($quote === "'") { // Simple quote: return as-is return $string; } else { @@ -880,7 +880,7 @@ function _locale_export_get_strings($language = NULL, $options = array()) { 'not_customized' => FALSE, 'not_translated' => FALSE, ); - if (array_sum($options) == 0) { + if (array_sum($options) === 0) { // If user asked to not include anything in the translation files, // that would not make sense, so just fall back on providing a template. $language = NULL; @@ -1070,7 +1070,7 @@ function _locale_export_string($str) { $parts = array(); // Cut text into several lines - while ($stri != "") { + while ($stri !== "") { $i = strpos($stri, "\\n"); if ($i === FALSE) { $curstr = $stri; @@ -1089,7 +1089,7 @@ function _locale_export_string($str) { return "\"\"\n\"" . implode("\"\n\"", $parts) . "\"\n"; } // Single line string - elseif (count($parts) == 1) { + elseif (count($parts) === 1) { return "\"$parts[0]\"\n"; } // No translation diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index e07808a..c86fbc0 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -378,7 +378,7 @@ function install_run_tasks(&$install_state) { $install_state['active_task'] = $task_name; $original_parameters = $install_state['parameters']; $output = install_run_task($task, $install_state); - $install_state['parameters_changed'] = ($install_state['parameters'] != $original_parameters); + $install_state['parameters_changed'] = ($install_state['parameters'] !== $original_parameters); // Store this task as having been performed during the current request, // and save it to the database as completed, if we need to and if the // database is in a state that allows us to do so. Also mark the @@ -386,7 +386,7 @@ function install_run_tasks(&$install_state) { if (!$install_state['task_not_complete']) { $install_state['tasks_performed'][] = $task_name; $install_state['installation_finished'] = empty($tasks_to_perform); - if ($install_state['database_tables_exist'] && ($task['run'] == INSTALL_TASK_RUN_IF_NOT_COMPLETED || $install_state['installation_finished'])) { + if ($install_state['database_tables_exist'] && ($task['run'] === INSTALL_TASK_RUN_IF_NOT_COMPLETED || $install_state['installation_finished'])) { variable_set('install_task', $install_state['installation_finished'] ? 'done' : $task_name); } } @@ -414,7 +414,7 @@ function install_run_tasks(&$install_state) { function install_run_task($task, &$install_state) { $function = $task['function']; - if ($task['type'] == 'form') { + if ($task['type'] === 'form') { require_once DRUPAL_ROOT . '/core/includes/form.inc'; if ($install_state['interactive']) { // For interactive forms, build the form and ensure that it will not @@ -457,7 +457,7 @@ function install_run_task($task, &$install_state) { } } - elseif ($task['type'] == 'batch') { + elseif ($task['type'] === 'batch') { // Start a new batch based on the task function, if one is not running // already. $current_batch = variable_get('install_current_batch'); @@ -485,7 +485,7 @@ function install_run_task($task, &$install_state) { } // If we are in the middle of processing this batch, keep sending back // any output from the batch process, until the task is complete. - elseif ($current_batch == $function) { + elseif ($current_batch === $function) { include_once DRUPAL_ROOT . '/core/includes/batch.inc'; $output = _batch_page(); // The task is complete when we try to access the batch page and receive @@ -533,10 +533,10 @@ function install_tasks_to_perform($install_state) { // Also, if we started this page request with an indication of the last // task that was completed, skip that task and all those that come before // it, unless they are marked as always needing to run. - if ($task['run'] == INSTALL_TASK_SKIP || in_array($name, $install_state['tasks_performed']) || (!empty($install_state['completed_task']) && empty($completed_task_found) && $task['run'] != INSTALL_TASK_RUN_IF_REACHED)) { + if ($task['run'] === INSTALL_TASK_SKIP || in_array($name, $install_state['tasks_performed']) || (!empty($install_state['completed_task']) && empty($completed_task_found) && $task['run'] !== INSTALL_TASK_RUN_IF_REACHED)) { unset($tasks[$name]); } - if (!empty($install_state['completed_task']) && $name == $install_state['completed_task']) { + if (!empty($install_state['completed_task']) && $name === $install_state['completed_task']) { $completed_task_found = TRUE; } } @@ -560,7 +560,7 @@ function install_tasks_to_perform($install_state) { */ function install_tasks($install_state) { // Determine whether translation import tasks will need to be performed. - $needs_translations = count($install_state['translations']) > 1 && !empty($install_state['parameters']['langcode']) && $install_state['parameters']['langcode'] != 'en'; + $needs_translations = count($install_state['translations']) > 1 && !empty($install_state['parameters']['langcode']) && $install_state['parameters']['langcode'] !== 'en'; // Start with the core installation tasks that run before handing control // to the install profile. @@ -571,7 +571,7 @@ function install_tasks($install_state) { ), 'install_select_profile' => array( 'display_name' => st('Choose profile'), - 'display' => count($install_state['profiles']) != 1, + 'display' => count($install_state['profiles']) !== 1, 'run' => INSTALL_TASK_RUN_IF_REACHED, ), 'install_load_profile' => array( @@ -591,7 +591,7 @@ function install_tasks($install_state) { 'run' => INSTALL_TASK_RUN_IF_REACHED, ), 'install_profile_modules' => array( - 'display_name' => count($install_state['profiles']) == 1 ? st('Install site') : st('Install profile'), + 'display_name' => count($install_state['profiles']) === 1 ? st('Install site') : st('Install profile'), 'type' => 'batch', ), 'install_import_translations' => array( @@ -772,7 +772,7 @@ function install_verify_requirements(&$install_state) { // If there are errors, always display them. If there are only warnings, skip // them if the user has provided a URL parameter acknowledging the warnings // and indicating a desire to continue anyway. See drupal_requirements_url(). - if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) { + if ($severity === REQUIREMENT_ERROR || ($severity === REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) { if ($install_state['interactive']) { drupal_set_title(st('Requirements problem')); $status_report = theme('status_report', array('requirements' => $requirements)); @@ -786,7 +786,7 @@ function install_verify_requirements(&$install_state) { // Skip warnings altogether for non-interactive installations; these // proceed in a single request so there is no good opportunity (and no // good method) to warn the user anyway. - if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { + if (isset($requirement['severity']) && $requirement['severity'] === REQUIREMENT_ERROR) { $failures[] = $requirement['title'] . ': ' . $requirement['value'] . "\n\n" . $requirement['description']; } } @@ -841,7 +841,7 @@ function install_verify_completed_task() { catch (Exception $e) { } if (isset($task)) { - if ($task == 'done') { + if ($task === 'done') { throw new Exception(install_already_done_error()); } return $task; @@ -911,7 +911,7 @@ function install_settings_form($form, &$form_state, &$install_state) { '#default_value' => !empty($database['driver']) ? $database['driver'] : current($drivers_keys), '#description' => st('The type of database your @drupal data will be stored in.', array('@drupal' => drupal_install_profile_distribution_name())), ); - if (count($drivers) == 1) { + if (count($drivers) === 1) { $form['driver']['#disabled'] = TRUE; $form['driver']['#description'] .= ' ' . st('Your PHP configuration only supports a single database type, so it has been automatically selected.'); } @@ -1110,11 +1110,11 @@ function install_select_profile(&$install_state) { * list or from a selection passed in via $_POST. */ function _install_select_profile($profiles) { - if (sizeof($profiles) == 0) { + if (sizeof($profiles) === 0) { throw new Exception(install_no_profile_error()); } // Don't need to choose profile if only one available. - if (sizeof($profiles) == 1) { + if (sizeof($profiles) === 1) { $profile = array_pop($profiles); // TODO: is this right? require_once DRUPAL_ROOT . '/' . $profile->uri; @@ -1122,7 +1122,7 @@ function _install_select_profile($profiles) { } else { foreach ($profiles as $profile) { - if (!empty($_POST['profile']) && ($_POST['profile'] == $profile->name)) { + if (!empty($_POST['profile']) && ($_POST['profile'] === $profile->name)) { return $profile->name; } } @@ -1257,7 +1257,7 @@ function install_select_language(&$install_state) { if (!empty($_POST['langcode'])) { foreach ($files as $file) { - if ($_POST['langcode'] == $file->langcode) { + if ($_POST['langcode'] === $file->langcode) { $install_state['parameters']['langcode'] = $file->langcode; return; } @@ -1269,7 +1269,7 @@ function install_select_language(&$install_state) { // performing an interactive installation, inform the user that the // installer can be translated. Otherwise we assume the user knows what he // is doing. - if (count($files) == 1) { + if (count($files) === 1) { if ($install_state['interactive']) { $directory = variable_get('locale_translate_file_directory', conf_path() . '/files/translations'); @@ -1354,7 +1354,7 @@ function install_select_language_form($form, &$form_state, $files) { '#size' => min(count($select_options), 10), ); - if (count($files) == 1) { + if (count($files) === 1) { $form['help'] = array( '#markup' => '

' . st('Learn how to install Drupal in other languages') . '

', ); diff --git a/core/includes/install.inc b/core/includes/install.inc index 72adf1c..e86c902 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -120,7 +120,7 @@ function drupal_install_profile_distribution_name() { function drupal_detect_baseurl($file = 'core/install.php') { $proto = $_SERVER['HTTPS'] ? 'https://' : 'http://'; $host = $_SERVER['SERVER_NAME']; - $port = ($_SERVER['SERVER_PORT'] == 80 ? '' : ':' . $_SERVER['SERVER_PORT']); + $port = ($_SERVER['SERVER_PORT'] === 80 ? '' : ':' . $_SERVER['SERVER_PORT']); $uri = preg_replace("/\?.*/", '', $_SERVER['REQUEST_URI']); $dir = str_replace("/$file", '', $uri); @@ -206,12 +206,12 @@ function drupal_rewrite_settings($settings = array()) { // Step line by line through settings.php. while (!feof($fp)) { $line = fgets($fp); - if ($first && substr($line, 0, 5) != 'required_by) as $dependent) { - if (!isset($module_list[$dependent]) && drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED && $dependent != $profile) { + if (!isset($module_list[$dependent]) && drupal_get_installed_schema_version($dependent) !== SCHEMA_UNINSTALLED && $dependent !== $profile) { return FALSE; } } @@ -456,7 +456,7 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file') { switch ($current_mask) { case FILE_EXIST: if (!file_exists($file)) { - if ($type == 'dir') { + if ($type === 'dir') { drupal_install_mkdir($file, $mask); } if (!file_exists($file)) { @@ -694,7 +694,7 @@ function drupal_requirements_url($severity) { $query = array(); // If there are no errors, only warnings, append 'continue=1' to the URL so // the user can bypass this screen on the next page load. - if ($severity == REQUIREMENT_WARNING) { + if ($severity === REQUIREMENT_WARNING) { $query['continue'] = 1; } return drupal_current_script_url($query); @@ -823,10 +823,10 @@ function drupal_check_module($module) { if (module_hook($module, 'requirements')) { // Check requirements $requirements = module_invoke($module, 'requirements', 'install'); - if (is_array($requirements) && drupal_requirements_severity($requirements) == REQUIREMENT_ERROR) { + if (is_array($requirements) && drupal_requirements_severity($requirements) === REQUIREMENT_ERROR) { // Print any error messages foreach ($requirements as $requirement) { - if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { + if (isset($requirement['severity']) && $requirement['severity'] === REQUIREMENT_ERROR) { $message = $requirement['description']; if (isset($requirement['value']) && $requirement['value']) { $message .= ' (' . t('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) . ')'; @@ -892,7 +892,7 @@ function install_profile_info($profile, $langcode = 'en') { $info['dependencies'] = array_unique(array_merge( drupal_required_modules(), $info['dependencies'], - ($langcode != 'en' && !empty($langcode) ? array('locale') : array())) + ($langcode !== 'en' && !empty($langcode) ? array('locale') : array())) ); // drupal_required_modules() includes the current profile as a dependency. diff --git a/core/includes/language.inc b/core/includes/language.inc index 2c46c76..0fe3a6d 100644 --- a/core/includes/language.inc +++ b/core/includes/language.inc @@ -352,7 +352,7 @@ function language_negotiation_method_invoke($method_id, $method = NULL) { // If the language negotiation method has no cache preference or this is // satisfied we can execute the callback. - $cache = !isset($method['cache']) || $user->uid || $method['cache'] == variable_get('cache', 0); + $cache = !isset($method['cache']) || $user->uid || $method['cache'] === variable_get('cache', 0); $callback = isset($method['callbacks']['negotiation']) ? $method['callbacks']['negotiation'] : FALSE; $langcode = $cache && function_exists($callback) ? $callback($languages) : FALSE; $results[$method_id] = isset($languages[$langcode]) ? $languages[$langcode] : FALSE; @@ -399,7 +399,7 @@ function language_url_split_prefix($path, $languages) { // Search prefix within enabled languages. $prefixes = language_negotiation_url_prefixes(); foreach ($languages as $language) { - if (isset($prefixes[$language->langcode]) && $prefixes[$language->langcode] == $prefix) { + if (isset($prefixes[$language->langcode]) && $prefixes[$language->langcode] === $prefix) { // Rebuild $path with the language removed. return array($language, implode('/', $args)); } diff --git a/core/includes/mail.inc b/core/includes/mail.inc index f58a76e..736745d 100644 --- a/core/includes/mail.inc +++ b/core/includes/mail.inc @@ -462,7 +462,7 @@ function drupal_html_to_text($string, $allowed_tags = NULL) { case '/h2': $casing = NULL; // Pad the line with dashes. - $output = _drupal_html_to_text_pad($output, ($tagname == '/h1') ? '=' : '-', ' '); + $output = _drupal_html_to_text_pad($output, ($tagname === '/h1') ? '=' : '-', ' '); array_pop($indent); $chunk = ''; // Ensure blank new-line. break; diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 4f0cf94..e970b22 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -495,7 +495,7 @@ function menu_execute_active_handler($path = NULL, $deliver = TRUE) { drupal_alter('menu_site_status', $page_callback_result, $read_only_path); // Only continue if the site status is not set. - if ($page_callback_result == MENU_SITE_ONLINE) { + if ($page_callback_result === MENU_SITE_ONLINE) { if ($router_item = menu_get_item($path)) { if ($router_item['access']) { if ($router_item['include_file']) { @@ -616,8 +616,8 @@ function _menu_check_access(&$item, $map) { $arguments = menu_unserialize($item['access_arguments'], $map); // As call_user_func_array is quite slow and user_access is a very common // callback, it is worth making a special case for it. - if ($callback == 'user_access') { - $item['access'] = (count($arguments) == 1) ? user_access($arguments[0]) : user_access($arguments[0], $arguments[1]); + if ($callback === 'user_access') { + $item['access'] = (count($arguments) === 1) ? user_access($arguments[0]) : user_access($arguments[0], $arguments[1]); } else { $item['access'] = call_user_func_array($callback, $arguments); @@ -668,10 +668,10 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { // itself; can't localize. // If we are translating a router item (tabs, page, breadcrumb), then we // can always use the information from the router item. - if (!$link_translate || ($item['title'] == $item['link_title'])) { + if (!$link_translate || ($item['title'] === $item['link_title'])) { // t() is a special case. Since it is used very close to all the time, // we handle it directly instead of using indirect, slower methods. - if ($callback == 't') { + if ($callback === 't') { if (empty($item['title_arguments'])) { $item['title'] = t($item['title']); } @@ -687,7 +687,7 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { $item['title'] = call_user_func_array($callback, menu_unserialize($item['title_arguments'], $map)); } // Avoid calling check_plain again on l() function. - if ($callback == 'check_plain') { + if ($callback === 'check_plain') { $item['localized_options']['html'] = TRUE; } } @@ -700,7 +700,7 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { if (!empty($item['description'])) { $original_description = $item['description']; $item['description'] = t($item['description']); - if ($link_translate && isset($item['options']['attributes']['title']) && $item['options']['attributes']['title'] == $original_description) { + if ($link_translate && isset($item['options']['attributes']['title']) && $item['options']['attributes']['title'] === $original_description) { $item['localized_options']['attributes']['title'] = $item['description']; } } @@ -759,13 +759,13 @@ function _menu_translate(&$router_item, $map, $to_arg = FALSE) { $tab_parent_map = explode('/', $router_item['tab_parent']); } for ($i = 0; $i < $router_item['number_parts']; $i++) { - if ($link_map[$i] == '%') { + if ($link_map[$i] === '%') { $link_map[$i] = $path_map[$i]; } - if (isset($tab_root_map[$i]) && $tab_root_map[$i] == '%') { + if (isset($tab_root_map[$i]) && $tab_root_map[$i] === '%') { $tab_root_map[$i] = $path_map[$i]; } - if (isset($tab_parent_map[$i]) && $tab_parent_map[$i] == '%') { + if (isset($tab_parent_map[$i]) && $tab_parent_map[$i] === '%') { $tab_parent_map[$i] = $path_map[$i]; } } @@ -937,7 +937,7 @@ function _menu_link_translate(&$item, $translate = FALSE) { * "story" content type: * @code * $node = menu_get_object(); - * $story = $node->type == 'story'; + * $story = $node->type === 'story'; * @endcode * * @param $type @@ -954,7 +954,7 @@ function _menu_link_translate(&$item, $translate = FALSE) { */ function menu_get_object($type = 'node', $position = 1, $path = NULL) { $router_item = menu_get_item($path); - if (isset($router_item['load_functions'][$position]) && !empty($router_item['map'][$position]) && $router_item['load_functions'][$position] == $type . '_load') { + if (isset($router_item['load_functions'][$position]) && !empty($router_item['map'][$position]) && $router_item['load_functions'][$position] === $type . '_load') { return $router_item['map'][$position]; } } @@ -1013,10 +1013,10 @@ function menu_tree_output($tree) { $num_items = count($items); foreach ($items as $i => $data) { $class = array(); - if ($i == 0) { + if ($i === 0) { $class[] = 'first'; } - if ($i == $num_items - 1) { + if ($i === $num_items - 1) { $class[] = 'last'; } // Set a class for the
  • -tag. Since $data['below'] may contain local @@ -1040,7 +1040,7 @@ function menu_tree_output($tree) { // the active class accordingly. But local tasks do not appear in menu // trees, so if the current path is a local task, and this link is its // tab root, then we have to set the class manually. - if ($data['link']['href'] == $router_item['tab_root_href'] && $data['link']['href'] != $_GET['q']) { + if ($data['link']['href'] === $router_item['tab_root_href'] && $data['link']['href'] !== $_GET['q']) { $data['link']['localized_options']['attributes']['class'][] = 'active'; } @@ -1234,7 +1234,7 @@ function menu_tree_page_data($menu_name, $max_depth = NULL, $only_active_trail = 'max_depth' => $max_depth, ); // Parent mlids; used both as key and value to ensure uniqueness. - // We always want all the top-level links with plid == 0. + // We always want all the top-level links with plid === 0. $active_trail = array(0 => 0); // If the item for the current page is accessible, build the tree @@ -1247,7 +1247,7 @@ function menu_tree_page_data($menu_name, $max_depth = NULL, $only_active_trail = // active trail, if it resides in the requested menu. Otherwise, // we'd needlessly re-run _menu_build_tree() queries for every menu // on every page. - if ($active_link['menu_name'] == $menu_name) { + if ($active_link['menu_name'] === $menu_name) { // Use all the coordinates, except the last one because there // can be no child beyond the last column. for ($i = 1; $i < MENU_MAX_DEPTH; $i++) { @@ -1405,7 +1405,7 @@ function _menu_build_tree($menu_name, array $parameters = array()) { $query->condition('ml.mlid', $parameters['active_trail'], 'IN'); } $min_depth = (isset($parameters['min_depth']) ? $parameters['min_depth'] : 1); - if ($min_depth != 1) { + if ($min_depth !== 1) { $query->condition('ml.depth', $min_depth, '>='); } if (isset($parameters['max_depth'])) { @@ -1446,7 +1446,7 @@ function _menu_build_tree($menu_name, array $parameters = array()) { */ function menu_tree_collect_node_links(&$tree, &$node_links) { foreach ($tree as $key => $v) { - if ($tree[$key]['link']['router_path'] == 'node/%') { + if ($tree[$key]['link']['router_path'] === 'node/%') { $nid = substr($tree[$key]['link']['link_path'], 5); if (is_numeric($nid)) { $node_links[$nid][$tree[$key]['link']['mlid']] = &$tree[$key]['link']; @@ -1725,7 +1725,7 @@ function menu_get_custom_theme($initialize = FALSE) { $custom_theme = &drupal_static(__FUNCTION__); // Skip this if the site is offline or being installed or updated, since the // menu system may not be correctly initialized then. - if ($initialize && !_menu_site_is_offline(TRUE) && (!defined('MAINTENANCE_MODE') || (MAINTENANCE_MODE != 'update' && MAINTENANCE_MODE != 'install'))) { + if ($initialize && !_menu_site_is_offline(TRUE) && (!defined('MAINTENANCE_MODE') || (MAINTENANCE_MODE !== 'update' && MAINTENANCE_MODE !== 'install'))) { // First allow modules to dynamically set a custom theme for the current // page. Since we can only have one, the last module to return a valid // theme takes precedence. @@ -1780,7 +1780,7 @@ function menu_secondary_menu() { // If the secondary menu source is set as the primary menu, we display the // second level of the primary menu. - if (variable_get('menu_secondary_links_source', 'user-menu') == variable_get('menu_main_links_source', 'main-menu')) { + if (variable_get('menu_secondary_links_source', 'user-menu') === variable_get('menu_main_links_source', 'main-menu')) { return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'), 1); } else { @@ -1837,7 +1837,7 @@ function menu_navigation_links($menu_name, $level = 0) { // the active class accordingly. But local tasks do not appear in menu // trees, so if the current path is a local task, and this link is its // tab root, then we have to set the class manually. - if ($item['link']['href'] == $router_item['tab_root_href'] && $item['link']['href'] != $_GET['q']) { + if ($item['link']['href'] === $router_item['tab_root_href'] && $item['link']['href'] !== $_GET['q']) { $l['attributes']['class'][] = 'active'; } // Keyed with the unique mlid to generate classes in theme_links(). @@ -1940,9 +1940,9 @@ function menu_local_tasks($level = 0) { $link = $item; // The default task is always active. As tabs can be normal items // too, so bitmask with MENU_LINKS_TO_PARENT before checking. - if (($item['type'] & MENU_LINKS_TO_PARENT) == MENU_LINKS_TO_PARENT) { + if (($item['type'] & MENU_LINKS_TO_PARENT) === MENU_LINKS_TO_PARENT) { // Find the first parent which is not a default local task or action. - for ($p = $item['tab_parent']; ($tasks[$p]['type'] & MENU_LINKS_TO_PARENT) == MENU_LINKS_TO_PARENT; $p = $tasks[$p]['tab_parent']); + for ($p = $item['tab_parent']; ($tasks[$p]['type'] & MENU_LINKS_TO_PARENT) === MENU_LINKS_TO_PARENT; $p = $tasks[$p]['tab_parent']); // Use the path of the parent instead. $link['href'] = $tasks[$p]['href']; // Mark the link as active, if the current path happens to be the @@ -1952,7 +1952,7 @@ function menu_local_tasks($level = 0) { // tasks can still be accessed directly, in which case this link // would not be marked as active, since l() only compares the href // with $_GET['q']. - if ($link['href'] != $_GET['q']) { + if ($link['href'] !== $_GET['q']) { $link['localized_options']['attributes']['class'][] = 'active'; } $tabs_current[] = array( @@ -1966,7 +1966,7 @@ function menu_local_tasks($level = 0) { else { // Actions can be normal items too, so bitmask with // MENU_IS_LOCAL_ACTION before checking. - if (($item['type'] & MENU_IS_LOCAL_ACTION) == MENU_IS_LOCAL_ACTION) { + if (($item['type'] & MENU_IS_LOCAL_ACTION) === MENU_IS_LOCAL_ACTION) { // The item is an action, display it as such. $actions_current[] = array( '#theme' => 'menu_local_action', @@ -2013,22 +2013,22 @@ function menu_local_tasks($level = 0) { $link = $item; // Local tasks can be normal items too, so bitmask with // MENU_LINKS_TO_PARENT before checking. - if (($item['type'] & MENU_LINKS_TO_PARENT) == MENU_LINKS_TO_PARENT) { + if (($item['type'] & MENU_LINKS_TO_PARENT) === MENU_LINKS_TO_PARENT) { // Find the first parent which is not a default local task. - for ($p = $item['tab_parent']; ($tasks[$p]['type'] & MENU_LINKS_TO_PARENT) == MENU_LINKS_TO_PARENT; $p = $tasks[$p]['tab_parent']); + for ($p = $item['tab_parent']; ($tasks[$p]['type'] & MENU_LINKS_TO_PARENT) === MENU_LINKS_TO_PARENT; $p = $tasks[$p]['tab_parent']); // Use the path of the parent instead. $link['href'] = $tasks[$p]['href']; - if ($item['path'] == $router_item['path']) { + if ($item['path'] === $router_item['path']) { $root_path = $tasks[$p]['path']; } } // We check for the active tab. - if ($item['path'] == $path) { + if ($item['path'] === $path) { // Mark the link as active, if the current path is a (second-level) // local task of a default local task. Since this default local task // links to its parent, l() will not mark it as active, as it only // compares the link's href to $_GET['q']. - if ($link['href'] != $_GET['q']) { + if ($link['href'] !== $_GET['q']) { $link['localized_options']['attributes']['class'][] = 'active'; } $tabs_current[] = array( @@ -2380,7 +2380,7 @@ function menu_set_active_trail($new_trail = NULL) { // appending either the preferred link or the menu router item for the // current page. Exclude it if we are on the front page. $last = end($trail); - if ($preferred_link && $last['href'] != $preferred_link['href'] && !drupal_is_front_page()) { + if ($preferred_link && $last['href'] !== $preferred_link['href'] && !drupal_is_front_page()) { $trail[] = $preferred_link; } } @@ -2530,7 +2530,7 @@ function menu_get_active_breadcrumb() { // Don't show a link to the current page in the breadcrumb trail. $end = end($active_trail); - if ($item['href'] == $end['href']) { + if ($item['href'] === $end['href']) { array_pop($active_trail); } @@ -2547,7 +2547,7 @@ function menu_get_active_breadcrumb() { // (commonly MENU_DEFAULT_LOCAL_TASK). In order to also hide the parent link // itself, we always remove the last link in the trail, if the current // router item links to its parent. - if (($item['type'] & MENU_LINKS_TO_PARENT) == MENU_LINKS_TO_PARENT) { + if (($item['type'] & MENU_LINKS_TO_PARENT) === MENU_LINKS_TO_PARENT) { array_pop($active_trail); } @@ -2727,7 +2727,7 @@ function menu_get_router() { */ function _menu_link_build($item) { // Suggested items are disabled by default. - if ($item['type'] == MENU_SUGGESTED_ITEM) { + if ($item['type'] === MENU_SUGGESTED_ITEM) { $item['hidden'] = 1; } // Hide all items that are not visible in the tree. @@ -2775,7 +2775,7 @@ function _menu_navigation_links_rebuild($menu) { if ($existing_item) { $item['mlid'] = $existing_item['mlid']; // A change in hook_menu may move the link to a different menu - if (empty($item['menu_name']) || ($item['menu_name'] == $existing_item['menu_name'])) { + if (empty($item['menu_name']) || ($item['menu_name'] === $existing_item['menu_name'])) { $item['menu_name'] = $existing_item['menu_name']; $item['plid'] = $existing_item['plid']; } @@ -2818,10 +2818,10 @@ function _menu_navigation_links_rebuild($menu) { ->execute(); foreach ($result as $item) { $router_path = _menu_find_router_path($item['link_path']); - if (!empty($router_path) && ($router_path != $item['router_path'] || $item['updated'])) { + if (!empty($router_path) && ($router_path !== $item['router_path'] || $item['updated'])) { // If the router path and the link path matches, it's surely a working // item, so we clear the updated flag. - $updated = $item['updated'] && $router_path != $item['link_path']; + $updated = $item['updated'] && $router_path !== $item['link_path']; db_update('menu_links') ->fields(array( 'router_path' => $router_path, @@ -2948,7 +2948,7 @@ function menu_link_delete($mlid, $path = NULL) { */ function _menu_delete_item($item, $force = FALSE) { $item = is_object($item) ? get_object_vars($item) : $item; - if ($item && ($item['module'] != 'system' || $item['updated'] || $force)) { + if ($item && ($item['module'] !== 'system' || $item['updated'] || $force)) { // Children get re-attached to the item's parent. if ($item['has_children']) { $result = db_query("SELECT mlid FROM {menu_links} WHERE plid = :plid", array(':plid' => $item['mlid'])); @@ -3007,7 +3007,7 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a // This is the easiest way to handle the unique internal path '', // since a path marked as external does not need to match a router path. - $item['external'] = (url_is_external($item['link_path']) || $item['link_path'] == '') ? 1 : 0; + $item['external'] = (url_is_external($item['link_path']) || $item['link_path'] === '') ? 1 : 0; // Load defaults. $item += array( 'menu_name' => 'navigation', @@ -3066,7 +3066,7 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a } // Directly fill parents for top-level links. - if ($item['plid'] == 0) { + if ($item['plid'] === 0) { $item['p1'] = $item['mlid']; for ($i = 2; $i <= MENU_MAX_DEPTH; $i++) { $item["p$i"] = 0; @@ -3089,11 +3089,11 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a _menu_link_parents_set($item, $parent); } // Need to check both plid and menu_name, since plid can be 0 in any menu. - if ($existing_item && ($item['plid'] != $existing_item['plid'] || $menu_name != $existing_item['menu_name'])) { + if ($existing_item && ($item['plid'] !== $existing_item['plid'] || $menu_name !== $existing_item['menu_name'])) { _menu_link_move_children($item, $existing_item); } // Find the router_path. - if (empty($item['router_path']) || !$existing_item || ($existing_item['link_path'] != $item['link_path'])) { + if (empty($item['router_path']) || !$existing_item || ($existing_item['link_path'] !== $item['link_path'])) { if ($item['external']) { $item['router_path'] = ''; } @@ -3108,7 +3108,7 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a // array_intersect_key() with the $item as the first parameter because // $item may have additional keys left over from building a router entry. // The intersect removes the extra keys, allowing a meaningful comparison. - if (!$existing_item || (array_intersect_key($item, $existing_item) != $existing_item)) { + if (!$existing_item || (array_intersect_key($item, $existing_item) !== $existing_item)) { db_update('menu_links') ->fields(array( 'menu_name' => $item['menu_name'], @@ -3140,7 +3140,7 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a // Check the has_children status of the parent. _menu_update_parental_status($item); menu_cache_clear($menu_name); - if ($existing_item && $menu_name != $existing_item['menu_name']) { + if ($existing_item && $menu_name !== $existing_item['menu_name']) { menu_cache_clear($existing_item['menu_name']); } // Notify modules we have acted on a menu item. @@ -3210,7 +3210,7 @@ function _menu_link_find_parent($menu_link, $parent_candidates = array()) { // If everything else failed, try to derive the parent from the path // hierarchy. This only makes sense for links derived from menu router // items (ie. from hook_menu()). - if ($menu_link['module'] == 'system') { + if ($menu_link['module'] === 'system') { $query = db_select('menu_links'); $query->condition('module', 'system'); // We always respect the link's 'menu_name'; inheritance for router items is @@ -3225,7 +3225,7 @@ function _menu_link_find_parent($menu_link, $parent_candidates = array()) { $new_query = clone $query; $new_query->condition('link_path', $parent_path); // Only valid if we get a unique result. - if ($new_query->countQuery()->execute()->fetchField() == 1) { + if ($new_query->countQuery()->execute()->fetchField() === 1) { $parent = $new_query->fields('menu_links')->execute()->fetchAssoc(); } } while ($parent === FALSE && $parent_path); @@ -3242,13 +3242,13 @@ function _menu_clear_page_cache() { // Clear the page and block caches, but at most twice, including at // the end of the page load when there are multiple links saved or deleted. - if ($cache_cleared == 0) { + if ($cache_cleared === 0) { cache_clear_all(); // Keep track of which menus have expanded items. _menu_set_expanded_menus(); $cache_cleared = 1; } - elseif ($cache_cleared == 1) { + elseif ($cache_cleared === 1) { drupal_register_shutdown_function('cache_clear_all'); // Keep track of which menus have expanded items. drupal_register_shutdown_function('_menu_set_expanded_menus'); @@ -3431,7 +3431,7 @@ function _menu_link_move_children($item, $existing_item) { * Check and update the has_children status for the parent of a link. */ function _menu_update_parental_status($item, $exclude = FALSE) { - // If plid == 0, there is nothing to update. + // If plid === 0, there is nothing to update. if ($item['plid']) { // Check if at least one visible child exists in the table. $query = db_select('menu_links'); @@ -3599,7 +3599,7 @@ function _menu_router_build($callbacks) { // If an access callback is not found for a default local task we use // the callback from the parent, since we expect them to be identical. // In all other cases, the access parameters must be specified. - if (($item['type'] == MENU_DEFAULT_LOCAL_TASK) && !isset($item['access callback']) && isset($parent['access callback'])) { + if (($item['type'] === MENU_DEFAULT_LOCAL_TASK) && !isset($item['access callback']) && isset($parent['access callback'])) { $item['access callback'] = $parent['access callback']; if (!isset($item['access arguments']) && isset($parent['access arguments'])) { $item['access arguments'] = $parent['access arguments']; @@ -3616,7 +3616,7 @@ function _menu_router_build($callbacks) { } if (!isset($item['file']) && isset($parent['file'])) { $item['file'] = $parent['file']; - if (empty($item['file path']) && isset($item['module']) && isset($parent['module']) && $item['module'] != $parent['module']) { + if (empty($item['file path']) && isset($item['module']) && isset($parent['module']) && $item['module'] !== $parent['module']) { $item['file path'] = drupal_get_path('module', $parent['module']); } } @@ -3763,7 +3763,7 @@ function _menu_router_save($menu, $masks) { // Execute in batches to avoid the memory overhead of all of those records // in the query object. - if (++$num_records == 20) { + if (++$num_records === 20) { $insert->execute(); $num_records = 0; } @@ -3800,7 +3800,7 @@ function _menu_site_is_offline($check_only = FALSE) { // Ensure that the maintenance mode message is displayed only once // (allowing for page redirects) and specifically suppress its display on // the maintenance mode settings page. - if (!$check_only && $_GET['q'] != 'admin/config/development/maintenance') { + if (!$check_only && $_GET['q'] !== 'admin/config/development/maintenance') { if (user_access('administer site configuration')) { drupal_set_message(t('Operating in maintenance mode. Go online.', array('@url' => url('admin/config/development/maintenance'))), 'status', FALSE); } diff --git a/core/includes/module.inc b/core/includes/module.inc index 0b357a1..303b5f1 100644 --- a/core/includes/module.inc +++ b/core/includes/module.inc @@ -127,7 +127,7 @@ function system_list($type) { // For bootstrap modules, attempt to fetch the list from cache if possible. // if not fetch only the required information to fire bootstrap hooks // in case we are going to serve the page from cache. - if ($type == 'bootstrap') { + if ($type === 'bootstrap') { if (isset($lists['bootstrap'])) { return $lists['bootstrap']; } @@ -169,11 +169,11 @@ function system_list($type) { foreach ($result as $record) { $record->info = unserialize($record->info); // Build a list of all enabled modules. - if ($record->type == 'module') { + if ($record->type === 'module') { $lists['module_enabled'][$record->name] = $record; } // Build a list of themes. - if ($record->type == 'theme') { + if ($record->type === 'theme') { $lists['theme'][$record->name] = $record; } // Build a list of filenames so drupal_get_filename can use it. @@ -203,7 +203,7 @@ function system_list($type) { $base_key = $key; } // Set the theme engine prefix. - $lists['theme'][$key]->prefix = ($lists['theme'][$key]->info['engine'] == 'theme') ? $base_key : $lists['theme'][$key]->info['engine']; + $lists['theme'][$key]->prefix = ($lists['theme'][$key]->info['engine'] === 'theme') ? $base_key : $lists['theme'][$key]->info['engine']; } cache('bootstrap')->set('system_list', $lists); } @@ -429,7 +429,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) { ':type' => 'module', ':name' => $module)) ->fetchObject(); - if ($existing->status == 0) { + if ((int) $existing->status === 0) { // Load the module's code. drupal_load('module', $module); module_load_install($module); @@ -457,7 +457,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) { module_invoke_all('modules_preinstall', array($module)); // Now install the module if necessary. - if (drupal_get_installed_schema_version($module, TRUE) == SCHEMA_UNINSTALLED) { + if ((int) drupal_get_installed_schema_version($module, TRUE) === SCHEMA_UNINSTALLED) { drupal_install_schema($module); // Set the schema version to the number of the last update provided @@ -536,7 +536,7 @@ function module_disable($module_list, $disable_dependents = TRUE) { // Add dependent modules to the list, with a placeholder weight. // The new modules will be processed as the while loop continues. foreach ($module_data[$module]->required_by as $dependent => $dependent_data) { - if (!isset($module_list[$dependent]) && $dependent != $profile) { + if (!isset($module_list[$dependent]) && $dependent !== $profile) { $module_list[$dependent] = 0; } } @@ -683,7 +683,7 @@ function module_implements($hook, $sort = FALSE) { } // Allow modules to change the weight of specific implementations but avoid // an infinite loop. - if ($hook != 'module_implements_alter') { + if ($hook !== 'module_implements_alter') { drupal_alter('module_implements', $implementations[$hook], $hook); } } @@ -740,7 +740,7 @@ function module_hook_info() { // case common.inc, subsystems, and modules are not loaded yet, so it does not // make sense to support hook groups resp. lazy-loaded include files prior to // full bootstrap. - if (drupal_bootstrap(NULL, FALSE) != DRUPAL_BOOTSTRAP_FULL) { + if (drupal_bootstrap(NULL, FALSE) !== DRUPAL_BOOTSTRAP_FULL) { return array(); } $hook_info = &drupal_static(__FUNCTION__); @@ -788,7 +788,7 @@ function module_implements_write_cache() { // Check whether we need to write the cache. We do not want to cache hooks // which are only invoked on HTTP POST requests since these do not need to be // optimized as tightly, and not doing so keeps the cache entry smaller. - if (isset($implementations['#write_cache']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD')) { + if (isset($implementations['#write_cache']) && ($_SERVER['REQUEST_METHOD'] === 'GET' || $_SERVER['REQUEST_METHOD'] === 'HEAD')) { unset($implementations['#write_cache']); cache('bootstrap')->set('module_implements', $implementations); } diff --git a/core/includes/pager.inc b/core/includes/pager.inc index c579e7e..6ca4d10 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -374,7 +374,7 @@ function theme_pager($variables) { } // When there is more than one page, create the pager list. - if ($i != $pager_max) { + if ($i !== $pager_max) { if ($i > 1) { $items[] = array( 'class' => array('pager-ellipsis'), @@ -389,7 +389,7 @@ function theme_pager($variables) { 'data' => theme('pager_previous', array('text' => $i, 'element' => $element, 'interval' => ($pager_current - $i), 'parameters' => $parameters)), ); } - if ($i == $pager_current) { + if ($i === $pager_current) { $items[] = array( 'class' => array('pager-current'), 'data' => $i, @@ -493,7 +493,7 @@ function theme_pager_previous($variables) { $page_new = pager_load_array($pager_page_array[$element] - $interval, $element, $pager_page_array); // If the previous page is the first page, mark the link as such. - if ($page_new[$element] == 0) { + if ($page_new[$element] === 0) { $output = theme('pager_first', array('text' => $text, 'element' => $element, 'parameters' => $parameters)); } // The previous page is not the first page. @@ -531,7 +531,7 @@ function theme_pager_next($variables) { if ($pager_page_array[$element] < ($pager_total[$element] - 1)) { $page_new = pager_load_array($pager_page_array[$element] + $interval, $element, $pager_page_array); // If the next page is the last page, mark the link as such. - if ($page_new[$element] == ($pager_total[$element] - 1)) { + if ($page_new[$element] === ($pager_total[$element] - 1)) { $output = theme('pager_last', array('text' => $text, 'element' => $element, 'parameters' => $parameters)); } // The next page is not the last page. diff --git a/core/includes/password.inc b/core/includes/password.inc index b052a4a..58377c7 100644 --- a/core/includes/password.inc +++ b/core/includes/password.inc @@ -153,17 +153,17 @@ function _password_crypt($algo, $password, $setting) { // The first 12 characters of an existing hash are its setting string. $setting = substr($setting, 0, 12); - if ($setting[0] != '$' || $setting[2] != '$') { + if ($setting[0] !== '$' || $setting[2] !== '$') { return FALSE; } $count_log2 = _password_get_count_log2($setting); - // Hashes may be imported from elsewhere, so we allow != DRUPAL_HASH_COUNT + // Hashes may be imported from elsewhere, so we allow !== DRUPAL_HASH_COUNT if ($count_log2 < DRUPAL_MIN_HASH_COUNT || $count_log2 > DRUPAL_MAX_HASH_COUNT) { return FALSE; } $salt = substr($setting, 4, 8); // Hashes must have an 8 character salt. - if (strlen($salt) != 8) { + if (strlen($salt) !== 8) { return FALSE; } @@ -181,7 +181,7 @@ function _password_crypt($algo, $password, $setting) { // _password_base64_encode() of a 16 byte MD5 will always be 22 characters. // _password_base64_encode() of a 64 byte sha512 will always be 86 characters. $expected = 12 + ceil((8 * $len) / 6); - return (strlen($output) == $expected) ? substr($output, 0, DRUPAL_HASH_LENGTH) : FALSE; + return (strlen($output) === $expected) ? substr($output, 0, DRUPAL_HASH_LENGTH) : FALSE; } /** @@ -228,7 +228,7 @@ function user_hash_password($password, $count_log2 = 0) { * TRUE or FALSE. */ function user_check_password($password, $account) { - if (substr($account->pass, 0, 2) == 'U$') { + if (substr($account->pass, 0, 2) === 'U$') { // This may be an updated password from user_update_7000(). Such hashes // have 'U' added as the first character and need an extra md5() (see the // Drupal 7 documentation). @@ -255,7 +255,7 @@ function user_check_password($password, $account) { default: return FALSE; } - return ($hash && $stored_hash == $hash); + return ($hash && $stored_hash === $hash); } /** @@ -278,7 +278,7 @@ function user_check_password($password, $account) { */ function user_needs_new_hash($account) { // Check whether this was an updated password. - if ((substr($account->pass, 0, 3) != '$S$') || (strlen($account->pass) != DRUPAL_HASH_LENGTH)) { + if ((substr($account->pass, 0, 3) !== '$S$') || (strlen($account->pass) !== DRUPAL_HASH_LENGTH)) { return TRUE; } // Ensure that $count_log2 is within set bounds. diff --git a/core/includes/path.inc b/core/includes/path.inc index 223ab04..2ed5e14 100644 --- a/core/includes/path.inc +++ b/core/includes/path.inc @@ -76,12 +76,12 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { // alias matching the URL path. $langcode = $langcode ? $langcode : $language_url->langcode; - if ($action == 'wipe') { + if ($action === 'wipe') { $cache = array(); $cache['whitelist'] = drupal_path_alias_whitelist_rebuild(); } - elseif ($cache['whitelist'] && $path != '') { - if ($action == 'alias') { + elseif ($cache['whitelist'] && $path !== '') { + if ($action === 'alias') { // During the first call to drupal_lookup_path() per language, load the // expected system paths for the page from cache. if (!empty($cache['first_call'])) { @@ -105,7 +105,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { // the most recently created alias for each source. Subsequent queries // using fetchField() must use pid DESC to have the same effect. // For performance reasons, the query builder is not used here. - if ($langcode == LANGUAGE_NOT_SPECIFIED) { + if ($langcode === LANGUAGE_NOT_SPECIFIED) { // Prevent PDO from complaining about a token the query doesn't use. unset($args[':langcode']); $result = db_query('SELECT source, alias FROM {url_alias} WHERE source IN (:system) AND langcode = :langcode_undetermined ORDER BY pid ASC', $args); @@ -139,7 +139,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { ':langcode_undetermined' => LANGUAGE_NOT_SPECIFIED, ); // See the queries above. - if ($langcode == LANGUAGE_NOT_SPECIFIED) { + if ($langcode === LANGUAGE_NOT_SPECIFIED) { unset($args[':langcode']); $alias = db_query("SELECT alias FROM {url_alias} WHERE source = :source AND langcode = :langcode_undetermined ORDER BY pid DESC", $args)->fetchField(); } @@ -155,7 +155,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { } // Check $no_source for this $path in case we've already determined that there // isn't a path that has this alias - elseif ($action == 'source' && !isset($cache['no_source'][$langcode][$path])) { + elseif ($action === 'source' && !isset($cache['no_source'][$langcode][$path])) { // Look for the value $path within the cached $map $source = FALSE; if (!isset($cache['map'][$langcode]) || !($source = array_search($path, $cache['map'][$langcode]))) { @@ -165,7 +165,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { ':langcode_undetermined' => LANGUAGE_NOT_SPECIFIED, ); // See the queries above. - if ($langcode == LANGUAGE_NOT_SPECIFIED) { + if ($langcode === LANGUAGE_NOT_SPECIFIED) { unset($args[':langcode']); $result = db_query("SELECT source FROM {url_alias} WHERE alias = :alias AND langcode = :langcode_undetermined ORDER BY pid DESC", $args); } @@ -234,7 +234,7 @@ function drupal_cache_system_paths() { */ function drupal_get_path_alias($path = NULL, $langcode = NULL) { // If no path is specified, use the current page's path. - if ($path == NULL) { + if ($path === NULL) { $path = $_GET['q']; } $result = $path; @@ -292,7 +292,7 @@ function drupal_is_front_page() { if (!isset($is_front_page)) { // As drupal_path_initialize updates $_GET['q'] with the 'site_frontpage' path, // we can check it against the 'site_frontpage' variable. - $is_front_page = ($_GET['q'] == variable_get('site_frontpage', 'user')); + $is_front_page = ($_GET['q'] === variable_get('site_frontpage', 'user')); } return $is_front_page; @@ -554,7 +554,7 @@ function drupal_valid_path($path, $dynamic_allowed = FALSE) { global $menu_admin; // We indicate that a menu administrator is running the menu access check. $menu_admin = TRUE; - if ($path == '' || url_is_external($path)) { + if ($path === '' || url_is_external($path)) { $item = array('access' => TRUE); } elseif ($dynamic_allowed && preg_match('/\/\%/', $path)) { diff --git a/core/includes/registry.inc b/core/includes/registry.inc index 0be69ff..7406044 100644 --- a/core/includes/registry.inc +++ b/core/includes/registry.inc @@ -123,7 +123,7 @@ function _registry_parse_files($files) { foreach ($files as $filename => $file) { if (file_exists($filename)) { $hash = hash_file('sha256', $filename); - if (empty($file['hash']) || $file['hash'] != $hash) { + if (empty($file['hash']) || $file['hash'] !== $hash) { // Delete registry entries for this file, so we can insert the new resources. db_delete('registry') ->condition('filename', $filename) diff --git a/core/includes/schema.inc b/core/includes/schema.inc index f698189..9b8bd67 100644 --- a/core/includes/schema.inc +++ b/core/includes/schema.inc @@ -93,7 +93,7 @@ function drupal_get_complete_schema($rebuild = FALSE) { drupal_alter('schema', $schema); // If the schema is empty, avoid saving it: some database engines require // the schema to perform queries, and this could lead to infinite loops. - if (!empty($schema) && (drupal_get_bootstrap_phase() == DRUPAL_BOOTSTRAP_FULL)) { + if (!empty($schema) && (drupal_get_bootstrap_phase() === DRUPAL_BOOTSTRAP_FULL)) { cache()->set('schema', $schema); } if ($rebuild) { @@ -387,7 +387,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) { // Go through the schema to determine fields to write. foreach ($schema['fields'] as $field => $info) { - if ($info['type'] == 'serial') { + if ($info['type'] === 'serial') { // Skip serial types if we are updating. if (!empty($primary_keys)) { continue; @@ -414,7 +414,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) { // always exist, as they cannot be unset. Therefore, if $field is a serial // type and the value is NULL, skip it. // @see http://php.net/manual/en/function.property-exists.php - if ($info['type'] == 'serial' && !isset($object->$field)) { + if ($info['type'] === 'serial' && !isset($object->$field)) { $default_fields[] = $field; continue; } @@ -434,10 +434,10 @@ function drupal_write_record($table, &$record, $primary_keys = array()) { // into an integer column, but PostgreSQL PDO does not. Also type cast NULL // when the column does not allow this. if (isset($object->$field) || !empty($info['not null'])) { - if ($info['type'] == 'int' || $info['type'] == 'serial') { + if ($info['type'] === 'int' || $info['type'] === 'serial') { $fields[$field] = (int) $fields[$field]; } - elseif ($info['type'] == 'float') { + elseif ($info['type'] === 'float') { $fields[$field] = (float) $fields[$field]; } else { @@ -484,7 +484,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) { if (isset($serial)) { // If the database was not told to return the last insert id, it will be // because we already know it. - if (isset($options) && $options['return'] != Database::RETURN_INSERT_ID) { + if (isset($options) && $options['return'] !== Database::RETURN_INSERT_ID) { $object->$serial = $fields[$serial]; } else { @@ -496,7 +496,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) { // query failed. Note that we explicitly check for FALSE, because // a valid update query which doesn't change any values will return // zero (0) affected rows. - elseif ($query_return === FALSE && count($primary_keys) == 1) { + elseif ($query_return === FALSE && count($primary_keys) === 1) { $return = FALSE; } diff --git a/core/includes/session.inc b/core/includes/session.inc index b07997c..dacaf5b 100644 --- a/core/includes/session.inc +++ b/core/includes/session.inc @@ -104,7 +104,7 @@ function _drupal_session_read($sid) { // We found the client's session record and they are an authenticated, // active user. - if ($user && $user->uid > 0 && $user->status == 1) { + if ($user && $user->uid > 0 && $user->status === 1) { // This is done to unserialize the data member of $user. $user->data = unserialize($user->data); @@ -168,7 +168,7 @@ function _drupal_session_write($sid, $value) { // Check whether $_SESSION has been changed in this request. $last_read = &drupal_static('drupal_session_last_read'); - $is_changed = !isset($last_read) || $last_read['sid'] != $sid || $last_read['value'] !== $value; + $is_changed = !isset($last_read) || $last_read['sid'] !== $sid || $last_read['value'] !== $value; // For performance reasons, do not update the sessions table, unless // $_SESSION has changed or more than 180 has passed since the last update. diff --git a/core/includes/tablesort.inc b/core/includes/tablesort.inc index 3c70b96..1c6a0b5 100644 --- a/core/includes/tablesort.inc +++ b/core/includes/tablesort.inc @@ -136,12 +136,12 @@ function tablesort_header($cell, $header, $ts) { // Special formatting for the currently sorted column header. if (is_array($cell) && isset($cell['field'])) { $title = t('sort by @s', array('@s' => $cell['data'])); - if ($cell['data'] == $ts['name']) { + if ($cell['data'] === $ts['name']) { // aria-sort is a WAI-ARIA property that indicates if items in a table // or grid are sorted in ascending or descending order. See // http://www.w3.org/TR/wai-aria/states_and_properties#aria-sort - $cell['aria-sort'] = ($ts['sort'] == 'asc') ? 'ascending' : 'descending'; - $ts['sort'] = (($ts['sort'] == 'asc') ? 'desc' : 'asc'); + $cell['aria-sort'] = ($ts['sort'] === 'asc') ? 'ascending' : 'descending'; + $ts['sort'] = (($ts['sort'] === 'asc') ? 'desc' : 'asc'); $cell['class'][] = 'active'; $image = theme('tablesort_indicator', array('style' => $ts['sort'])); } @@ -174,7 +174,7 @@ function tablesort_header($cell, $header, $ts) { * A properly formatted cell, ready for _theme_table_cell(). */ function tablesort_cell($cell, $header, $ts, $i) { - if (isset($header[$i]['data']) && $header[$i]['data'] == $ts['name'] && !empty($header[$i]['field'])) { + if (isset($header[$i]['data']) && $header[$i]['data'] === $ts['name'] && !empty($header[$i]['field'])) { if (is_array($cell)) { $cell['class'][] = 'active'; } @@ -210,12 +210,12 @@ function tablesort_get_order($headers) { $order = isset($_GET['order']) ? $_GET['order'] : ''; foreach ($headers as $header) { if (is_array($header)) { - if (isset($header['data']) && $order == $header['data']) { + if (isset($header['data']) && $order === $header['data']) { $default = $header; break; } - if (empty($default) && isset($header['sort']) && ($header['sort'] == 'asc' || $header['sort'] == 'desc')) { + if (empty($default) && isset($header['sort']) && ($header['sort'] === 'asc' || $header['sort'] === 'desc')) { $default = $header; } } @@ -242,7 +242,7 @@ function tablesort_get_order($headers) { */ function tablesort_get_sort($headers) { if (isset($_GET['sort'])) { - return (strtolower($_GET['sort']) == 'desc') ? 'desc' : 'asc'; + return (strtolower($_GET['sort']) === 'desc') ? 'desc' : 'asc'; } // The user has not specified a sort. Use the default for the currently sorted // header if specified; otherwise use "asc". @@ -250,7 +250,7 @@ function tablesort_get_sort($headers) { // Find out which header is currently being sorted. $ts = tablesort_get_order($headers); foreach ($headers as $header) { - if (is_array($header) && isset($header['data']) && $header['data'] == $ts['name'] && isset($header['sort'])) { + if (is_array($header) && isset($header['data']) && $header['data'] === $ts['name'] && isset($header['sort'])) { return $header['sort']; } } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index f5c25f9..52bf24e 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -61,7 +61,7 @@ function drupal_theme_access($theme) { */ function _drupal_theme_access($theme) { $admin_theme = variable_get('admin_theme'); - return !empty($theme->status) || ($admin_theme && $theme->name == $admin_theme); + return !empty($theme->status) || ($admin_theme && $theme->name === $admin_theme); } /** @@ -365,7 +365,7 @@ class ThemeRegistry Extends CacheArray { function __construct($cid, $bin) { $this->cid = $cid; $this->bin = $bin; - $this->persistable = module_load_all(NULL) && $_SERVER['REQUEST_METHOD'] == 'GET'; + $this->persistable = module_load_all(NULL) && $_SERVER['REQUEST_METHOD'] === 'GET'; $data = array(); if ($this->persistable && $cached = cache($this->bin)->get($this->cid)) { @@ -532,7 +532,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { // If function and file are omitted, default to standard naming // conventions. if (!isset($info['template']) && !isset($info['function'])) { - $result[$hook]['function'] = ($type == 'module' ? 'theme_' : $name . '_') . $hook; + $result[$hook]['function'] = ($type === 'module' ? 'theme_' : $name . '_') . $hook; } if (isset($cache[$hook]['includes'])) { @@ -571,7 +571,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { if (!isset($info[$phase_key]) || !is_array($info[$phase_key])) { $info[$phase_key] = array(); $prefixes = array(); - if ($type == 'module') { + if ($type === 'module') { // Default variable processor prefix. $prefixes[] = 'template'; // Add all modules so they can intervene with their own variable @@ -579,7 +579,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { // if they are not the owner of the current hook. $prefixes += module_list(); } - elseif ($type == 'theme_engine' || $type == 'base_theme_engine') { + elseif ($type === 'theme_engine' || $type === 'base_theme_engine') { // Theme engines get an extra set that come before the normally // named variable processors. $prefixes[] = $name . '_engine'; @@ -622,7 +622,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { } // Let themes have variable processors even if they didn't register a template. - if ($type == 'theme' || $type == 'base_theme') { + if ($type === 'theme' || $type === 'base_theme') { foreach ($cache as $hook => $info) { // Check only if not registered by the theme or engine. if (empty($result[$hook])) { @@ -1103,7 +1103,7 @@ function theme($hook, $variables = array()) { // The theme engine may use a different extension and a different renderer. global $theme_engine; if (isset($theme_engine)) { - if ($info['type'] != 'module') { + if ($info['type'] !== 'module') { if (function_exists($theme_engine . '_render_template')) { $render_function = $theme_engine . '_render_template'; } @@ -1725,17 +1725,17 @@ function theme_links($variables) { $class[] = drupal_html_class($key); // Add odd/even, first, and last classes. $class[] = ($i % 2 ? 'odd' : 'even'); - if ($i == 1) { + if ($i === 1) { $class[] = 'first'; } - if ($i == $num_links) { + if ($i === $num_links) { $class[] = 'last'; } // Handle links. if (isset($link['href'])) { - $is_current_path = ($link['href'] == $_GET['q'] || ($link['href'] == '' && drupal_is_front_page())); - $is_current_language = (empty($link['language']) || $link['language']->langcode == $language_url->langcode); + $is_current_path = ($link['href'] === $_GET['q'] || ($link['href'] === '' && drupal_is_front_page())); + $is_current_language = (empty($link['language']) || $link['language']->langcode === $language_url->langcode); if ($is_current_path && $is_current_language) { $class[] = 'active'; } @@ -1928,7 +1928,7 @@ function theme_table($variables) { // Check if we're dealing with a simple or complex column if (isset($colgroup['data'])) { foreach ($colgroup as $key => $value) { - if ($key == 'data') { + if ($key === 'data') { $cols = $value; } else { @@ -1997,7 +1997,7 @@ function theme_table($variables) { // Check if we're dealing with a simple or complex row if (isset($row['data'])) { foreach ($row as $key => $value) { - if ($key == 'data') { + if ($key === 'data') { $cells = $value; } else { @@ -2040,7 +2040,7 @@ function theme_table($variables) { * - style: Set to either 'asc' or 'desc', this determines which icon to show. */ function theme_tablesort_indicator($variables) { - if ($variables['style'] == "asc") { + if ($variables['style'] === "asc") { return theme('image', array('uri' => 'core/misc/arrow-asc.png', 'width' => 13, 'height' => 13, 'alt' => t('sort ascending'), 'title' => t('sort ascending'))); } else { @@ -2060,10 +2060,10 @@ function theme_mark($variables) { $type = $variables['type']; global $user; if ($user->uid) { - if ($type == MARK_NEW) { + if ($type === MARK_NEW) { return ' ' . t('new') . ''; } - elseif ($type == MARK_UPDATED) { + elseif ($type === MARK_UPDATED) { return ' ' . t('updated') . ''; } } @@ -2133,10 +2133,10 @@ function theme_item_list($variables) { } $attributes['class'][] = ($i % 2 ? 'odd' : 'even'); - if ($i == 1) { + if ($i === 1) { $attributes['class'][] = 'first'; } - if ($i == $num_items) { + if ($i === $num_items) { $attributes['class'][] = 'last'; } @@ -2490,7 +2490,7 @@ function template_preprocess_html(&$variables) { // Populate the body classes. if ($suggestions = theme_get_suggestions(arg(), 'page', '-')) { foreach ($suggestions as $suggestion) { - if ($suggestion != 'page-front') { + if ($suggestion !== 'page-front') { // Add current suggestion to page classes to make it possible to theme // the page depending on the current page type (e.g. node, admin, user, // etc.) as well as more specific data like node-12 or node-edit. @@ -2574,7 +2574,7 @@ function template_preprocess_page(&$variables) { $variables['layout'] = 'first'; } if (!empty($variables['page']['sidebar_second'])) { - $variables['layout'] = ($variables['layout'] == 'first') ? 'both' : 'second'; + $variables['layout'] = ($variables['layout'] === 'first') ? 'both' : 'second'; } $variables['base_path'] = base_path(); @@ -2765,7 +2765,7 @@ function template_preprocess_maintenance_page(&$variables) { $variables['layout'] = 'first'; } if (!empty($variables['sidebar_second'])) { - $variables['layout'] = ($variables['layout'] == 'first') ? 'both' : 'second'; + $variables['layout'] = ($variables['layout'] === 'first') ? 'both' : 'second'; } // Construct page title @@ -2808,10 +2808,10 @@ function template_preprocess_maintenance_page(&$variables) { if (isset($variables['db_is_active']) && !$variables['db_is_active']) { $variables['classes_array'][] = 'db-offline'; } - if ($variables['layout'] == 'both') { + if ($variables['layout'] === 'both') { $variables['classes_array'][] = 'two-sidebars'; } - elseif ($variables['layout'] == 'none') { + elseif ($variables['layout'] === 'none') { $variables['classes_array'][] = 'no-sidebars'; } else { diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc index 3fd60c9..4e7f23e 100644 --- a/core/includes/theme.maintenance.inc +++ b/core/includes/theme.maintenance.inc @@ -31,7 +31,7 @@ function _drupal_maintenance_theme() { unicode_check(); // Install and update pages are treated differently to prevent theming overrides. - if (defined('MAINTENANCE_MODE') && (MAINTENANCE_MODE == 'install' || MAINTENANCE_MODE == 'update')) { + if (defined('MAINTENANCE_MODE') && (MAINTENANCE_MODE === 'install' || MAINTENANCE_MODE === 'update')) { $custom_theme = (isset($conf['maintenance_theme']) ? $conf['maintenance_theme'] : 'seven'); } else { @@ -109,12 +109,12 @@ function theme_task_list($variables) { $items = $variables['items']; $active = $variables['active']; - $done = isset($items[$active]) || $active == NULL; + $done = isset($items[$active]) || $active === NULL; $output = '

    Installation tasks

    '; $output .= '
      '; foreach ($items as $k => $item) { - if ($active == $k) { + if ($active === $k) { $class = 'active'; $status = '(' . t('active') . ')'; $done = FALSE; diff --git a/core/includes/token.inc b/core/includes/token.inc index 5c74519..2766758 100644 --- a/core/includes/token.inc +++ b/core/includes/token.inc @@ -201,7 +201,7 @@ function token_generate($type, array $tokens, array $data = array(), array $opti * 'created' => '[node:created]', * ); * $results = token_find_with_prefix($data, 'author'); - * $results == array('name' => '[node:author:name]'); + * $results === array('name' => '[node:author:name]'); * @endcode * * @param $tokens @@ -220,7 +220,7 @@ function token_find_with_prefix(array $tokens, $prefix, $delimiter = ':') { $results = array(); foreach ($tokens as $token => $raw) { $parts = explode($delimiter, $token, 2); - if (count($parts) == 2 && $parts[0] == $prefix) { + if (count($parts) === 2 && $parts[0] === $prefix) { $results[$parts[1]] = $raw; } } diff --git a/core/includes/unicode.inc b/core/includes/unicode.inc index 1450b43..03c1ae8 100644 --- a/core/includes/unicode.inc +++ b/core/includes/unicode.inc @@ -105,16 +105,16 @@ function _unicode_check() { } // Check mbstring configuration - if (ini_get('mbstring.func_overload') != 0) { + if (ini_get('mbstring.func_overload') !== 0) { return array(UNICODE_ERROR, $t('Multibyte string function overloading in PHP is active and must be disabled. Check the php.ini mbstring.func_overload setting. Please refer to the PHP mbstring documentation for more information.', array('@url' => 'http://www.php.net/mbstring'))); } - if (ini_get('mbstring.encoding_translation') != 0) { + if (ini_get('mbstring.encoding_translation') !== 0) { return array(UNICODE_ERROR, $t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini mbstring.encoding_translation setting. Please refer to the PHP mbstring documentation for more information.', array('@url' => 'http://www.php.net/mbstring'))); } - if (ini_get('mbstring.http_input') != 'pass') { + if (ini_get('mbstring.http_input') !== 'pass') { return array(UNICODE_ERROR, $t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini mbstring.http_input setting. Please refer to the PHP mbstring documentation for more information.', array('@url' => 'http://www.php.net/mbstring'))); } - if (ini_get('mbstring.http_output') != 'pass') { + if (ini_get('mbstring.http_output') !== 'pass') { return array(UNICODE_ERROR, $t('Multibyte string output conversion in PHP is active and must be disabled. Check the php.ini mbstring.http_output setting. Please refer to the PHP mbstring documentation for more information.', array('@url' => 'http://www.php.net/mbstring'))); } @@ -395,7 +395,7 @@ function mime_header_encode($string) { */ function mime_header_decode($header) { // First step: encoded chunks followed by other encoded chunks (need to collapse whitespace) - $header = preg_replace_callback('/=\?([^?]+)\?(Q|B)\?([^?]+|\?(?!=))\?=\s+(?==\?)/', '_mime_header_decode', $header); + $header = preg_replace_callback('/=\?([^?]+)\?(Q|B)\?([^?]+|\?(?!=))\?=\s+(?===\?)/', '_mime_header_decode', $header); // Second step: remaining chunks (do not collapse whitespace) return preg_replace_callback('/=\?([^?]+)\?(Q|B)\?([^?]+|\?(?!=))\?=/', '_mime_header_decode', $header); } @@ -408,8 +408,8 @@ function _mime_header_decode($matches) { // 1: Character set name // 2: Escaping method (Q or B) // 3: Encoded data - $data = ($matches[2] == 'B') ? base64_decode($matches[3]) : str_replace('_', ' ', quoted_printable_decode($matches[3])); - if (strtolower($matches[1]) != 'utf-8') { + $data = ($matches[2] === 'B') ? base64_decode($matches[3]) : str_replace('_', ' ', quoted_printable_decode($matches[3])); + if (strtolower($matches[1]) !== 'utf-8') { $data = drupal_convert_to_utf8($data, $matches[1]); } return $data; @@ -440,7 +440,7 @@ function decode_entities($text) { */ function drupal_strlen($text) { global $multibyte; - if ($multibyte == UNICODE_MULTIBYTE) { + if ($multibyte === UNICODE_MULTIBYTE) { return mb_strlen($text); } else { @@ -456,7 +456,7 @@ function drupal_strlen($text) { */ function drupal_strtoupper($text) { global $multibyte; - if ($multibyte == UNICODE_MULTIBYTE) { + if ($multibyte === UNICODE_MULTIBYTE) { return mb_strtoupper($text); } else { @@ -475,7 +475,7 @@ function drupal_strtoupper($text) { */ function drupal_strtolower($text) { global $multibyte; - if ($multibyte == UNICODE_MULTIBYTE) { + if ($multibyte === UNICODE_MULTIBYTE) { return mb_strtolower($text); } else { @@ -517,7 +517,7 @@ function drupal_ucfirst($text) { */ function drupal_substr($text, $start, $length = NULL) { global $multibyte; - if ($multibyte == UNICODE_MULTIBYTE) { + if ($multibyte === UNICODE_MULTIBYTE) { return $length === NULL ? mb_substr($text, $start) : mb_substr($text, $start, $length); } else { @@ -595,7 +595,7 @@ function drupal_substr($text, $start, $length = NULL) { } } else { - // $length == 0, return an empty string. + // $length === 0, return an empty string. return ''; } diff --git a/core/includes/update.inc b/core/includes/update.inc index 2715fdf..931ba71 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -54,15 +54,15 @@ function update_check_incompatibility($name, $type = 'module') { $modules = system_rebuild_module_data(); } - if ($type == 'module' && isset($modules[$name])) { + if ($type === 'module' && isset($modules[$name])) { $file = $modules[$name]; } - elseif ($type == 'theme' && isset($themes[$name])) { + elseif ($type === 'theme' && isset($themes[$name])) { $file = $themes[$name]; } if (!isset($file) || !isset($file->info['core']) - || $file->info['core'] != DRUPAL_CORE_COMPATIBILITY + || $file->info['core'] !== DRUPAL_CORE_COMPATIBILITY || version_compare(phpversion(), $file->info['php']) < 0) { return TRUE; } @@ -143,7 +143,7 @@ function update_prepare_stored_includes() { foreach (language_types_get_all() as $language_type) { $negotiation = variable_get("language_negotiation_$language_type", array()); foreach ($negotiation as $method_id => &$method) { - if (isset($method['file']) && $method['file'] == 'includes/locale.inc') { + if (isset($method['file']) && $method['file'] === 'includes/locale.inc') { $method['file'] = 'core/modules/language/language.negotiation.inc'; } } @@ -374,7 +374,7 @@ function update_do_one($module, $number, $dependency_map, &$context) { } // Record the schema update if it was completed successfully. - if ($context['finished'] == 1 && empty($ret['#abort'])) { + if ($context['finished'] === 1 && empty($ret['#abort'])) { drupal_set_installed_schema_version($module, $number); } @@ -412,7 +412,7 @@ function update_batch($start, $redirect = NULL, $url = NULL, $batch = array(), $ // During the update, bring the site offline so that schema changes do not // affect visiting users. $_SESSION['maintenance_mode'] = variable_get('maintenance_mode', FALSE); - if ($_SESSION['maintenance_mode'] == FALSE) { + if ($_SESSION['maintenance_mode'] === FALSE) { variable_set('maintenance_mode', TRUE); } @@ -483,7 +483,7 @@ function update_finished($success, $results, $operations) { // Now that the update is done, we can put the site back online if it was // previously in maintenance mode. - if (isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] == FALSE) { + if (isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] === FALSE) { variable_set('maintenance_mode', FALSE); unset($_SESSION['maintenance_mode']); } @@ -514,14 +514,14 @@ function update_get_update_list() { $modules = drupal_get_installed_schema_version(NULL, FALSE, TRUE); foreach ($modules as $module => $schema_version) { // Skip uninstalled and incompatible modules. - if ($schema_version == SCHEMA_UNINSTALLED || update_check_incompatibility($module)) { + if ($schema_version === SCHEMA_UNINSTALLED || update_check_incompatibility($module)) { continue; } // Otherwise, get the list of updates defined by this module. $updates = drupal_get_schema_versions($module); if ($updates !== FALSE) { // module_invoke returns NULL for nonexisting hooks, so if no updates - // are removed, it will == 0. + // are removed, it will === 0. $last_removed = module_invoke($module, 'update_last_removed'); if ($schema_version < $last_removed) { $ret[$module]['warning'] = '' . $module . ' module can not be updated. Its schema version is ' . $schema_version . '. Updates up to and including ' . $last_removed . ' have been removed in this release. In order to update ' . $module . ' module, you will first need to upgrade to the last version in which these updates were available.'; diff --git a/core/includes/utility.inc b/core/includes/utility.inc index d44e4dd..d19e781 100644 --- a/core/includes/utility.inc +++ b/core/includes/utility.inc @@ -23,7 +23,7 @@ function drupal_var_export($var, $prefix = '') { else { $output = "array(\n"; // Don't export keys if the array is non associative. - $export_keys = array_values($var) != $var; + $export_keys = array_values($var) !== $var; foreach ($var as $key => $value) { $output .= ' ' . ($export_keys ? drupal_var_export($key) . ' => ' : '') . drupal_var_export($value, ' ', FALSE) . ",\n"; } diff --git a/core/includes/xmlrpc.inc b/core/includes/xmlrpc.inc index b1c6f39..a85a266 100644 --- a/core/includes/xmlrpc.inc +++ b/core/includes/xmlrpc.inc @@ -29,13 +29,13 @@ function xmlrpc_value($data, $type = FALSE) { $type = xmlrpc_value_calculate_type($xmlrpc_value); } $xmlrpc_value->type = $type; - if ($type == 'struct') { + if ($type === 'struct') { // Turn all the values in the array into new xmlrpc_values foreach ($xmlrpc_value->data as $key => $value) { $xmlrpc_value->data[$key] = xmlrpc_value($value); } } - if ($type == 'array') { + if ($type === 'array') { for ($i = 0, $j = count($xmlrpc_value->data); $i < $j; $i++) { $xmlrpc_value->data[$i] = xmlrpc_value($xmlrpc_value->data[$i]); } @@ -188,7 +188,7 @@ function xmlrpc_message_parse($xmlrpc_message) { if (!isset($xmlrpc_message->messagetype)) { return FALSE; } - elseif ($xmlrpc_message->messagetype == 'fault') { + elseif ($xmlrpc_message->messagetype === 'fault') { $xmlrpc_message->fault_code = $xmlrpc_message->params[0]['faultCode']; $xmlrpc_message->fault_string = $xmlrpc_message->params[0]['faultString']; } @@ -295,7 +295,7 @@ function xmlrpc_message_tag_close($parser, $tag) { case 'value': // If no type is indicated, the type is string // We take special care for empty values - if (trim($xmlrpc_message->current_tag_contents) != '' || (isset($xmlrpc_message->last_open) && ($xmlrpc_message->last_open == 'value'))) { + if (trim($xmlrpc_message->current_tag_contents) !== '' || (isset($xmlrpc_message->last_open) && ($xmlrpc_message->last_open === 'value'))) { $value = (string) $xmlrpc_message->current_tag_contents; $value_flag = TRUE; } @@ -335,7 +335,7 @@ function xmlrpc_message_tag_close($parser, $tag) { if ($value_flag) { if (count($xmlrpc_message->array_structs) > 0) { // Add value to struct or array - if ($xmlrpc_message->array_structs_types[count($xmlrpc_message->array_structs_types) - 1] == 'struct') { + if ($xmlrpc_message->array_structs_types[count($xmlrpc_message->array_structs_types) - 1] === 'struct') { // Add to struct $xmlrpc_message->array_structs[count($xmlrpc_message->array_structs) - 1][$xmlrpc_message->current_struct_name[count($xmlrpc_message->current_struct_name) - 1]] = $value; } @@ -563,7 +563,7 @@ function _xmlrpc($url, $args, $options = array()) { $options['headers']['Content-Type'] = 'text/xml'; $options['data'] = $xmlrpc_request->xml; $result = drupal_http_request($url, $options); - if ($result->code != 200) { + if ($result->code !== 200) { xmlrpc_error($result->code, $result->error); return FALSE; } @@ -575,16 +575,16 @@ function _xmlrpc($url, $args, $options = array()) { return FALSE; } // Is the message a fault? - if ($message->messagetype == 'fault') { + if ($message->messagetype === 'fault') { xmlrpc_error($message->fault_code, $message->fault_string); return FALSE; } // We now know that the message is well-formed and a non-fault result. - if ($method == 'system.multicall') { + if ($method === 'system.multicall') { // Return per-method results or error objects. $return = array(); foreach ($message->params[0] as $result) { - if (array_keys($result) == array(0)) { + if (array_keys($result) === array(0)) { $return[] = $result[0]; } else { @@ -603,7 +603,7 @@ function _xmlrpc($url, $args, $options = array()) { */ function xmlrpc_errno() { $error = xmlrpc_error(); - return ($error != NULL ? $error->code : NULL); + return ($error !== NULL ? $error->code : NULL); } /** @@ -611,7 +611,7 @@ function xmlrpc_errno() { */ function xmlrpc_error_msg() { $error = xmlrpc_error(); - return ($error != NULL ? $error->message : NULL); + return ($error !== NULL ? $error->message : NULL); } /** diff --git a/core/includes/xmlrpcs.inc b/core/includes/xmlrpcs.inc index 118f652..9a2787f 100644 --- a/core/includes/xmlrpcs.inc +++ b/core/includes/xmlrpcs.inc @@ -70,7 +70,7 @@ function xmlrpc_server($callbacks) { if (!xmlrpc_message_parse($xmlrpc_server->message)) { xmlrpc_server_error(-32700, t('Parse error. Request not well formed.')); } - if ($xmlrpc_server->message->messagetype != 'methodCall') { + if ($xmlrpc_server->message->messagetype !== 'methodCall') { xmlrpc_server_error(-32600, t('Server error. Invalid XML-RPC. Request must be a methodCall.')); } if (!isset($xmlrpc_server->message->params)) { @@ -192,7 +192,7 @@ function xmlrpc_server_call($xmlrpc_server, $methodname, $args) { $ok = TRUE; $return_type = array_shift($signature); // Check the number of arguments - if (count($args) != count($signature)) { + if (count($args) !== count($signature)) { return xmlrpc_error(-32602, t('Server error. Wrong number of method parameters.')); } // Check the argument types @@ -272,7 +272,7 @@ function xmlrpc_server_multicall($methodcalls) { } $method = $call['methodName']; $params = $call['params']; - if ($method == 'system.multicall') { + if ($method === 'system.multicall') { $result = xmlrpc_error(-32600, t('Recursive calls to system.multicall are forbidden.')); } elseif ($ok) { diff --git a/core/lib/Drupal/Component/Graph/Graph.php b/core/lib/Drupal/Component/Graph/Graph.php index 8fc7d21..ab613a0 100644 --- a/core/lib/Drupal/Component/Graph/Graph.php +++ b/core/lib/Drupal/Component/Graph/Graph.php @@ -125,7 +125,7 @@ class Graph { // Mark that $start can reach $end. $this->graph[$start]['paths'][$end] = $v; - if (isset($this->graph[$end]['component']) && $component != $this->graph[$end]['component']) { + if (isset($this->graph[$end]['component']) && $component !== $this->graph[$end]['component']) { // This vertex already has a component, use that from now on and // reassign all the previously explored vertices. $new_component = $this->graph[$end]['component']; diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index 9416548..7ebabcb 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -33,7 +33,7 @@ class DatabaseBackend implements CacheBackendInterface { function __construct($bin) { // All cache tables should be prefixed with 'cache_', except for the // default 'cache' bin. - if ($bin != 'cache') { + if ($bin !== 'cache') { $bin = 'cache_' . $bin; } $this->bin = $bin; @@ -104,7 +104,7 @@ class DatabaseBackend implements CacheBackendInterface { // lifetime, compare the cache entry timestamp with the user session // cache_expiration timestamp. If the cache entry is too old, ignore it. $config = config('system.performance'); - if ($cache->expire != CACHE_PERMANENT && $config->get('cache_lifetime') && isset($_SESSION['cache_expiration'][$this->bin]) && $_SESSION['cache_expiration'][$this->bin] > $cache->created) { + if ($cache->expire !== CACHE_PERMANENT && $config->get('cache_lifetime') && isset($_SESSION['cache_expiration'][$this->bin]) && $_SESSION['cache_expiration'][$this->bin] > $cache->created) { // Ignore cache data that is too old and thus not valid for this user. return FALSE; } @@ -206,7 +206,7 @@ class DatabaseBackend implements CacheBackendInterface { $_SESSION['cache_expiration'][$this->bin] = REQUEST_TIME; $cache_flush = variable_get('cache_flush_' . $this->bin, 0); - if ($cache_flush == 0) { + if ($cache_flush === 0) { // This is the first request to clear the cache, start a timer. variable_set('cache_flush_' . $this->bin, REQUEST_TIME); } diff --git a/core/lib/Drupal/Core/Config/DrupalConfig.php b/core/lib/Drupal/Core/Config/DrupalConfig.php index 9fc33aa..a32373d 100644 --- a/core/lib/Drupal/Core/Config/DrupalConfig.php +++ b/core/lib/Drupal/Core/Config/DrupalConfig.php @@ -102,7 +102,7 @@ class DrupalConfig { } else { $parts = explode('.', $key); - if (count($parts) == 1) { + if (count($parts) === 1) { return isset($merged_data[$key]) ? $merged_data[$key] : NULL; } else { @@ -133,7 +133,7 @@ class DrupalConfig { $value = $this->castValue($value); $parts = explode('.', $key); - if (count($parts) == 1) { + if (count($parts) === 1) { $this->data[$key] = $value; } else { @@ -189,7 +189,7 @@ class DrupalConfig { */ public function clear($key) { $parts = explode('.', $key); - if (count($parts) == 1) { + if (count($parts) === 1) { unset($this->data[$key]); } else { diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php index 3805864..cf22ae8 100644 --- a/core/lib/Drupal/Core/Database/Connection.php +++ b/core/lib/Drupal/Core/Database/Connection.php @@ -241,7 +241,7 @@ abstract class Connection extends PDO { $this->prefixSearch = array(); $this->prefixReplace = array(); foreach ($this->prefixes as $key => $val) { - if ($key != 'default') { + if ($key !== 'default') { $this->prefixSearch[] = '{' . $key . '}'; $this->prefixReplace[] = $val . $key; } @@ -858,7 +858,7 @@ abstract class Connection extends PDO { // we need to throw an exception. $rolled_back_other_active_savepoints = FALSE; while ($savepoint = array_pop($this->transactionLayers)) { - if ($savepoint == $savepoint_name) { + if ($savepoint === $savepoint_name) { // If it is the last the transaction in the stack, then it is not a // savepoint, it is the transaction itself so we will need to roll back // the transaction rather than a savepoint. diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php index 0e7ab72..a4a0b9d 100644 --- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php @@ -188,7 +188,7 @@ class Connection extends DatabaseConnection { // // To avoid exceptions when no actual error has occurred, we silently // succeed for MySQL error code 1305 ("SAVEPOINT does not exist"). - if ($e->errorInfo[1] == '1305') { + if ($e->errorInfo[1] === '1305') { // If one SAVEPOINT was released automatically, then all were. // Therefore, clean the transaction stack. $this->transactionLayers = array(); diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php index f5e493d..e017f17 100644 --- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php @@ -209,7 +209,7 @@ class Schema extends DatabaseSchema { $field['mysql_type'] = $map[$field['type'] . ':' . $field['size']]; } - if (isset($field['type']) && $field['type'] == 'serial') { + if (isset($field['type']) && $field['type'] === 'serial') { $field['auto_increment'] = TRUE; } @@ -457,7 +457,7 @@ class Schema extends DatabaseSchema { if (!$this->fieldExists($table, $field)) { throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field %table.%name: field doesn't exist.", array('%table' => $table, '%name' => $field))); } - if (($field != $field_new) && $this->fieldExists($table, $field_new)) { + if (($field !== $field_new) && $this->fieldExists($table, $field_new)) { throw new SchemaObjectExistsException(t("Cannot rename field %table.%name to %name_new: target field already exists.", array('%table' => $table, '%name' => $field, '%name_new' => $field_new))); } diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php index dffa1fd..d6afa19 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php @@ -57,7 +57,7 @@ class Insert extends QueryInsert { // Force $last_insert_id to the specified value. This is only done // if $index is 0. - if ($index == 0) { + if ($index === 0) { $last_insert_id = $serial_value; } // Set the sequence to the bigger value of either the passed @@ -91,7 +91,7 @@ class Insert extends QueryInsert { $options['sequence_name'] = $table_information->sequences[0]; } // If there are no sequences then we can't get a last insert id. - elseif ($options['return'] == Database::RETURN_INSERT_ID) { + elseif ($options['return'] === Database::RETURN_INSERT_ID) { $options['return'] = Database::RETURN_NULL; } // Only use the returned last_insert_id if it is not already set. diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php index ae2db87..4440fa7 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php @@ -44,7 +44,7 @@ class Tasks extends InstallTasks { */ protected function checkEncoding() { try { - if (db_query('SHOW server_encoding')->fetchField() == 'UTF8') { + if (db_query('SHOW server_encoding')->fetchField() === 'UTF8') { $this->pass(st('Database is encoded in UTF-8')); } else { @@ -114,7 +114,7 @@ class Tasks extends InstallTasks { */ protected function checkBinaryOutputSuccess() { $bytea_output = db_query("SELECT 'encoding'::bytea AS output")->fetchField(); - return ($bytea_output == 'encoding'); + return ($bytea_output === 'encoding'); } /** diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php index 7206e17..0d8da2d 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php @@ -67,7 +67,7 @@ class Schema extends DatabaseSchema { ':default' => '%nextval%', )); foreach ($result as $column) { - if ($column->data_type == 'bytea') { + if ($column->data_type === 'bytea') { $table_information->blob_fields[$column->column_name] = TRUE; } elseif (preg_match("/nextval\('([^']+)'/", $column->column_default, $matches)) { @@ -187,7 +187,7 @@ class Schema extends DatabaseSchema { protected function createFieldSql($name, $spec) { $sql = $name . ' ' . $spec['pgsql_type']; - if (isset($spec['type']) && $spec['type'] == 'serial') { + if (isset($spec['type']) && $spec['type'] === 'serial') { unset($spec['not null']); } @@ -258,7 +258,7 @@ class Schema extends DatabaseSchema { break; } } - if (isset($field['type']) && $field['type'] == 'serial') { + if (isset($field['type']) && $field['type'] === 'serial') { unset($field['not null']); } return $field; @@ -507,7 +507,7 @@ class Schema extends DatabaseSchema { if (!$this->fieldExists($table, $field)) { throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field %table.%name: field doesn't exist.", array('%table' => $table, '%name' => $field))); } - if (($field != $field_new) && $this->fieldExists($table, $field_new)) { + if (($field !== $field_new) && $this->fieldExists($table, $field_new)) { throw new SchemaObjectExistsException(t("Cannot rename field %table.%name to %name_new: target field already exists.", array('%table' => $table, '%name' => $field, '%name_new' => $field_new))); } @@ -565,7 +565,7 @@ class Schema extends DatabaseSchema { } // Rename the column if necessary. - if ($field != $field_new) { + if ($field !== $field_new) { $this->connection->query('ALTER TABLE {' . $table . '} RENAME "' . $field . '" TO "' . $field_new . '"'); } diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php index a9226b2..e47d00e 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php @@ -63,14 +63,14 @@ class Select extends QuerySelect { foreach ($this->fields as $existing_field) { if (!empty($table)) { // If table alias is given, check if field and table exists. - if ($existing_field['table'] == $table && $existing_field['field'] == $table_field) { + if ($existing_field['table'] === $table && $existing_field['field'] === $table_field) { return $return; } } else { // If there is no table, simply check if the field exists as a field or // an aliased field. - if ($existing_field['alias'] == $field) { + if ($existing_field['alias'] === $field) { return $return; } } @@ -78,7 +78,7 @@ class Select extends QuerySelect { // Also check expression aliases. foreach ($this->expressions as $expression) { - if ($expression['alias'] == $field) { + if ($expression['alias'] === $field) { return $return; } } @@ -96,7 +96,7 @@ class Select extends QuerySelect { // If $field contains an characters which are not allowed in a field name // it is considered an expression, these can't be handeld automatically // either. - if ($this->connection->escapeField($field) != $field) { + if ($this->connection->escapeField($field) !== $field) { return $return; } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php index 02a55a4..3b14da3 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php @@ -133,7 +133,7 @@ class Connection extends DatabaseConnection { $count = $this->query('SELECT COUNT(*) FROM ' . $prefix . '.sqlite_master WHERE type = :type AND name NOT LIKE :pattern', array(':type' => 'table', ':pattern' => 'sqlite_%'))->fetchField(); // We can prune the database file if it doesn't have any tables. - if ($count == 0) { + if ($count === 0) { // Detach the database. $this->query('DETACH DATABASE :schema', array(':schema' => $prefix)); // Destroy the database file. @@ -318,7 +318,7 @@ class Connection extends DatabaseConnection { // We need to find the point we're rolling back to, all other savepoints // before are no longer needed. while ($savepoint = array_pop($this->transactionLayers)) { - if ($savepoint == $savepoint_name) { + if ($savepoint === $savepoint_name) { // Mark whole stack of transactions as needed roll back. $this->willRollback = TRUE; // If it is the last the transaction in the stack, then it is not a @@ -364,7 +364,7 @@ class Connection extends DatabaseConnection { // Commit everything since SAVEPOINT $name. while($savepoint = array_pop($this->transactionLayers)) { - if ($savepoint != $name) continue; + if ($savepoint !== $name) continue; // If there are no more layers left then we should commit or rollback. if (empty($this->transactionLayers)) { diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php index e584943..c242042 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php @@ -46,4 +46,4 @@ class Insert extends QueryInsert { return $comments . 'INSERT INTO {' . $this->table . '} (' . implode(', ', $this->insertFields) . ') VALUES (' . implode(', ', $placeholders) . ')'; } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php index 823cd13..3f17dcd 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php @@ -81,7 +81,7 @@ class Schema extends DatabaseSchema { // Add the SQL statement for each field. foreach ($schema['fields'] as $name => $field) { - if (isset($field['type']) && $field['type'] == 'serial') { + if (isset($field['type']) && $field['type'] === 'serial') { if (isset($schema['primary key']) && ($key = array_search($name, $schema['primary key'])) !== FALSE) { unset($schema['primary key'][$key]); } @@ -134,7 +134,7 @@ class Schema extends DatabaseSchema { $field['sqlite_type'] = $map[$field['type'] . ':' . $field['size']]; } - if (isset($field['type']) && $field['type'] == 'serial') { + if (isset($field['type']) && $field['type'] === 'serial') { $field['auto_increment'] = TRUE; } @@ -396,7 +396,7 @@ class Schema extends DatabaseSchema { $old_count = $this->connection->query('SELECT COUNT(*) FROM {' . $table . '}')->fetchField(); $new_count = $this->connection->query('SELECT COUNT(*) FROM {' . $new_table . '}')->fetchField(); - if ($old_count == $new_count) { + if ($old_count === $new_count) { $this->dropTable($table); $this->renameTable($new_table, $table); } @@ -487,7 +487,7 @@ class Schema extends DatabaseSchema { unset($new_schema['fields'][$field]); foreach ($new_schema['indexes'] as $index => $fields) { foreach ($fields as $key => $field_name) { - if ($field_name == $field) { + if ($field_name === $field) { unset($new_schema['indexes'][$index][$key]); } } @@ -504,7 +504,7 @@ class Schema extends DatabaseSchema { if (!$this->fieldExists($table, $field)) { throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field %table.%name: field doesn't exist.", array('%table' => $table, '%name' => $field))); } - if (($field != $field_new) && $this->fieldExists($table, $field_new)) { + if (($field !== $field_new) && $this->fieldExists($table, $field_new)) { throw new SchemaObjectExistsException(t("Cannot rename field %table.%name to %name_new: target field already exists.", array('%table' => $table, '%name' => $field, '%name_new' => $field_new))); } @@ -512,7 +512,7 @@ class Schema extends DatabaseSchema { $new_schema = $old_schema; // Map the old field to the new field. - if ($field != $field_new) { + if ($field !== $field_new) { $mapping[$field_new] = $field; } else { @@ -583,7 +583,7 @@ class Schema extends DatabaseSchema { public function indexExists($table, $name) { $info = $this->getPrefixInfo($table); - return $this->connection->query('PRAGMA ' . $info['schema'] . '.index_info(' . $info['table'] . '_' . $name . ')')->fetchField() != ''; + return $this->connection->query('PRAGMA ' . $info['schema'] . '.index_info(' . $info['table'] . '_' . $name . ')')->fetchField() !== ''; } public function dropIndex($table, $name) { @@ -688,4 +688,4 @@ class Schema extends DatabaseSchema { )); return $result->fetchAllKeyed(0, 0); } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php index 5403611..105af86 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php @@ -14,4 +14,4 @@ class Select extends QuerySelect { // SQLite does not support FOR UPDATE so nothing to do. return $this; } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php index 531b6d0..1ecf326 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php @@ -74,7 +74,7 @@ class Statement extends StatementPrefetch implements Iterator, StatementInterfac // PDO allows placeholders to not be prefixed by a colon. See // http://marc.info/?l=php-internals&m=111234321827149&w=2 for // more. - if ($placeholder[0] != ':') { + if ($placeholder[0] !== ':') { $placeholder = ":$placeholder"; } // When replacing the placeholders, make sure we search for the diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php index bc63540..d06d27e 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php @@ -22,4 +22,4 @@ class Truncate extends QueryTruncate { return $comments . 'DELETE FROM {' . $this->connection->escapeTable($this->table) . '} '; } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php index 18332e7..c7d3f75 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php @@ -77,4 +77,4 @@ class Update extends QueryUpdate { return parent::execute(); } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php index ece3c7c..41506ac 100644 --- a/core/lib/Drupal/Core/Database/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Install/Tasks.php @@ -240,7 +240,7 @@ abstract class Tasks { ); $profile = drupal_get_profile(); - $db_prefix = ($profile == 'standard') ? 'drupal_' : $profile . '_'; + $db_prefix = ($profile === 'standard') ? 'drupal_' : $profile . '_'; $form['advanced_options']['db_prefix'] = array( '#type' => 'textfield', '#title' => st('Table prefix'), diff --git a/core/lib/Drupal/Core/Database/Query/Condition.php b/core/lib/Drupal/Core/Database/Query/Condition.php index f7d2a2f..ff62832 100644 --- a/core/lib/Drupal/Core/Database/Query/Condition.php +++ b/core/lib/Drupal/Core/Database/Query/Condition.php @@ -155,7 +155,7 @@ class Condition implements ConditionInterface, Countable { public function compile(Connection $connection, PlaceholderInterface $queryPlaceholder) { // Re-compile if this condition changed or if we are compiled against a // different query placeholder object. - if ($this->changed || isset($this->queryPlaceholderIdentifier) && ($this->queryPlaceholderIdentifier != $queryPlaceholder->uniqueIdentifier())) { + if ($this->changed || isset($this->queryPlaceholderIdentifier) && ($this->queryPlaceholderIdentifier !== $queryPlaceholder->uniqueIdentifier())) { $this->queryPlaceholderIdentifier = $queryPlaceholder->uniqueIdentifier(); $condition_fragments = array(); diff --git a/core/lib/Drupal/Core/Database/Query/Insert.php b/core/lib/Drupal/Core/Database/Query/Insert.php index e19de45..eb83610 100644 --- a/core/lib/Drupal/Core/Database/Query/Insert.php +++ b/core/lib/Drupal/Core/Database/Query/Insert.php @@ -286,7 +286,7 @@ class Insert extends Query { } // Don't execute query without fields. - if (count($this->insertFields) + count($this->defaultFields) == 0) { + if (count($this->insertFields) + count($this->defaultFields) === 0) { throw new NoFieldsException('There are no fields available to insert with.'); } diff --git a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php index 39465ba..e1cdef2 100644 --- a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php +++ b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php @@ -57,7 +57,7 @@ class FTPExtension extends FTP implements ChmodInterface { $list = array(); } foreach ($list as $item){ - if ($item == '.' || $item == '..') { + if ($item === '.' || $item === '..') { continue; } if (@ftp_chdir($this->connection, $item)){ @@ -100,7 +100,7 @@ class FTPExtension extends FTP implements ChmodInterface { * Implements Drupal\Core\FileTransfer\FileTransfer::isFile(). */ public function isFile($path) { - return ftp_size($this->connection, $path) != -1; + return ftp_size($this->connection, $path) !== -1; } /** diff --git a/core/lib/Drupal/Core/FileTransfer/FileTransfer.php b/core/lib/Drupal/Core/FileTransfer/FileTransfer.php index 78d69d0..4c63d89 100644 --- a/core/lib/Drupal/Core/FileTransfer/FileTransfer.php +++ b/core/lib/Drupal/Core/FileTransfer/FileTransfer.php @@ -99,12 +99,12 @@ abstract class FileTransfer { * The variable specified in $name. */ function __get($name) { - if ($name == 'connection') { + if ($name === 'connection') { $this->connect(); return $this->connection; } - if ($name == 'chroot') { + if ($name === 'chroot') { $this->setChroot(); return $this->chroot; } @@ -242,7 +242,7 @@ abstract class FileTransfer { $path = preg_replace('|^([a-z]{1}):|i', '', $path); // Strip out windows driveletter if its there. if ($strip_chroot) { if ($this->chroot && strpos($path, $this->chroot) === 0) { - $path = ($path == $this->chroot) ? '' : substr($path, strlen($this->chroot)); + $path = ($path === $this->chroot) ? '' : substr($path, strlen($this->chroot)); } } return $path; @@ -259,7 +259,7 @@ abstract class FileTransfer { */ function sanitizePath($path) { $path = str_replace('\\', '/', $path); // Windows path sanitization. - if (substr($path, -1) == '/') { + if (substr($path, -1) === '/') { $path = substr($path, 0, -1); } return $path; diff --git a/core/lib/Drupal/Core/FileTransfer/SSH.php b/core/lib/Drupal/Core/FileTransfer/SSH.php index c1bf991..df61b87 100644 --- a/core/lib/Drupal/Core/FileTransfer/SSH.php +++ b/core/lib/Drupal/Core/FileTransfer/SSH.php @@ -102,7 +102,7 @@ class SSH extends FileTransfer implements ChmodInterface { $directory = escapeshellarg($path); $cmd = "[ -d {$directory} ] && echo 'yes'"; if ($output = @ssh2_exec($this->connection, $cmd)) { - if ($output == 'yes') { + if ($output === 'yes') { return TRUE; } return FALSE; @@ -118,7 +118,7 @@ class SSH extends FileTransfer implements ChmodInterface { $file = escapeshellarg($path); $cmd = "[ -f {$file} ] && echo 'yes'"; if ($output = @ssh2_exec($this->connection, $cmd)) { - if ($output == 'yes') { + if ($output === 'yes') { return TRUE; } return FALSE; diff --git a/core/lib/Drupal/Core/Queue/Memory.php b/core/lib/Drupal/Core/Queue/Memory.php index d741bda..9c06821 100644 --- a/core/lib/Drupal/Core/Queue/Memory.php +++ b/core/lib/Drupal/Core/Queue/Memory.php @@ -63,7 +63,7 @@ class Memory implements QueueInterface { */ public function claimItem($lease_time = 30) { foreach ($this->queue as $key => $item) { - if ($item->expire == 0) { + if ($item->expire === 0) { $item->expire = time() + $lease_time; $this->queue[$key] = $item; return $item; @@ -83,7 +83,7 @@ class Memory implements QueueInterface { * Implements Drupal\Core\Queue\QueueInterface::releaseItem(). */ public function releaseItem($item) { - if (isset($this->queue[$item->item_id]) && $this->queue[$item->item_id]->expire != 0) { + if (isset($this->queue[$item->item_id]) && $this->queue[$item->item_id]->expire !== 0) { $this->queue[$item->item_id]->expire = 0; return TRUE; } diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php index 0cd76e0..390e24f 100644 --- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php +++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php @@ -390,7 +390,7 @@ abstract class LocalStream implements StreamWrapperInterface { $target = $this->getTarget($uri); $dirname = dirname($target); - if ($dirname == '.') { + if ($dirname === '.') { $dirname = ''; } diff --git a/core/lib/Drupal/Core/Updater/Updater.php b/core/lib/Drupal/Core/Updater/Updater.php index 2dca5ba..c362959 100644 --- a/core/lib/Drupal/Core/Updater/Updater.php +++ b/core/lib/Drupal/Core/Updater/Updater.php @@ -99,7 +99,7 @@ class Updater { return FALSE; } foreach ($info_files as $info_file) { - if (drupal_substr($info_file->filename, 0, -5) == drupal_basename($directory)) { + if (drupal_substr($info_file->filename, 0, -5) === drupal_basename($directory)) { // Info file Has the same name as the directory, return it. return $info_file->uri; } @@ -279,7 +279,7 @@ class Updater { if (!is_writable($parent_dir)) { @chmod($parent_dir, 0755); // It is expected that this will fail if the directory is owned by the - // FTP user. If the FTP user == web server, it will succeed. + // FTP user. If the FTP user === web server, it will succeed. try { $filetransfer->createDirectory($directory); $this->makeWorldReadable($filetransfer, $directory); diff --git a/core/lib/Drupal/Core/Utility/SchemaCache.php b/core/lib/Drupal/Core/Utility/SchemaCache.php index d8c3a50..ffb66c4 100644 --- a/core/lib/Drupal/Core/Utility/SchemaCache.php +++ b/core/lib/Drupal/Core/Utility/SchemaCache.php @@ -19,7 +19,7 @@ class SchemaCache extends CacheArray { */ public function __construct() { // Cache by request method. - parent::__construct('schema:runtime:' . ($_SERVER['REQUEST_METHOD'] == 'GET'), 'cache'); + parent::__construct('schema:runtime:' . ($_SERVER['REQUEST_METHOD'] === 'GET'), 'cache'); } /** diff --git a/core/misc/ajax.js b/core/misc/ajax.js index bd17811..4bd1b26 100644 --- a/core/misc/ajax.js +++ b/core/misc/ajax.js @@ -24,7 +24,7 @@ Drupal.behaviors.AJAX = { if (!$('#' + base + '.ajax-processed').length) { var element_settings = settings.ajax[base]; - if (typeof element_settings.selector == 'undefined') { + if (typeof element_settings.selector === 'undefined') { element_settings.selector = '#' + base; } $(element_settings.selector).each(function () { @@ -158,14 +158,14 @@ Drupal.ajax = function (base, element, element_settings) { success: function (response, status) { // Sanity check for browser support (object expected). // When using iFrame uploads, responses must be returned as a string. - if (typeof response == 'string') { + if (typeof response === 'string') { response = $.parseJSON(response); } return ajax.success(response, status); }, complete: function (response, status) { ajax.ajaxing = false; - if (status == 'error' || status == 'parsererror') { + if (status === 'error' || status === 'parsererror') { return ajax.error(response, ajax.url); } }, @@ -213,7 +213,7 @@ Drupal.ajax.prototype.keypressResponse = function (element, event) { // except for form elements of type 'text' and 'textarea', where the // spacebar activation causes inappropriate activation if #ajax['keypress'] is // TRUE. On a text-type widget a space should always be a space. - if (event.which == 13 || (event.which == 32 && element.type != 'text' && element.type != 'textarea')) { + if (event.which === 13 || (event.which === 32 && element.type !== 'text' && element.type !== 'textarea')) { $(ajax.element_settings.element).trigger(ajax.element_settings.event); return false; } @@ -264,7 +264,7 @@ Drupal.ajax.prototype.eventResponse = function (element, event) { // For radio/checkbox, allow the default event. On IE, this means letting // it actually check the box. - if (typeof element.type != 'undefined' && (element.type == 'checkbox' || element.type == 'radio')) { + if (typeof element.type !== 'undefined' && (element.type === 'checkbox' || element.type === 'radio')) { return true; } else { @@ -359,7 +359,7 @@ Drupal.ajax.prototype.beforeSend = function (xmlhttprequest, options) { $(this.element).addClass('progress-disabled').attr('disabled', true); // Insert progressbar or throbber. - if (this.progress.type == 'bar') { + if (this.progress.type === 'bar') { var progressBar = new Drupal.progressBar('ajax-progress-' + this.element.id, $.noop, this.progress.method, $.noop); if (this.progress.message) { progressBar.setProgress(-1, this.progress.message); @@ -371,7 +371,7 @@ Drupal.ajax.prototype.beforeSend = function (xmlhttprequest, options) { this.progress.object = progressBar; $(this.element).after(this.progress.element); } - else if (this.progress.type == 'throbber') { + else if (this.progress.type === 'throbber') { this.progress.element = $('
       
      '); if (this.progress.message) { this.progress.element.find('.throbber').after('
      ' + this.progress.message + '
      '); @@ -425,12 +425,12 @@ Drupal.ajax.prototype.getEffect = function (response) { var speed = response.speed || this.speed; var effect = {}; - if (type == 'none') { + if (type === 'none') { effect.showEffect = 'show'; effect.hideEffect = 'hide'; effect.showSpeed = ''; } - else if (type == 'fade') { + else if (type === 'fade') { effect.showEffect = 'fadeIn'; effect.hideEffect = 'fadeOut'; effect.showSpeed = speed; @@ -499,7 +499,7 @@ Drupal.ajax.prototype.commands = { // content satisfies the requirement of a single top-level element, and // only use the container DIV created above when it doesn't. For more // information, please see http://drupal.org/node/736066. - if (new_content.length != 1 || new_content.get(0).nodeType != 1) { + if (new_content.length !== 1 || new_content.get(0).nodeType !== 1) { new_content = new_content_wrapped; } @@ -518,7 +518,7 @@ Drupal.ajax.prototype.commands = { wrapper[method](new_content); // Immediately hide the new content if we're using any effects. - if (effect.showEffect != 'show') { + if (effect.showEffect !== 'show') { new_content.hide(); } @@ -529,7 +529,7 @@ Drupal.ajax.prototype.commands = { new_content.show(); new_content.find('.ajax-new-content')[effect.showEffect](effect.showSpeed); } - else if (effect.showEffect != 'show') { + else if (effect.showEffect !== 'show') { new_content[effect.showEffect](effect.showSpeed); } diff --git a/core/misc/batch.js b/core/misc/batch.js index 6d28b69..8dc4920 100644 --- a/core/misc/batch.js +++ b/core/misc/batch.js @@ -10,7 +10,7 @@ Drupal.behaviors.batch = { // Success: redirect to the summary. var updateCallback = function (progress, status, pb) { - if (progress == 100) { + if (progress === 100) { pb.stopMonitoring(); window.location = settings.batch.uri + '&op=finished'; } diff --git a/core/misc/collapse.js b/core/misc/collapse.js index 28281a1..5d95fa7 100644 --- a/core/misc/collapse.js +++ b/core/misc/collapse.js @@ -59,7 +59,7 @@ Drupal.behaviors.collapse = { var $fieldset = $(this); // Expand fieldset if there are errors inside, or if it contains an // element that is targeted by the uri fragment identifier. - var anchor = location.hash && location.hash != '#' ? ', ' + location.hash : ''; + var anchor = location.hash && location.hash !== '#' ? ', ' + location.hash : ''; if ($fieldset.find('.error' + anchor).length) { $fieldset.removeClass('collapsed'); } diff --git a/core/misc/drupal.js b/core/misc/drupal.js index c7917b0..ae10d88 100644 --- a/core/misc/drupal.js +++ b/core/misc/drupal.js @@ -234,12 +234,12 @@ Drupal.formatPlural = function (count, singular, plural, args, options) { var args = args || {}; args['@count'] = count; // Determine the index of the plural form. - var index = Drupal.locale.pluralFormula ? Drupal.locale.pluralFormula(args['@count']) : ((args['@count'] == 1) ? 0 : 1); + var index = Drupal.locale.pluralFormula ? Drupal.locale.pluralFormula(args['@count']) : ((args['@count'] === 1) ? 0 : 1); - if (index == 0) { + if (index === 0) { return Drupal.t(singular, args, options); } - else if (index == 1) { + else if (index === 1) { return Drupal.t(plural, args, options); } else { @@ -311,7 +311,7 @@ Drupal.encodePath = function (item, uri) { * Get the text selection in a textarea. */ Drupal.getSelection = function (element) { - if (typeof element.selectionStart != 'number' && document.selection) { + if (typeof element.selectionStart !== 'number' && document.selection) { // The current selection. var range1 = document.selection.createRange(); var range2 = range1.duplicate(); @@ -341,7 +341,7 @@ Drupal.ajaxError = function (xmlhttp, uri) { statusCode += "\n" + Drupal.t("Debugging information follows."); pathText = "\n" + Drupal.t("Path: !uri", {'!uri': uri} ); statusText = ''; - // In some cases, when statusCode == 0, xmlhttp.statusText may not be defined. + // In some cases, when statusCode === 0, xmlhttp.statusText may not be defined. // Unfortunately, testing for it with typeof, etc, doesn't seem to catch that // and the test causes an exception. So we need to catch the exception here. try { @@ -360,8 +360,8 @@ Drupal.ajaxError = function (xmlhttp, uri) { responseText = responseText.replace(/<("[^"]*"|'[^']*'|[^'">])*>/gi,""); responseText = responseText.replace(/[\n]+\s+/g,"\n"); - // We don't need readyState except for status == 0. - readyStateText = xmlhttp.status == 0 ? ("\n" + Drupal.t("ReadyState: !readyState", {'!readyState': xmlhttp.readyState})) : ""; + // We don't need readyState except for status === 0. + readyStateText = xmlhttp.status === 0 ? ("\n" + Drupal.t("ReadyState: !readyState", {'!readyState': xmlhttp.readyState})) : ""; message = statusCode + pathText + statusText + responseText + readyStateText; return message; diff --git a/core/misc/form.js b/core/misc/form.js index 4dc5b8c..35f3462 100644 --- a/core/misc/form.js +++ b/core/misc/form.js @@ -20,7 +20,7 @@ $.fn.drupalSetSummary = function (callback) { // To facilitate things, the callback should always be a function. If it's // not, we wrap it into an anonymous function which just returns the value. - if (typeof callback != 'function') { + if (typeof callback !== 'function') { var val = callback; callback = function () { return val; }; } diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js index ffe774f..7a3c079 100644 --- a/core/misc/machine-name.js +++ b/core/misc/machine-name.js @@ -49,7 +49,7 @@ Drupal.behaviors.machineName = { // Determine the initial machine name value. Unless the machine name form // element is disabled or not empty, the initial default value is based on // the human-readable form element value. - if ($target.is(':disabled') || $target.val() != '') { + if ($target.is(':disabled') || $target.val() !== '') { var machine = $target.val(); } else { @@ -82,12 +82,12 @@ Drupal.behaviors.machineName = { // Preview the machine name in realtime when the human-readable name // changes, but only if there is no machine name yet; i.e., only upon // initial creation, not when editing. - if ($target.val() == '') { + if ($target.val() === '') { $source.bind('keyup.machineName change.machineName', function () { machine = self.transliterate($(this).val(), options); // Set the machine name to the transliterated value. - if (machine != '') { - if (machine != options.replace) { + if (machine !== '') { + if (machine !== options.replace) { $target.val(machine); $preview.html(options.field_prefix + Drupal.checkPlain(machine) + options.field_suffix); } diff --git a/core/misc/progress.js b/core/misc/progress.js index b0e125c..dcbea36 100644 --- a/core/misc/progress.js +++ b/core/misc/progress.js @@ -75,7 +75,7 @@ Drupal.progressBar.prototype.sendPing = function () { dataType: 'json', success: function (progress) { // Display errors. - if (progress.status == 0) { + if (progress.status === 0) { pb.displayError(progress.data); return; } diff --git a/core/misc/states.js b/core/misc/states.js index 30b63ba..a25962c 100644 --- a/core/misc/states.js +++ b/core/misc/states.js @@ -199,7 +199,7 @@ states.Dependent.prototype = { // This constraint is an array (OR or XOR). var hasXor = $.inArray('xor', constraints) === -1; for (var i = 0, len = constraints.length; i < len; i++) { - if (constraints[i] != 'xor') { + if (constraints[i] !== 'xor') { var constraint = this.checkConstraints(constraints[i], selector, i); // Return if this is OR and we have a satisfied constraint or if this // is XOR and we have a second satisfied constraint. @@ -317,7 +317,7 @@ states.Trigger.prototype = { initialize: function () { var trigger = states.Trigger.states[this.state]; - if (typeof trigger == 'function') { + if (typeof trigger === 'function') { // We have a custom trigger initialization function. trigger.call(window, this.element); } @@ -366,7 +366,7 @@ states.Trigger.states = { 'keyup': function () { // The function associated to that trigger returns the new value for the // state. - return this.val() == ''; + return this.val() === ''; } }, @@ -425,7 +425,7 @@ states.State = function(state) { // Normalize the state name. while (true) { // Iteratively remove exclamation marks and invert the value. - while (this.name.charAt(0) == '!') { + while (this.name.charAt(0) === '!') { this.name = this.name.substring(1); this.invert = !this.invert; } diff --git a/core/misc/tabledrag.js b/core/misc/tabledrag.js index 16800e0..1fb58ac 100644 --- a/core/misc/tabledrag.js +++ b/core/misc/tabledrag.js @@ -44,7 +44,7 @@ Drupal.tableDrag = function (table, tableSettings) { this.oldY = 0; // Used to determine up or down direction from last mouse move. this.changed = false; // Whether anything in the entire table has changed. this.maxDepth = 0; // Maximum amount of allowed parenting. - this.rtl = $(this.table).css('direction') == 'rtl' ? -1 : 1; // Direction of the table. + this.rtl = $(this.table).css('direction') === 'rtl' ? -1 : 1; // Direction of the table. // Configure the scroll settings. this.scrollSettings = { amount: 4, interval: 50, trigger: 70 }; @@ -58,7 +58,7 @@ Drupal.tableDrag = function (table, tableSettings) { this.indentEnabled = false; for (var group in tableSettings) { for (var n in tableSettings[group]) { - if (tableSettings[group][n].relationship == 'parent') { + if (tableSettings[group][n].relationship === 'parent') { this.indentEnabled = true; } if (tableSettings[group][n].limit > 0) { @@ -88,7 +88,7 @@ Drupal.tableDrag = function (table, tableSettings) { $table.before($('') .attr('title', Drupal.t('Re-order rows by numerical weight instead of dragging.')) .click(function () { - if ($.cookie('Drupal.tableDrag.showWeight') == 1) { + if ($.cookie('Drupal.tableDrag.showWeight') === 1) { self.hideColumns(); } else { @@ -174,7 +174,7 @@ Drupal.tableDrag.prototype.initColumns = function () { } // Check cookie value and show/hide weight columns accordingly. else { - if ($.cookie('Drupal.tableDrag.showWeight') == 1) { + if ($.cookie('Drupal.tableDrag.showWeight') === 1) { this.showColumns(); } else { @@ -275,9 +275,9 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) { // Add hover action for the handle. handle.hover(function () { - self.dragObject == null ? $(this).addClass('tabledrag-handle-hover') : null; + self.dragObject === null ? $(this).addClass('tabledrag-handle-hover') : null; }, function () { - self.dragObject == null ? $(this).removeClass('tabledrag-handle-hover') : null; + self.dragObject === null ? $(this).removeClass('tabledrag-handle-hover') : null; }); // Add the mousedown action for the handle. @@ -343,7 +343,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) { // Add arrow-key support to the handle. handle.keydown(function (event) { // If a rowObject doesn't yet exist and this isn't the tab key. - if (event.keyCode != 9 && !self.rowObject) { + if (event.keyCode !== 9 && !self.rowObject) { self.rowObject = new self.row(item, 'keyboard', self.indentEnabled, self.maxDepth, true); } @@ -381,7 +381,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) { window.scrollBy(0, -groupHeight); } } - else if (self.table.tBodies[0].rows[0] != previousRow || $previousRow.is('.draggable')) { + else if (self.table.tBodies[0].rows[0] !== previousRow || $previousRow.is('.draggable')) { // Swap with the previous row (unless previous row is the first one // and undraggable). self.rowObject.swap('before', previousRow); @@ -436,7 +436,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) { break; } - if (self.rowObject && self.rowObject.changed == true) { + if (self.rowObject && self.rowObject.changed === true) { $(item).addClass('drag'); if (self.oldRowElement) { $(self.oldRowElement).removeClass('drag-previous'); @@ -477,7 +477,7 @@ Drupal.tableDrag.prototype.dragRow = function (event, self) { var x = self.currentMouseCoords.x - self.dragObject.initMouseOffset.x; // Check for row swapping and vertical scrolling. - if (y != self.oldY) { + if (y !== self.oldY) { self.rowObject.direction = y > self.oldY ? 'down' : 'up'; self.oldY = y; // Update the old value. @@ -486,14 +486,14 @@ Drupal.tableDrag.prototype.dragRow = function (event, self) { // Stop any current scrolling. clearInterval(self.scrollInterval); // Continue scrolling if the mouse has moved in the scroll direction. - if (scrollAmount > 0 && self.rowObject.direction == 'down' || scrollAmount < 0 && self.rowObject.direction == 'up') { + if (scrollAmount > 0 && self.rowObject.direction === 'down' || scrollAmount < 0 && self.rowObject.direction === 'up') { self.setScroll(scrollAmount); } // If we have a valid target, perform the swap and restripe the table. var currentRow = self.findDropTargetRow(x, y); if (currentRow) { - if (self.rowObject.direction == 'down') { + if (self.rowObject.direction === 'down') { self.rowObject.swap('after', currentRow, self); } else { @@ -526,11 +526,11 @@ Drupal.tableDrag.prototype.dragRow = function (event, self) { */ Drupal.tableDrag.prototype.dropRow = function (event, self) { // Drop row functionality shared between mouseup and blur events. - if (self.rowObject != null) { + if (self.rowObject !== null) { var droppedRow = self.rowObject.element; var $droppedRow = $(droppedRow); // The row is already in the right place so we just release it. - if (self.rowObject.changed == true) { + if (self.rowObject.changed === true) { // Update the fields in the dropped row. self.updateFields(droppedRow); @@ -538,7 +538,7 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) { // fields in the entire dragged group. for (var group in self.tableSettings) { var rowSettings = self.rowSettings(group, droppedRow); - if (rowSettings.relationship == 'group') { + if (rowSettings.relationship === 'group') { for (var n in self.rowObject.children) { self.updateField(self.rowObject.children[n], group); } @@ -546,7 +546,7 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) { } self.rowObject.markChanged(); - if (self.changed == false) { + if (self.changed === false) { $(Drupal.theme('tableDragChangedWarning')).insertBefore(self.table).hide().fadeIn('slow'); self.changed = true; } @@ -565,7 +565,7 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) { } // Functionality specific only to mouseup event. - if (self.dragObject != null) { + if (self.dragObject !== null) { $droppedRow.find('.tabledrag-handle').removeClass('tabledrag-handle-hover'); self.dragObject = null; @@ -616,7 +616,7 @@ Drupal.tableDrag.prototype.findDropTargetRow = function (x, y) { // Because Safari does not report offsetHeight on table rows, but does on // table cells, grab the firstChild of the row and use that instead. // http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari. - if (row.offsetHeight == 0) { + if (row.offsetHeight === 0) { var rowHeight = parseInt(row.firstChild.offsetHeight, 10) / 2; } // Other browsers. @@ -629,14 +629,14 @@ Drupal.tableDrag.prototype.findDropTargetRow = function (x, y) { if (this.indentEnabled) { // Check that this row is not a child of the row being dragged. for (var n in this.rowObject.group) { - if (this.rowObject.group[n] == row) { + if (this.rowObject.group[n] === row) { return null; } } } else { // Do not allow a row to be swapped with itself. - if (row == this.rowObject.element) { + if (row === this.rowObject.element) { return null; } } @@ -688,11 +688,11 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { var $changedRow = $(changedRow); // Set the row as its own target. - if (rowSettings.relationship == 'self' || rowSettings.relationship == 'group') { + if (rowSettings.relationship === 'self' || rowSettings.relationship === 'group') { var sourceRow = changedRow; } // Siblings are easy, check previous and next rows. - else if (rowSettings.relationship == 'sibling') { + else if (rowSettings.relationship === 'sibling') { var $previousRow = $changedRow.prev('tr').eq(0); var previousRow = $previousRow.get(0); var $nextRow = $changedRow.next('tr').eq(0); @@ -700,7 +700,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { var sourceRow = changedRow; if ($previousRow.is('.draggable') && $previousRow.find('.' + group).length) { if (this.indentEnabled) { - if ($previousRow.find('.indentations').length == $changedRow.find('.indentations')) { + if ($previousRow.find('.indentations').length === $changedRow.find('.indentations')) { sourceRow = previousRow; } } @@ -710,7 +710,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { } else if ($nextRow.is('.draggable') && $nextRow.find('.' + group).length) { if (this.indentEnabled) { - if ($nextRow.find('.indentations').length == $changedRow.find('.indentations')) { + if ($nextRow.find('.indentations').length === $changedRow.find('.indentations')) { sourceRow = nextRow; } } @@ -721,7 +721,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { } // Parents, look up the tree until we find a field not in this group. // Go up as many parents as indentations in the changed row. - else if (rowSettings.relationship == 'parent') { + else if (rowSettings.relationship === 'parent') { var $previousRow = $changedRow.prev('tr'); var previousRow = $previousRow; while ($previousRow.length && $previousRow.find('.indentation').length >= this.rowObject.indents) { @@ -739,7 +739,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { // be at the root level. Find the first item, then compare this row // against it as a sibling. sourceRow = $(this.table).find('tr.draggable:first').get(0); - if (sourceRow == this.rowObject.element) { + if (sourceRow === this.rowObject.element) { sourceRow = $(this.rowObject.group[this.rowObject.group.length - 1]).next('tr.draggable').get(0); } var useSibling = true; @@ -824,7 +824,7 @@ Drupal.tableDrag.prototype.checkScroll = function (cursorY) { var de = document.documentElement; var b = document.body; - var windowHeight = this.windowHeight = window.innerHeight || (de.clientHeight && de.clientWidth != 0 ? de.clientHeight : b.offsetHeight); + var windowHeight = this.windowHeight = window.innerHeight || (de.clientHeight && de.clientWidth !== 0 ? de.clientHeight : b.offsetHeight); var scrollY = this.scrollY = (document.all ? (!de.scrollTop ? b.scrollTop : de.scrollTop) : (window.pageYOffset ? window.pageYOffset : window.scrollY)); var trigger = this.scrollSettings.trigger; var delta = 0; @@ -937,10 +937,10 @@ Drupal.tableDrag.prototype.row.prototype.findChildren = function (addClasses) { rows.push(currentRow[0]); if (addClasses) { currentRow.find('.indentation').each(function (indentNum) { - if (child == 1 && (indentNum == parentIndentation)) { + if (child === 1 && (indentNum === parentIndentation)) { $(this).addClass('tree-child-first'); } - if (indentNum == parentIndentation) { + if (indentNum === parentIndentation) { $(this).addClass('tree-child'); } else if (indentNum > parentIndentation) { @@ -970,7 +970,7 @@ Drupal.tableDrag.prototype.row.prototype.isValidSwap = function (row) { var $row = $(row); if (this.indentEnabled) { var prevRow, nextRow; - if (this.direction == 'down') { + if (this.direction === 'down') { prevRow = row; nextRow = $row.next('tr').get(0); } @@ -987,7 +987,7 @@ Drupal.tableDrag.prototype.row.prototype.isValidSwap = function (row) { } // Do not let an un-draggable first row have anything put before it. - if (this.table.tBodies[0].rows[0] == row && $row.is(':not(.draggable)')) { + if (this.table.tBodies[0].rows[0] === row && $row.is(':not(.draggable)')) { return false; } @@ -1115,7 +1115,7 @@ Drupal.tableDrag.prototype.row.prototype.findSiblings = function (rowSettings) { var checkRowIndentation = checkRow.find('.indentation').length; } - if (!(this.indentEnabled) || (checkRowIndentation == rowIndentation)) { + if (!(this.indentEnabled) || (checkRowIndentation === rowIndentation)) { siblings.push(checkRow[0]); } else if (checkRowIndentation < rowIndentation) { @@ -1130,7 +1130,7 @@ Drupal.tableDrag.prototype.row.prototype.findSiblings = function (rowSettings) { } // Since siblings are added in reverse order for previous, reverse the // completed list of previous siblings. Add the current row and continue. - if (directions[d] == 'prev') { + if (directions[d] === 'prev') { siblings.reverse(); siblings.push(this.element); } @@ -1157,7 +1157,7 @@ Drupal.tableDrag.prototype.row.prototype.removeIndentClasses = function () { Drupal.tableDrag.prototype.row.prototype.markChanged = function () { var marker = Drupal.theme('tableDragChangedMarker'); var cell = $(this.element).find('td:first'); - if (cell.find('abbr.tabledrag-changed').length == 0) { + if (cell.find('abbr.tabledrag-changed').length === 0) { cell.append(marker); } }; diff --git a/core/misc/tableselect.js b/core/misc/tableselect.js index b7011e0..391d429 100644 --- a/core/misc/tableselect.js +++ b/core/misc/tableselect.js @@ -9,7 +9,7 @@ Drupal.behaviors.tableSelect = { Drupal.tableSelect = function () { // Do not add a "Select all" checkbox if there are no rows with checkboxes in the table - if ($(this).find('td input:checkbox').length == 0) { + if ($(this).find('td input:checkbox').length === 0) { return; } @@ -47,13 +47,13 @@ Drupal.tableSelect = function () { // If this is a shift click, we need to highlight everything in the range. // Also make sure that we are actually checking checkboxes over a range and // that a checkbox has been checked or unchecked before. - if (e.shiftKey && lastChecked && lastChecked != e.target) { + if (e.shiftKey && lastChecked && lastChecked !== e.target) { // We use the checkbox's parent TR to do our range searching. Drupal.tableSelectRange($(e.target).closest('tr')[0], $(lastChecked).closest('tr')[0], e.target.checked); } // If all checkboxes are checked, make sure the select-all one is checked too, otherwise keep unchecked. - updateSelectAll((checkboxes.length == checkboxes.filter(':checked').length)); + updateSelectAll((checkboxes.length === checkboxes.filter(':checked').length)); // Keep track of the last checked checkbox. lastChecked = e.target; @@ -67,7 +67,7 @@ Drupal.tableSelectRange = function (from, to, state) { // Traverse through the sibling nodes. for (var i = from[mode], $i; i; i = i[mode]) { // Make sure that we're only dealing with elements. - if (i.nodeType != 1) { + if (i.nodeType !== 1) { continue; } $i = $(i); @@ -79,7 +79,7 @@ Drupal.tableSelectRange = function (from, to, state) { if (to.nodeType) { // If we are at the end of the range, stop. - if (i == to) { + if (i === to) { break; } } diff --git a/core/misc/timezone.js b/core/misc/timezone.js index 62b7d4b..03a2e19 100644 --- a/core/misc/timezone.js +++ b/core/misc/timezone.js @@ -29,12 +29,12 @@ Drupal.behaviors.setTimezone = { var isDaylightSavingTime; // If the offset from UTC is identical on January 1 and July 1, // assume daylight saving time is not used in this time zone. - if (offsetJan == offsetJul) { + if (offsetJan === offsetJul) { isDaylightSavingTime = ''; } // If the maximum annual offset is equivalent to the current offset, // assume daylight saving time is in effect. - else if (Math.max(offsetJan, offsetJul) == offsetNow) { + else if (Math.max(offsetJan, offsetJul) === offsetNow) { isDaylightSavingTime = 1; } // Otherwise, assume daylight saving time is not in effect. diff --git a/core/misc/vertical-tabs.js b/core/misc/vertical-tabs.js index 65e5683..00d0d1c 100644 --- a/core/misc/vertical-tabs.js +++ b/core/misc/vertical-tabs.js @@ -20,7 +20,7 @@ Drupal.behaviors.verticalTabs = { // Check if there are some fieldsets that can be converted to vertical-tabs var $fieldsets = $this.find('> fieldset'); - if ($fieldsets.length == 0) { + if ($fieldsets.length === 0) { return; } @@ -40,7 +40,7 @@ Drupal.behaviors.verticalTabs = { .removeClass('collapsible collapsed') .addClass('vertical-tabs-pane') .data('verticalTab', vertical_tab); - if (this.id == focusID) { + if (this.id === focusID) { tab_focus = $this; } }); @@ -86,7 +86,7 @@ Drupal.verticalTab = function (settings) { // Keyboard events added: // Pressing the Enter key will open the tab pane. this.link.keydown(function(event) { - if (event.keyCode == 13) { + if (event.keyCode === 13) { self.focus(); // Set focus on the first input field of the visible fieldset/tab pane. $("fieldset.vertical-tabs-pane :input:visible:enabled:first").focus(); diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc index 09da1cf..cb9df93 100644 --- a/core/modules/aggregator/aggregator.admin.inc +++ b/core/modules/aggregator/aggregator.admin.inc @@ -142,7 +142,7 @@ function aggregator_form_feed($form, &$form_state, stdClass $feed = NULL) { * @see aggregator_form_feed_submit() */ function aggregator_form_feed_validate($form, &$form_state) { - if ($form_state['values']['op'] == t('Save')) { + if ($form_state['values']['op'] === t('Save')) { // Check for duplicate titles. if (isset($form_state['values']['fid'])) { $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = :title OR url = :url) AND fid <> :fid", array(':title' => $form_state['values']['title'], ':url' => $form_state['values']['url'], ':fid' => $form_state['values']['fid'])); @@ -151,10 +151,10 @@ function aggregator_form_feed_validate($form, &$form_state) { $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = :title OR url = :url", array(':title' => $form_state['values']['title'], ':url' => $form_state['values']['url'])); } foreach ($result as $feed) { - if (strcasecmp($feed->title, $form_state['values']['title']) == 0) { + if (strcasecmp($feed->title, $form_state['values']['title']) === 0) { form_set_error('title', t('A feed named %feed already exists. Enter a unique title.', array('%feed' => $form_state['values']['title']))); } - if (strcasecmp($feed->url, $form_state['values']['url']) == 0) { + if (strcasecmp($feed->url, $form_state['values']['url']) === 0) { form_set_error('url', t('A feed with this URL %url already exists. Enter a unique URL.', array('%url' => $form_state['values']['url']))); } } @@ -168,7 +168,7 @@ function aggregator_form_feed_validate($form, &$form_state) { * @todo Add delete confirmation dialog. */ function aggregator_form_feed_submit($form, &$form_state) { - if ($form_state['values']['op'] == t('Delete')) { + if ($form_state['values']['op'] === t('Delete')) { $title = $form_state['values']['title']; // Unset the title. unset($form_state['values']['title']); @@ -177,7 +177,7 @@ function aggregator_form_feed_submit($form, &$form_state) { if (isset($form_state['values']['fid'])) { if (isset($form_state['values']['title'])) { drupal_set_message(t('The feed %feed has been updated.', array('%feed' => $form_state['values']['title']))); - if (arg(0) == 'admin') { + if (arg(0) === 'admin') { $form_state['redirect'] = 'admin/config/services/aggregator/'; return; } @@ -189,7 +189,7 @@ function aggregator_form_feed_submit($form, &$form_state) { else { watchdog('aggregator', 'Feed %feed deleted.', array('%feed' => $title)); drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => $title))); - if (arg(0) == 'admin') { + if (arg(0) === 'admin') { $form_state['redirect'] = 'admin/config/services/aggregator/'; return; } @@ -302,7 +302,7 @@ function aggregator_form_opml($form, &$form_state) { */ function aggregator_form_opml_validate($form, &$form_state) { // If both fields are empty or filled, cancel. - if (empty($form_state['values']['remote']) == empty($_FILES['files']['name']['upload'])) { + if (empty($form_state['values']['remote']) === empty($_FILES['files']['name']['upload'])) { form_set_error('remote', t('You must either upload a file or enter a URL.')); } } @@ -343,11 +343,11 @@ function aggregator_form_opml_submit($form, &$form_state) { // Check for duplicate titles or URLs. $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = :title OR url = :url", array(':title' => $feed['title'], ':url' => $feed['url'])); foreach ($result as $old) { - if (strcasecmp($old->title, $feed['title']) == 0) { + if (strcasecmp($old->title, $feed['title']) === 0) { drupal_set_message(t('A feed named %title already exists.', array('%title' => $old->title)), 'warning'); continue 2; } - if (strcasecmp($old->url, $feed['url']) == 0) { + if (strcasecmp($old->url, $feed['url']) === 0) { drupal_set_message(t('A feed with the URL %url already exists.', array('%url' => $old->url)), 'warning'); continue 2; } @@ -381,7 +381,7 @@ function _aggregator_parse_opml($opml) { $xml_parser = drupal_xml_parser_create($opml); if (xml_parse_into_struct($xml_parser, $opml, $values)) { foreach ($values as $entry) { - if ($entry['tag'] == 'OUTLINE' && isset($entry['attributes'])) { + if ($entry['tag'] === 'OUTLINE' && isset($entry['attributes'])) { $item = $entry['attributes']; if (!empty($item['XMLURL']) && !empty($item['TEXT'])) { $feeds[] = array('title' => $item['TEXT'], 'url' => $item['XMLURL']); @@ -573,7 +573,7 @@ function aggregator_form_category($form, &$form_state, $edit = array('title' => * @see aggregator_form_category_submit() */ function aggregator_form_category_validate($form, &$form_state) { - if ($form_state['values']['op'] == t('Save')) { + if ($form_state['values']['op'] === t('Save')) { // Check for duplicate titles if (isset($form_state['values']['cid'])) { $category = db_query("SELECT cid FROM {aggregator_category} WHERE title = :title AND cid <> :cid", array(':title' => $form_state['values']['title'], ':cid' => $form_state['values']['cid']))->fetchObject(); @@ -594,7 +594,7 @@ function aggregator_form_category_validate($form, &$form_state) { * @todo Add delete confirmation dialog. */ function aggregator_form_category_submit($form, &$form_state) { - if ($form_state['values']['op'] == t('Delete')) { + if ($form_state['values']['op'] === t('Delete')) { $title = $form_state['values']['title']; // Unset the title. unset($form_state['values']['title']); @@ -603,7 +603,7 @@ function aggregator_form_category_submit($form, &$form_state) { if (isset($form_state['values']['cid'])) { if (isset($form_state['values']['title'])) { drupal_set_message(t('The category %category has been updated.', array('%category' => $form_state['values']['title']))); - if (arg(0) == 'admin') { + if (arg(0) === 'admin') { $form_state['redirect'] = 'admin/config/services/aggregator/'; return; } @@ -615,7 +615,7 @@ function aggregator_form_category_submit($form, &$form_state) { else { watchdog('aggregator', 'Category %category deleted.', array('%category' => $title)); drupal_set_message(t('The category %category has been deleted.', array('%category' => $title))); - if (arg(0) == 'admin') { + if (arg(0) === 'admin') { $form_state['redirect'] = 'admin/config/services/aggregator/'; return; } diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index fec4f0b..57350b4 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -362,7 +362,7 @@ function aggregator_block_info() { */ function aggregator_block_configure($delta = '') { list($type, $id) = explode('-', $delta); - if ($type == 'category') { + if ($type === 'category') { $value = db_query('SELECT block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchField(); $form['block'] = array( '#type' => 'select', @@ -379,7 +379,7 @@ function aggregator_block_configure($delta = '') { */ function aggregator_block_save($delta = '', $edit = array()) { list($type, $id) = explode('-', $delta); - if ($type == 'category') { + if ($type === 'category') { db_update('aggregator_category') ->fields(array('block' => $edit['block'])) ->condition('cid', $id) @@ -589,11 +589,11 @@ function aggregator_remove($feed) { function _aggregator_get_variables() { // Fetch the feed. $fetcher = variable_get('aggregator_fetcher', 'aggregator'); - if ($fetcher == 'aggregator') { + if ($fetcher === 'aggregator') { include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'aggregator') . '/aggregator.fetcher.inc'; } $parser = variable_get('aggregator_parser', 'aggregator'); - if ($parser == 'aggregator') { + if ($parser === 'aggregator') { include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'aggregator') . '/aggregator.parser.inc'; } $processors = variable_get('aggregator_processors', array('aggregator')); @@ -622,7 +622,7 @@ function aggregator_refresh($feed) { // data. If both are equal we say that feed is not updated. $hash = hash('sha256', $feed->source_string); - if ($success && ($feed->hash != $hash)) { + if ($success && ($feed->hash !== $hash)) { // Parse the feed. if (module_invoke($parser, 'aggregator_parse', $feed)) { // Update feed with parsed data. @@ -640,7 +640,7 @@ function aggregator_refresh($feed) { ->execute(); // Log if feed URL has changed. - if ($feed->url != $feed_url) { + if ($feed->url !== $feed_url) { watchdog('aggregator', 'Updated URL for feed %title to %url.', array('%title' => $feed->title, '%url' => $feed->url)); } @@ -785,7 +785,7 @@ function _aggregator_items($count) { * Implements hook_preprocess_block(). */ function aggregator_preprocess_block(&$variables) { - if ($variables['block']->module == 'aggregator') { + if ($variables['block']->module === 'aggregator') { $variables['attributes_array']['role'] = 'complementary'; } } diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc index ebb561b..bcfb0ed 100644 --- a/core/modules/aggregator/aggregator.pages.inc +++ b/core/modules/aggregator/aggregator.pages.inc @@ -165,7 +165,7 @@ function aggregator_load_feed_items($type, $data = NULL) { * The rendered list of items for a feed. */ function _aggregator_page_list($items, $op, $feed_source = '') { - if (user_access('administer news feeds') && ($op == 'categorize')) { + if (user_access('administer news feeds') && ($op === 'categorize')) { // Get form data. $output = aggregator_categorize_items($items, $feed_source); } @@ -331,7 +331,7 @@ function template_preprocess_aggregator_item(&$variables) { $variables['source_url'] = url("aggregator/sources/$item->fid"); $variables['source_title'] = check_plain($item->ftitle); } - if (date('Ymd', $item->timestamp) == date('Ymd')) { + if (date('Ymd', $item->timestamp) === date('Ymd')) { $variables['source_date'] = t('%ago ago', array('%ago' => format_interval(REQUEST_TIME - $item->timestamp))); } else { @@ -440,7 +440,7 @@ function theme_aggregator_page_rss($variables) { switch ($feed_length) { case 'teaser': $summary = text_summary($feed->description, NULL, variable_get('aggregator_teaser_length', 600)); - if ($summary != $feed->description) { + if ($summary !== $feed->description) { $summary .= '

      ' . t('read more') . "

      \n"; } $feed->description = $summary; diff --git a/core/modules/aggregator/aggregator.parser.inc b/core/modules/aggregator/aggregator.parser.inc index 0f594d4..85859bb 100644 --- a/core/modules/aggregator/aggregator.parser.inc +++ b/core/modules/aggregator/aggregator.parser.inc @@ -185,15 +185,15 @@ function aggregator_element_start($parser, $name, $attributes) { break; case 'id': case 'content': - if ($element != 'item') { + if ($element !== 'item') { $element = $name; } case 'link': // According to RFC 4287, link elements in Atom feeds without a 'rel' // attribute should be interpreted as though the relation type is // "alternate". - if (!empty($attributes['HREF']) && (empty($attributes['REL']) || $attributes['REL'] == 'alternate')) { - if ($element == 'item') { + if (!empty($attributes['HREF']) && (empty($attributes['REL']) || $attributes['REL'] === 'alternate')) { + if ($element === 'item') { $items[$item]['link'] = $attributes['HREF']; } else { @@ -232,7 +232,7 @@ function aggregator_element_end($parser, $name) { break; case 'id': case 'content': - if ($element == $name) { + if ($element === $name) { $element = ''; } } @@ -305,7 +305,7 @@ function aggregator_parse_w3cdtf($date_str) { list($year, $month, $day, $hours, $minutes, $seconds) = array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]); // Calculate the epoch for current date assuming GMT. $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year); - if ($match[10] != 'Z') { // Z is zulu time, aka GMT + if ($match[10] !== 'Z') { // Z is zulu time, aka GMT list($tz_mod, $tz_hour, $tz_min) = array($match[8], $match[9], $match[10]); // Zero out the variables. if (!$tz_hour) { @@ -316,7 +316,7 @@ function aggregator_parse_w3cdtf($date_str) { } $offset_secs = (($tz_hour * 60) + $tz_min) * 60; // Is timezone ahead of GMT? If yes, subtract offset. - if ($tz_mod == '+') { + if ($tz_mod === '+') { $offset_secs *= -1; } $epoch += $offset_secs; diff --git a/core/modules/aggregator/aggregator.processor.inc b/core/modules/aggregator/aggregator.processor.inc index 7fa86a9..ef27778 100644 --- a/core/modules/aggregator/aggregator.processor.inc +++ b/core/modules/aggregator/aggregator.processor.inc @@ -28,7 +28,7 @@ function aggregator_aggregator_process($feed) { if (!empty($item['guid'])) { $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND guid = :guid", array(':fid' => $feed->fid, ':guid' => $item['guid']))->fetchObject(); } - elseif ($item['link'] && $item['link'] != $feed->link && $item['link'] != $feed->url) { + elseif ($item['link'] && $item['link'] !== $feed->link && $item['link'] !== $feed->url) { $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND link = :link", array(':fid' => $feed->fid, ':link' => $item['link']))->fetchObject(); } else { @@ -132,7 +132,7 @@ function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) { * aggregator_form_aggregator_admin_form_alter(). */ function _aggregator_characters($length) { - return ($length == 0) ? t('Unlimited') : format_plural($length, '1 character', '@count characters'); + return ($length === 0) ? t('Unlimited') : format_plural($length, '1 character', '@count characters'); } /** @@ -186,7 +186,7 @@ function aggregator_save_item($edit) { function aggregator_expire($feed) { $aggregator_clear = variable_get('aggregator_clear', 9676800); - if ($aggregator_clear != AGGREGATOR_CLEAR_NEVER) { + if ($aggregator_clear !== AGGREGATOR_CLEAR_NEVER) { // Remove all items that are older than flush item timer. $age = REQUEST_TIME - $aggregator_clear; $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid AND timestamp < :timestamp', array( diff --git a/core/modules/aggregator/aggregator.test b/core/modules/aggregator/aggregator.test index 2149bed..7f706a6 100644 --- a/core/modules/aggregator/aggregator.test +++ b/core/modules/aggregator/aggregator.test @@ -10,7 +10,7 @@ class AggregatorTestCase extends DrupalWebTestCase { parent::setUp(array('node', 'block', 'aggregator', 'aggregator_test')); // Create an Article node type. - if ($this->profile != 'standard') { + if ($this->profile !== 'standard') { $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article')); } @@ -114,7 +114,7 @@ class AggregatorTestCase extends DrupalWebTestCase { $feed->items[] = $item->iid; } $feed->item_count = count($feed->items); - $this->assertEqual($expected_count, $feed->item_count, t('Total items in feed equal to the total items in database (!val1 != !val2)', array('!val1' => $expected_count, '!val2' => $feed->item_count))); + $this->assertEqual($expected_count, $feed->item_count, t('Total items in feed equal to the total items in database (!val1 !== !val2)', array('!val1' => $expected_count, '!val2' => $feed->item_count))); } /** @@ -142,7 +142,7 @@ class AggregatorTestCase extends DrupalWebTestCase { $this->assertTrue($count); $this->removeFeedItems($feed); $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField(); - $this->assertTrue($count == 0); + $this->assertTrue($count === 0); } /** @@ -184,7 +184,7 @@ class AggregatorTestCase extends DrupalWebTestCase { */ function uniqueFeed($feed_name, $feed_url) { $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed_name, ':url' => $feed_url))->fetchField(); - return (1 == $result); + return (1 === $result); } /** @@ -766,8 +766,8 @@ class ImportOPMLTestCase extends AggregatorTestCase { foreach ($feeds_from_db as $feed) { $title[$feed->url] = $feed->title; $url[$feed->title] = $feed->url; - $category = $category && $feed->cid == 1; - $refresh = $refresh && $feed->refresh == 900; + $category = $category && $feed->cid === 1; + $refresh = $refresh && $feed->refresh === 900; } $this->assertEqual($title[$feeds[0]['url']], $feeds[0]['title'], t('First feed was added correctly.')); diff --git a/core/modules/aggregator/tests/aggregator_test.module b/core/modules/aggregator/tests/aggregator_test.module index 2d26a5d..468f9af 100644 --- a/core/modules/aggregator/tests/aggregator_test.module +++ b/core/modules/aggregator/tests/aggregator_test.module @@ -38,7 +38,7 @@ function aggregator_test_feed($use_last_modified = FALSE, $use_etag = FALSE) { drupal_add_http_header('ETag', $etag); } // Return 304 not modified if either last modified or etag match. - if ($last_modified == $if_modified_since || $etag == $if_none_match) { + if ($last_modified === $if_modified_since || $etag === $if_none_match) { drupal_add_http_header('Status', '304 Not Modified'); return; } diff --git a/core/modules/block/block-admin-display-form.tpl.php b/core/modules/block/block-admin-display-form.tpl.php index 1728273..60f2661 100644 --- a/core/modules/block/block-admin-display-form.tpl.php +++ b/core/modules/block/block-admin-display-form.tpl.php @@ -44,7 +44,7 @@ $data): ?> - + block_title; ?> region_select; ?> weight_select; ?> diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc index 8a5553d..4d378c1 100644 --- a/core/modules/block/block.admin.inc +++ b/core/modules/block/block.admin.inc @@ -140,7 +140,7 @@ function block_admin_display_form($form, &$form_state, $blocks, $theme, $block_r ); $form['blocks'][$key]['region'] = array( '#type' => 'select', - '#default_value' => $block['region'] != BLOCK_REGION_NONE ? $block['region'] : NULL, + '#default_value' => $block['region'] !== BLOCK_REGION_NONE ? $block['region'] : NULL, '#empty_value' => BLOCK_REGION_NONE, '#title_display' => 'invisible', '#title' => t('Region for @block block', array('@block' => $block['info'])), @@ -151,7 +151,7 @@ function block_admin_display_form($form, &$form_state, $blocks, $theme, $block_r '#title' => t('configure'), '#href' => 'admin/structure/block/manage/' . $block['module'] . '/' . $block['delta'] . '/configure', ); - if ($block['module'] == 'block') { + if ($block['module'] === 'block') { $form['blocks'][$key]['delete'] = array( '#type' => 'link', '#title' => t('delete'), @@ -185,7 +185,7 @@ function block_admin_display_form_submit($form, &$form_state) { $transaction = db_transaction(); try { foreach ($form_state['values']['blocks'] as $block) { - $block['status'] = (int) ($block['region'] != BLOCK_REGION_NONE); + $block['status'] = (int) ($block['region'] !== BLOCK_REGION_NONE); $block['region'] = $block['status'] ? $block['region'] : ''; db_update('block') ->fields(array( @@ -240,7 +240,7 @@ function _block_compare($a, $b) { return $place; } // Sort by weight, unless disabled. - if ($a['region'] != BLOCK_REGION_NONE) { + if ($a['region'] !== BLOCK_REGION_NONE) { $weight = $a['weight'] - $b['weight']; if ($weight) { return $weight; @@ -286,7 +286,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) { '#type' => 'textfield', '#title' => t('Block title'), '#maxlength' => 64, - '#description' => $block->module == 'block' ? t('The title of the block as shown to the user.') : t('Override the default title for the block. Use !placeholder to display no title, or leave blank to use the default block title.', array('!placeholder' => '<none>')), + '#description' => $block->module === 'block' ? t('The title of the block as shown to the user.') : t('Override the default title for the block. Use !placeholder to display no title, or leave blank to use the default block title.', array('!placeholder' => '<none>')), '#default_value' => isset($block->title) ? $block->title : '', '#weight' => -19, ); @@ -321,19 +321,19 @@ function block_admin_configure($form, &$form_state, $module, $delta) { // Use a meaningful title for the main site theme and administrative // theme. $theme_title = $theme->info['name']; - if ($key == $theme_default) { + if ($key === $theme_default) { $theme_title = t('!theme (default theme)', array('!theme' => $theme_title)); } - elseif ($admin_theme && $key == $admin_theme) { + elseif ($admin_theme && $key === $admin_theme) { $theme_title = t('!theme (administration theme)', array('!theme' => $theme_title)); } $form['regions'][$key] = array( '#type' => 'select', '#title' => $theme_title, - '#default_value' => !empty($region) && $region != -1 ? $region : NULL, + '#default_value' => !empty($region) && $region !== -1 ? $region : NULL, '#empty_value' => BLOCK_REGION_NONE, '#options' => system_region_list($key, REGIONS_VISIBLE), - '#weight' => ($key == $theme_default ? 9 : 10), + '#weight' => ($key === $theme_default ? 9 : 10), ); } } @@ -361,7 +361,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) { ); $access = user_access('use PHP for settings'); - if (isset($block->visibility) && $block->visibility == BLOCK_VISIBILITY_PHP && !$access) { + if (isset($block->visibility) && $block->visibility === BLOCK_VISIBILITY_PHP && !$access) { $form['visibility']['path']['visibility'] = array( '#type' => 'value', '#value' => BLOCK_VISIBILITY_PHP, @@ -459,7 +459,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) { * @see block_admin_configure_submit() */ function block_admin_configure_validate($form, &$form_state) { - if ($form_state['values']['module'] == 'block') { + if ($form_state['values']['module'] === 'block') { $custom_block_exists = (bool) db_query_range('SELECT 1 FROM {block_custom} WHERE bid <> :bid AND info = :info', 0, 1, array( ':bid' => $form_state['values']['delta'], ':info' => $form_state['values']['info'], @@ -510,9 +510,9 @@ function block_admin_configure_submit($form, &$form_state) { db_merge('block') ->key(array('theme' => $theme, 'delta' => $form_state['values']['delta'], 'module' => $form_state['values']['module'])) ->fields(array( - 'region' => ($region == BLOCK_REGION_NONE ? '' : $region), + 'region' => ($region === BLOCK_REGION_NONE ? '' : $region), 'pages' => trim($form_state['values']['pages']), - 'status' => (int) ($region != BLOCK_REGION_NONE), + 'status' => (int) ($region !== BLOCK_REGION_NONE), )) ->execute(); } @@ -609,9 +609,9 @@ function block_add_block_form_submit($form, &$form_state) { db_merge('block') ->key(array('theme' => $theme, 'delta' => $delta, 'module' => $form_state['values']['module'])) ->fields(array( - 'region' => ($region == BLOCK_REGION_NONE ? '' : $region), + 'region' => ($region === BLOCK_REGION_NONE ? '' : $region), 'pages' => trim($form_state['values']['pages']), - 'status' => (int) ($region != BLOCK_REGION_NONE), + 'status' => (int) ($region !== BLOCK_REGION_NONE), )) ->execute(); } diff --git a/core/modules/block/block.api.php b/core/modules/block/block.api.php index a3d59b0..b220113 100644 --- a/core/modules/block/block.api.php +++ b/core/modules/block/block.api.php @@ -158,7 +158,7 @@ function hook_block_info_alter(&$blocks, $theme, $code_blocks) { function hook_block_configure($delta = '') { // This example comes from node.module. $form = array(); - if ($delta == 'recent') { + if ($delta === 'recent') { $form['node_recent_block_count'] = array( '#type' => 'select', '#title' => t('Number of recent content items to display'), @@ -188,7 +188,7 @@ function hook_block_configure($delta = '') { */ function hook_block_save($delta = '', $edit = array()) { // This example comes from node.module. - if ($delta == 'recent') { + if ($delta === 'recent') { variable_set('node_recent_block_count', $edit['node_recent_block_count']); } } @@ -276,7 +276,7 @@ function hook_block_view_alter(&$data, $block) { } // Add a theme wrapper function defined by the current module to all blocks // provided by the "somemodule" module. - if (is_array($data['content']) && $block->module == 'somemodule') { + if (is_array($data['content']) && $block->module === 'somemodule') { $data['content']['#theme_wrappers'][] = 'mymodule_special_block'; } } @@ -342,7 +342,7 @@ function hook_block_list_alter(&$blocks) { foreach ($blocks as $key => $block) { // Any module using this alter should inspect the data before changing it, // to ensure it is what they expect. - if (!isset($block->theme) || !isset($block->status) || $block->theme != $theme_key || $block->status != 1) { + if (!isset($block->theme) || !isset($block->status) || $block->theme !== $theme_key || $block->status !== 1) { // This block was added by a contrib module, leave it in the list. continue; } diff --git a/core/modules/block/block.js b/core/modules/block/block.js index 7dd3c9b..ec0e70b 100644 --- a/core/modules/block/block.js +++ b/core/modules/block/block.js @@ -8,7 +8,7 @@ Drupal.behaviors.blockSettingsSummary = { // The drupalSetSummary method required for this behavior is not available // on the Blocks administration page, so we need to make sure this // behavior is processed only if drupalSetSummary is defined. - if (typeof jQuery.fn.drupalSetSummary == 'undefined') { + if (typeof jQuery.fn.drupalSetSummary === 'undefined') { return; } @@ -46,7 +46,7 @@ Drupal.behaviors.blockSettingsSummary = { $context.find('fieldset#edit-user').drupalSetSummary(function (context) { var $radio = $(context).find('input[name="custom"]:checked'); - if ($radio.val() == 0) { + if ($radio.val() === 0) { return Drupal.t('Not customizable'); } else { @@ -65,7 +65,7 @@ Drupal.behaviors.blockSettingsSummary = { Drupal.behaviors.blockDrag = { attach: function (context, settings) { // tableDrag is required and we should be on the blocks admin page. - if (typeof Drupal.tableDrag == 'undefined' || typeof Drupal.tableDrag.blocks == 'undefined') { + if (typeof Drupal.tableDrag === 'undefined' || typeof Drupal.tableDrag.blocks === 'undefined') { return; } @@ -92,7 +92,7 @@ Drupal.behaviors.blockDrag = { var regionName = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); var regionField = $rowElement.find('select.block-region-select'); // Check whether the newly picked region is available for this block. - if (regionField.find('option[value=' + regionName + ']').length == 0) { + if (regionField.find('option[value=' + regionName + ']').length === 0) { // If not, alert the user and keep the block in its old region setting. alert(Drupal.t('The block cannot be placed in this region.')); // Simulate that there was a selected element change, so the row is put @@ -149,14 +149,14 @@ Drupal.behaviors.blockDrag = { table.find('tr.region-message').each(function () { var $this = $(this); // If the dragged row is in this region, but above the message row, swap it down one space. - if ($this.prev('tr').get(0) == rowObject.element) { + if ($this.prev('tr').get(0) === rowObject.element) { // Prevent a recursion problem when using the keyboard to move rows up. - if ((rowObject.method != 'keyboard' || rowObject.direction == 'down')) { + if ((rowObject.method !== 'keyboard' || rowObject.direction === 'down')) { rowObject.swap('after', this); } } // This region has become empty. - if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length == 0) { + if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) { $this.removeClass('region-populated').addClass('region-empty'); } // This region has become populated. diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 25bd3b1..791017f 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -62,7 +62,7 @@ function block_help($path, $arg) { case 'admin/structure/block/add': return '

      ' . t('Use this page to create a new custom block.') . '

      '; } - if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) { + if ($arg[0] === 'admin' && $arg[1] === 'structure' && $arg['2'] === 'block' && (empty($arg[3]) || $arg[3] === 'list')) { $demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'stark'); $themes = list_themes(); $output = '

      ' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page. Click the configure link next to each block to configure its specific title and visibility settings.') . '

      '; @@ -145,13 +145,13 @@ function block_menu() { $items['admin/structure/block/list/' . $key] = array( 'title' => check_plain($theme->info['name']), 'page arguments' => array($key), - 'type' => $key == $default_theme ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, - 'weight' => $key == $default_theme ? -10 : 0, + 'type' => $key === $default_theme ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, + 'weight' => $key === $default_theme ? -10 : 0, 'access callback' => '_block_themes_access', 'access arguments' => array($key), 'file' => 'block.admin.inc', ); - if ($key != $default_theme) { + if ($key !== $default_theme) { $items['admin/structure/block/list/' . $key . '/add'] = array( 'title' => 'Add block', 'page callback' => 'drupal_get_form', @@ -273,7 +273,7 @@ function block_page_build(&$page) { $all_regions = system_region_list($theme); $item = menu_get_item(); - if ($item['path'] != 'admin/structure/block/demo/' . $theme) { + if ($item['path'] !== 'admin/structure/block/demo/' . $theme) { // Load all region content assigned via blocks. foreach (array_keys($all_regions) as $region) { // Assign blocks to region. @@ -294,7 +294,7 @@ function block_page_build(&$page) { else { // Append region description if we are rendering the regions demo page. $item = menu_get_item(); - if ($item['path'] == 'admin/structure/block/demo/' . $theme) { + if ($item['path'] === 'admin/structure/block/demo/' . $theme) { $visible_regions = array_keys(system_region_list($theme, REGIONS_VISIBLE)); foreach ($visible_regions as $region) { $description = '
      ' . $all_regions[$region] . '
      '; @@ -306,7 +306,7 @@ function block_page_build(&$page) { $page['page_top']['backlink'] = array( '#type' => 'link', '#title' => t('Exit block region demonstration'), - '#href' => 'admin/structure/block' . (variable_get('theme_default', 'stark') == $theme ? '' : '/list/' . $theme), + '#href' => 'admin/structure/block' . (variable_get('theme_default', 'stark') === $theme ? '' : '/list/' . $theme), // Add the "overlay-restore" class to indicate this link should restore // the context in which the region demonstration page was opened. '#options' => array('attributes' => array('class' => array('block-demo-backlink', 'overlay-restore'))), @@ -351,7 +351,7 @@ function _block_get_renderable_region($list = array()) { // the regular 'roles define permissions' schema, it brings too many // chances of having unwanted output get in the cache and later be served // to other users. We therefore exclude user 1 from block caching. - $not_cacheable = $GLOBALS['user']->uid == 1 || + $not_cacheable = $GLOBALS['user']->uid === 1 || count(module_implements('node_grants')) || !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')); @@ -384,7 +384,7 @@ function _block_get_renderable_region($list = array()) { // skip the help block, since we assume that most users do not need or want // to perform contextual actions on the help block, and the links needlessly // draw attention on it. - if ($key != 'system_main' && $key != 'system_help') { + if ($key !== 'system_main' && $key !== 'system_help') { $build[$key]['#contextual_links']['block'] = array('admin/structure/block/manage', array($block->module, $block->delta)); } } @@ -468,7 +468,7 @@ function _block_rehash($theme = NULL) { if (!isset($block['weight'])) { $block['weight'] = 0; } - if (!empty($block['region']) && $block['region'] != BLOCK_REGION_NONE && !isset($regions[$block['region']])) { + if (!empty($block['region']) && $block['region'] !== BLOCK_REGION_NONE && !isset($regions[$block['region']])) { drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block['info'], '%region' => $block['region'])), 'warning'); // Disabled modules are moved into the BLOCK_REGION_NONE later so no // need to move the bock to another region. @@ -607,7 +607,7 @@ function block_form_user_profile_form_alter(&$form, &$form_state) { $blocks[$block->module][$block->delta] = array( '#type' => 'checkbox', '#title' => check_plain($data[$block->delta]['info']), - '#default_value' => isset($account->data['block'][$block->module][$block->delta]) ? $account->data['block'][$block->module][$block->delta] : ($block->custom == 1), + '#default_value' => isset($account->data['block'][$block->module][$block->delta]) ? $account->data['block'][$block->module][$block->delta] : ($block->custom === 1), ); } } @@ -786,7 +786,7 @@ function block_block_list_alter(&$blocks) { } foreach ($blocks as $key => $block) { - if (!isset($block->theme) || !isset($block->status) || $block->theme != $theme_key || $block->status != 1) { + if (!isset($block->theme) || !isset($block->status) || $block->theme !== $theme_key || $block->status !== 1) { // This block was added by a contrib module, leave it in the list. continue; } @@ -801,12 +801,12 @@ function block_block_list_alter(&$blocks) { } // Use the user's block visibility setting, if necessary. - if ($block->custom != BLOCK_CUSTOM_FIXED) { + if ($block->custom !== BLOCK_CUSTOM_FIXED) { if ($user->uid && isset($user->data['block'][$block->module][$block->delta])) { $enabled = $user->data['block'][$block->module][$block->delta]; } else { - $enabled = ($block->custom == BLOCK_CUSTOM_ENABLED); + $enabled = ($block->custom === BLOCK_CUSTOM_ENABLED); } } else { @@ -814,7 +814,7 @@ function block_block_list_alter(&$blocks) { } // Limited visibility blocks must list at least one page. - if ($block->visibility == BLOCK_VISIBILITY_LISTED && empty($block->pages)) { + if ($block->visibility === BLOCK_VISIBILITY_LISTED && empty($block->pages)) { $enabled = FALSE; } @@ -833,7 +833,7 @@ function block_block_list_alter(&$blocks) { $path = drupal_strtolower(drupal_get_path_alias($_GET['q'])); // Compare the lowercase internal and lowercase path alias (if any). $page_match = drupal_match_path($path, $pages); - if ($path != $_GET['q']) { + if ($path !== $_GET['q']) { $page_match = $page_match || drupal_match_path($_GET['q'], $pages); } // When $block->visibility has a value of 0 (BLOCK_VISIBILITY_NOTLISTED), @@ -903,7 +903,7 @@ function _block_get_renderable_block($element) { if ($block->title) { // Check plain here to allow module generated titles to keep any // markup. - $block->subject = $block->title == '' ? '' : check_plain($block->title); + $block->subject = $block->title === '' ? '' : check_plain($block->title); } // Add the content renderable array to the main element. diff --git a/core/modules/block/block.test b/core/modules/block/block.test index 4af6240..ca6809e 100644 --- a/core/modules/block/block.test +++ b/core/modules/block/block.test @@ -695,7 +695,7 @@ class BlockCacheTestCase extends DrupalWebTestCase { ->execute(); $current_mode = db_query("SELECT cache FROM {block} WHERE module = 'block_test'")->fetchField(); - if ($current_mode != $cache_mode) { + if ($current_mode !== $cache_mode) { $this->fail(t('Unable to set cache mode to %mode. Current mode: %current_mode', array('%mode' => $cache_mode, '%current_mode' => $current_mode))); } } diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc index 265b381..2448c6e 100644 --- a/core/modules/book/book.admin.inc +++ b/core/modules/book/book.admin.inc @@ -94,7 +94,7 @@ function book_admin_edit($form, $form_state, $node) { * @see book_admin_edit_submit() */ function book_admin_edit_validate($form, &$form_state) { - if ($form_state['values']['tree_hash'] != $form_state['values']['tree_current_hash']) { + if ($form_state['values']['tree_hash'] !== $form_state['values']['tree_current_hash']) { form_set_error('', t('This book has been modified by another user, the changes could not be saved.')); } } @@ -120,14 +120,14 @@ function book_admin_edit_submit($form, &$form_state) { $values = $form_state['values']['table'][$key]; // Update menu item if moved. - if ($row['plid']['#default_value'] != $values['plid'] || $row['weight']['#default_value'] != $values['weight']) { + if ($row['plid']['#default_value'] !== $values['plid'] || $row['weight']['#default_value'] !== $values['weight']) { $row['#item']['plid'] = $values['plid']; $row['#item']['weight'] = $values['weight']; menu_link_save($row['#item']); } // Update the title if changed. - if ($row['title']['#default_value'] != $values['title']) { + if ($row['title']['#default_value'] !== $values['title']) { $node = node_load($values['nid']); $langcode = LANGUAGE_NOT_SPECIFIED; $node->title = $values['title']; diff --git a/core/modules/book/book.module b/core/modules/book/book.module index a29a331..92e49ab 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -95,9 +95,9 @@ function book_node_view_link($node, $view_mode) { $links = array(); if (isset($node->book['depth'])) { - if ($view_mode == 'full' && node_is_page($node)) { + if ($view_mode === 'full' && node_is_page($node)) { $child_type = variable_get('book_child_type', 'book'); - if ((user_access('add content to books') || user_access('administer book outlines')) && node_access('create', $child_type) && $node->status == 1 && $node->book['depth'] < MENU_MAX_DEPTH) { + if ((user_access('add content to books') || user_access('administer book outlines')) && node_access('create', $child_type) && $node->status === 1 && $node->book['depth'] < MENU_MAX_DEPTH) { $links['book_add_child'] = array( 'title' => t('Add child page'), 'href' => 'node/add/' . str_replace('_', '-', $child_type), @@ -229,7 +229,7 @@ function _book_outline_remove_access($node) { * is not a top-level page or is a top-level page with no children. */ function _book_node_is_removable($node) { - return (!empty($node->book['bid']) && (($node->book['bid'] != $node->nid) || !$node->book['has_children'])); + return (!empty($node->book['bid']) && (($node->book['bid'] !== $node->nid) || !$node->book['has_children'])); } /** @@ -282,12 +282,12 @@ function book_block_view($delta = '') { $current_bid = empty($node->book['bid']) ? 0 : $node->book['bid']; } - if (variable_get('book_block_mode', 'all pages') == 'all pages') { + if (variable_get('book_block_mode', 'all pages') === 'all pages') { $block['subject'] = t('Book navigation'); $book_menus = array(); $pseudo_tree = array(0 => array('below' => FALSE)); foreach (book_get_books() as $book_id => $book) { - if ($book['bid'] == $current_bid) { + if ($book['bid'] === $current_bid) { // If the current page is a node associated with a book, the menu // needs to be retrieved. $book_menus[$book_id] = menu_tree_output(menu_tree_all_data($node->book['menu_name'], $node->book)); @@ -567,7 +567,7 @@ function _book_add_form_elements(&$form, &$form_state, $node) { $options = array(); $nid = isset($node->nid) ? $node->nid : 'new'; - if (isset($node->nid) && ($nid == $node->book['original_bid']) && ($node->book['parent_depth_limit'] == 0)) { + if (isset($node->nid) && ($nid === $node->book['original_bid']) && ($node->book['parent_depth_limit'] === 0)) { // This is the top level node in a maximum depth book and thus cannot be moved. $options[$node->nid] = $node->title; } @@ -577,7 +577,7 @@ function _book_add_form_elements(&$form, &$form_state, $node) { } } - if (user_access('create new books') && ($nid == 'new' || ($nid != $node->book['original_bid']))) { + if (user_access('create new books') && ($nid === 'new' || ($nid !== $node->book['original_bid']))) { // The node can become a new book, if it is not one already. $options = array($nid => '<' . t('create a new book') . '>') + $options; } @@ -641,7 +641,7 @@ function _book_update_outline($node) { $node->book['link_title'] = $node->title; $node->book['parent_mismatch'] = FALSE; // The normal case. - if ($node->book['bid'] == $node->nid) { + if ($node->book['bid'] === $node->nid) { $node->book['plid'] = 0; $node->book['menu_name'] = book_menu_name($node->nid); } @@ -652,7 +652,7 @@ function _book_update_outline($node) { ':mlid' => $node->book['plid'], ))->fetchAssoc(); } - if (empty($node->book['plid']) || !$parent || $parent['bid'] != $node->book['bid']) { + if (empty($node->book['plid']) || !$parent || $parent['bid'] !== $node->book['bid']) { $node->book['plid'] = db_query("SELECT mlid FROM {book} WHERE nid = :nid", array( ':nid' => $node->book['bid'], ))->fetchField(); @@ -674,7 +674,7 @@ function _book_update_outline($node) { drupal_static_reset('book_get_books'); } else { - if ($node->book['bid'] != db_query("SELECT bid FROM {book} WHERE nid = :nid", array( + if ($node->book['bid'] !== db_query("SELECT bid FROM {book} WHERE nid = :nid", array( ':nid' => $node->nid, ))->fetchField()) { // Update the bid for this page and all children. @@ -772,7 +772,7 @@ function _book_flatten_menu($tree, &$flat) { */ function book_prev($book_link) { // If the parent is zero, we are at the start of a book. - if ($book_link['plid'] == 0) { + if ($book_link['plid'] === 0) { return NULL; } $flat = book_get_flat_menu($book_link); @@ -781,11 +781,11 @@ function book_prev($book_link) { do { $prev = $curr; list($key, $curr) = each($flat); - } while ($key && $key != $book_link['mlid']); + } while ($key && $key !== $book_link['mlid']); - if ($key == $book_link['mlid']) { + if ($key === $book_link['mlid']) { // The previous page in the book may be a child of the previous visible link. - if ($prev['depth'] == $book_link['depth'] && $prev['has_children']) { + if ($prev['depth'] === $book_link['depth'] && $prev['has_children']) { // The subtree will have only one link at the top level - get its data. $tree = book_menu_subtree_data($prev); $data = array_shift($tree); @@ -818,9 +818,9 @@ function book_next($book_link) { do { list($key, $curr) = each($flat); } - while ($key && $key != $book_link['mlid']); + while ($key && $key !== $book_link['mlid']); - if ($key == $book_link['mlid']) { + if ($key === $book_link['mlid']) { return current($flat); } } @@ -844,9 +844,9 @@ function book_children($book_link) { do { $link = array_shift($flat); } - while ($link && ($link['mlid'] != $book_link['mlid'])); + while ($link && ($link['mlid'] !== $book_link['mlid'])); // Continue though the array and collect the links whose parent is this page. - while (($link = array_shift($flat)) && $link['plid'] == $book_link['mlid']) { + while (($link = array_shift($flat)) && $link['plid'] === $book_link['mlid']) { $data['link'] = $link; $data['below'] = ''; $children[] = $data; @@ -890,7 +890,7 @@ function book_node_load($nodes, $types) { * Implements hook_node_view(). */ function book_node_view($node, $view_mode) { - if ($view_mode == 'full') { + if ($view_mode === 'full') { if (!empty($node->book['bid']) && empty($node->in_preview)) { $node->content['book_navigation'] = array( '#markup' => theme('book_navigation', array('book_link' => $node->book)), @@ -899,7 +899,7 @@ function book_node_view($node, $view_mode) { } } - if ($view_mode != 'rss') { + if ($view_mode !== 'rss') { book_node_view_link($node, $view_mode); } } @@ -941,7 +941,7 @@ function book_node_presave($node) { */ function book_node_insert($node) { if (!empty($node->book['bid'])) { - if ($node->book['bid'] == 'new') { + if ($node->book['bid'] === 'new') { // New nodes that are their own book. $node->book['bid'] = $node->nid; } @@ -956,7 +956,7 @@ function book_node_insert($node) { */ function book_node_update($node) { if (!empty($node->book['bid'])) { - if ($node->book['bid'] == 'new') { + if ($node->book['bid'] === 'new') { // New nodes that are their own book. $node->book['bid'] = $node->nid; } @@ -971,7 +971,7 @@ function book_node_update($node) { */ function book_node_predelete($node) { if (!empty($node->book['bid'])) { - if ($node->nid == $node->book['bid']) { + if ($node->nid === $node->book['bid']) { // Handle deletion of a top-level post. $result = db_query("SELECT b.nid FROM {menu_links} ml INNER JOIN {book} b on b.mlid = ml.mlid WHERE ml.plid = :plid", array( ':plid' => $node->book['mlid'] @@ -1070,7 +1070,7 @@ function _book_link_defaults($nid) { * Implements hook_preprocess_block(). */ function book_preprocess_block(&$variables) { - if ($variables['block']-> module == 'book') { + if ($variables['block']-> module === 'book') { $variables['attributes_array']['role'] = 'navigation'; } } @@ -1231,7 +1231,7 @@ function template_preprocess_book_export_html(&$variables) { $variables['title'] = check_plain($variables['title']); $variables['base_url'] = $base_url; $variables['language'] = $language_interface; - $variables['language_rtl'] = ($language_interface->direction == LANGUAGE_RTL); + $variables['language_rtl'] = ($language_interface->direction === LANGUAGE_RTL); $variables['head'] = drupal_get_html_head(); // HTML element attributes. @@ -1339,7 +1339,7 @@ function book_type_is_allowed($type) { * of a node type is changed. */ function book_node_type_update($type) { - if (!empty($type->old_type) && $type->old_type != $type->type) { + if (!empty($type->old_type) && $type->old_type !== $type->type) { // Update the list of node types that are allowed to be added to books. $allowed_types = variable_get('book_allowed_types', array('book')); $key = array_search($type->old_type, $allowed_types); @@ -1351,7 +1351,7 @@ function book_node_type_update($type) { } // Update the setting for the "Add child page" link. - if (variable_get('book_child_type', 'book') == $type->old_type) { + if (variable_get('book_child_type', 'book') === $type->old_type) { variable_set('book_child_type', $type->type); } } diff --git a/core/modules/color/color.install b/core/modules/color/color.install index a1879f9..b4a5324 100644 --- a/core/modules/color/color.install +++ b/core/modules/color/color.install @@ -11,7 +11,7 @@ function color_requirements($phase) { $requirements = array(); - if ($phase == 'runtime') { + if ($phase === 'runtime') { // Check for the PHP GD library. if (function_exists('imagegd2')) { $info = gd_info(); diff --git a/core/modules/color/color.js b/core/modules/color/color.js index 6ed789a..0bac3c5 100644 --- a/core/modules/color/color.js +++ b/core/modules/color/color.js @@ -10,7 +10,7 @@ Drupal.behaviors.color = { var i, j, colors, field_name; // This behavior attaches by ID, so is only valid once on a page. var form = $(context).find('#system-theme-settings .color-form').once('color'); - if (form.length == 0) { + if (form.length === 0) { return; } var inputs = []; @@ -43,7 +43,7 @@ Drupal.behaviors.color = { // Add rows (or columns for horizontal gradients). // Each gradient line should have a height (or width for horizontal // gradients) of 10px (because we divided the height/width by 10 above). - for (j = 0; j < (settings.gradients[i]['direction'] == 'vertical' ? height[i] : width[i]); ++j) { + for (j = 0; j < (settings.gradients[i]['direction'] === 'vertical' ? height[i] : width[i]); ++j) { gradient.append('
      '); } } @@ -51,7 +51,7 @@ Drupal.behaviors.color = { // Set up colorScheme selector. form.find('#edit-scheme').change(function () { var schemes = settings.color.schemes, colorScheme = this.options[this.selectedIndex].value; - if (colorScheme != '' && schemes[colorScheme]) { + if (colorScheme !== '' && schemes[colorScheme]) { // Get colors of active scheme. colors = schemes[colorScheme]; for (field_name in colors) { @@ -74,8 +74,8 @@ Drupal.behaviors.color = { * This algorithm ensures relative ordering on the saturation and luminance * axes is preserved, and performs a simple hue shift. * - * It is also symmetrical. If: shift_color(c, a, b) == d, then - * shift_color(d, b, a) == c. + * It is also symmetrical. If: shift_color(c, a, b) === d, then + * shift_color(d, b, a) === c. */ function shift_color(given, ref1, ref2) { // Convert to HSL. @@ -85,7 +85,7 @@ Drupal.behaviors.color = { given[0] += ref2[0] - ref1[0]; // Saturation: interpolate. - if (ref1[1] == 0 || ref2[1] == 0) { + if (ref1[1] === 0 || ref2[1] === 0) { given[1] = ref2[1]; } else { @@ -99,7 +99,7 @@ Drupal.behaviors.color = { } // Luminance: interpolate. - if (ref1[2] == 0 || ref2[2] == 0) { + if (ref1[2] === 0 || ref2[2] === 0) { given[2] = ref2[2]; } else { @@ -127,7 +127,7 @@ Drupal.behaviors.color = { }); // Change input value. - if ($(input).val() && $(input).val() != color) { + if ($(input).val() && $(input).val() !== color) { $(input).val(color); // Update locked values. diff --git a/core/modules/color/color.module b/core/modules/color/color.module index b22a282..00ae321 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -74,7 +74,7 @@ function _color_html_alter(&$vars) { foreach ($color_paths as $color_path) { // Color module currently requires unique file names to be used, // which allows us to compare different file paths. - if (drupal_basename($old_path) == drupal_basename($color_path)) { + if (drupal_basename($old_path) === drupal_basename($color_path)) { // Replace the path to the new css file. // This keeps the order of the stylesheets intact. $vars['css'][$old_path]['data'] = $color_path; @@ -163,7 +163,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) { // Note: we use the original theme when the default scheme is chosen. $current_scheme = variable_get('color_' . $theme . '_palette', array()); foreach ($schemes as $key => $scheme) { - if ($current_scheme == $scheme) { + if ($current_scheme === $scheme) { $scheme_name = $key; break; } @@ -301,7 +301,7 @@ function color_scheme_form_submit($form, &$form_state) { // Resolve palette. $palette = $form_state['values']['palette']; - if ($form_state['values']['scheme'] != '') { + if ($form_state['values']['scheme'] !== '') { foreach ($palette as $key => $color) { if (isset($info['schemes'][$form_state['values']['scheme']]['colors'][$key])) { $palette[$key] = $info['schemes'][$form_state['values']['scheme']]['colors'][$key]; @@ -340,7 +340,7 @@ function color_scheme_form_submit($form, &$form_state) { } // Don't render the default colorscheme, use the standard theme instead. - if (implode(',', color_get_palette($theme, TRUE)) == implode(',', $palette)) { + if (implode(',', color_get_palette($theme, TRUE)) === implode(',', $palette)) { variable_del('color_' . $theme . '_palette'); variable_del('color_' . $theme . '_stylesheets'); variable_del('color_' . $theme . '_logo'); @@ -524,7 +524,7 @@ function _color_render_images($theme, &$info, &$paths, $palette) { // Render gradients. foreach ($info['gradients'] as $gradient) { // Get direction of the gradient. - if (isset($gradient['direction']) && $gradient['direction'] == 'horizontal') { + if (isset($gradient['direction']) && $gradient['direction'] === 'horizontal') { // Horizontal gradient. for ($x = 0; $x < $gradient['dimension'][2]; $x++) { $color = _color_blend($target, $palette[$gradient['colors'][0]], $palette[$gradient['colors'][1]], $x / ($gradient['dimension'][2] - 1)); @@ -553,7 +553,7 @@ function _color_render_images($theme, &$info, &$paths, $palette) { $image = drupal_realpath($paths['target'] . $base); // Cut out slice. - if ($file == 'screenshot.png') { + if ($file === 'screenshot.png') { $slice = imagecreatetruecolor(150, 90); imagecopyresampled($slice, $target, 0, 0, $x, $y, 150, 90, $width, $height); variable_set('color_' . $theme . '_screenshot', $image); @@ -585,8 +585,8 @@ function _color_render_images($theme, &$info, &$paths, $palette) { * Note: this function is significantly different from the JS version, as it * is written to match the blended images perfectly. * - * Constraint: if (ref2 == target + (ref1 - target) * delta) for some fraction - * delta then (return == target + (given - target) * delta). + * Constraint: if (ref2 === target + (ref1 - target) * delta) for some fraction + * delta then (return === target + (given - target) * delta). * * Loose constraint: Preserve relative positions in saturation and luminance * space. @@ -664,7 +664,7 @@ function _color_blend($img, $hex1, $hex2, $alpha) { * Converts a hex color into an RGB triplet. */ function _color_unpack($hex, $normalize = FALSE) { - if (strlen($hex) == 4) { + if (strlen($hex) === 4) { $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3]; } $c = hexdec($hex); @@ -735,9 +735,9 @@ function _color_rgb2hsl($rgb) { $h = 0; if ($delta > 0) { - if ($max == $r && $max != $g) $h += ($g - $b) / $delta; - if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta); - if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta); + if ($max === $r && $max !== $g) $h += ($g - $b) / $delta; + if ($max === $g && $max !== $b) $h += (2 + ($b - $r) / $delta); + if ($max === $b && $max !== $r) $h += (4 + ($r - $g) / $delta); $h /= 6; } diff --git a/core/modules/comment/comment-wrapper.tpl.php b/core/modules/comment/comment-wrapper.tpl.php index 5e58a67..db16e0f 100644 --- a/core/modules/comment/comment-wrapper.tpl.php +++ b/core/modules/comment/comment-wrapper.tpl.php @@ -36,7 +36,7 @@ */ ?>
      > - type != 'forum'): ?> + type !== 'forum'): ?>

      diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc index c0f92d9..c05f212 100644 --- a/core/modules/comment/comment.admin.inc +++ b/core/modules/comment/comment.admin.inc @@ -18,7 +18,7 @@ function comment_admin($type = 'new') { $edit = $_POST; - if (isset($edit['operation']) && ($edit['operation'] == 'delete') && isset($edit['comments']) && $edit['comments']) { + if (isset($edit['operation']) && ($edit['operation'] === 'delete') && isset($edit['comments']) && $edit['comments']) { return drupal_get_form('comment_multiple_delete_confirm'); } else { @@ -46,7 +46,7 @@ function comment_admin_overview($form, &$form_state, $arg) { '#attributes' => array('class' => array('container-inline')), ); - if ($arg == 'approval') { + if ($arg === 'approval') { $options['publish'] = t('Publish the selected comments'); } else { @@ -67,7 +67,7 @@ function comment_admin_overview($form, &$form_state, $arg) { ); // Load the comments that need to be displayed. - $status = ($arg == 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED; + $status = ($arg === 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED; $header = array( 'subject' => array('data' => t('Subject'), 'field' => 'subject'), 'author' => array('data' => t('Author'), 'field' => 'name'), @@ -154,7 +154,7 @@ function comment_admin_overview($form, &$form_state, $arg) { function comment_admin_overview_validate($form, &$form_state) { $form_state['values']['comments'] = array_diff($form_state['values']['comments'], array(0)); // We can't execute any 'Update options' if no comments were selected. - if (count($form_state['values']['comments']) == 0) { + if (count($form_state['values']['comments']) === 0) { form_set_error('', t('Select one or more comments to perform the update on.')); } } @@ -171,17 +171,17 @@ function comment_admin_overview_submit($form, &$form_state) { $operation = $form_state['values']['operation']; $cids = $form_state['values']['comments']; - if ($operation == 'delete') { + if ($operation === 'delete') { comment_delete_multiple($cids); } else { foreach ($cids as $cid => $value) { $comment = comment_load($value); - if ($operation == 'unpublish') { + if ($operation === 'unpublish') { $comment->status = COMMENT_NOT_PUBLISHED; } - elseif ($operation == 'publish') { + elseif ($operation === 'publish') { $comment->status = COMMENT_PUBLISHED; } comment_save($comment); diff --git a/core/modules/comment/comment.api.php b/core/modules/comment/comment.api.php index f270aad..007885f 100644 --- a/core/modules/comment/comment.api.php +++ b/core/modules/comment/comment.api.php @@ -96,7 +96,7 @@ function hook_comment_view($comment, $view_mode, $langcode) { */ function hook_comment_view_alter(&$build) { // Check for the existence of a field added by another module. - if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) { + if ($build['#view_mode'] === 'full' && isset($build['an_additional_field'])) { // Change its weight. $build['an_additional_field']['#weight'] = -10; } diff --git a/core/modules/comment/comment.entity.inc b/core/modules/comment/comment.entity.inc index cb4d6d6..45919d3 100644 --- a/core/modules/comment/comment.entity.inc +++ b/core/modules/comment/comment.entity.inc @@ -148,7 +148,7 @@ class CommentStorageController extends EntityDatabaseStorageController { // Allow calling code to set thread itself. $thread = $comment->thread; } - elseif ($comment->pid == 0) { + elseif ($comment->pid === 0) { // This is a comment with no parent comment (depth 0): we start // by retrieving the maximum thread level. $max = db_query('SELECT MAX(thread) FROM {comment} WHERE nid = :nid', array(':nid' => $comment->nid))->fetchField(); @@ -174,7 +174,7 @@ class CommentStorageController extends EntityDatabaseStorageController { ':nid' => $comment->nid, ))->fetchField(); - if ($max == '') { + if ($max === '') { // First child of this parent. $thread = $parent->thread . '.' . comment_int_to_alphadecimal(0) . '/'; } @@ -212,7 +212,7 @@ class CommentStorageController extends EntityDatabaseStorageController { protected function postSave(EntityInterface $comment, $update) { // Update the {node_comment_statistics} table prior to executing the hook. $this->updateNodeStatistics($comment->nid); - if ($comment->status == COMMENT_PUBLISHED) { + if ($comment->status === COMMENT_PUBLISHED) { module_invoke_all('comment_publish', $comment); } } diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 1a3580f..1f76585 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -178,7 +178,7 @@ function comment_field_extra_fields() { $return = array(); foreach (node_type_get_types() as $type) { - if (variable_get('comment_subject_field_' . $type->type, 1) == 1) { + if (variable_get('comment_subject_field_' . $type->type, 1) === 1) { $return['comment']['comment_node_' . $type->type] = array( 'form' => array( 'author' => array( @@ -342,7 +342,7 @@ function comment_node_type_insert($info) { * Implements hook_node_type_update(). */ function comment_node_type_update($info) { - if (!empty($info->old_type) && $info->type != $info->old_type) { + if (!empty($info->old_type) && $info->type !== $info->old_type) { field_attach_rename_bundle('comment', 'comment_node_' . $info->old_type, 'comment_node_' . $info->type); } } @@ -555,7 +555,7 @@ function comment_new_page_count($num_comments, $new_replies, $node) { $mode = variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED); $comments_per_page = variable_get('comment_default_per_page_' . $node->type, 50); $pagenum = NULL; - $flat = $mode == COMMENT_MODE_FLAT ? TRUE : FALSE; + $flat = $mode === COMMENT_MODE_FLAT ? TRUE : FALSE; if ($num_comments <= $comments_per_page) { // Only one page of comments. $pageno = 0; @@ -632,15 +632,15 @@ function theme_comment_block() { function comment_node_view($node, $view_mode) { $links = array(); - if ($node->comment != COMMENT_NODE_HIDDEN) { - if ($view_mode == 'rss') { + if ($node->comment !== COMMENT_NODE_HIDDEN) { + if ($view_mode === 'rss') { // Add a comments RSS element which is a URL to the comments of this node. $node->rss_elements[] = array( 'key' => 'comments', 'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE)) ); } - elseif ($view_mode == 'teaser') { + elseif ($view_mode === 'teaser') { // Teaser view: display the number of comments that have been posted, // or a link to add new comments if the user has permission, the node // is open to new comments, and there currently are none. @@ -666,7 +666,7 @@ function comment_node_view($node, $view_mode) { } } } - if ($node->comment == COMMENT_NODE_OPEN) { + if ($node->comment === COMMENT_NODE_OPEN) { $comment_form_location = variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW); if (user_access('post comments')) { $links['comment-add'] = array( @@ -675,7 +675,7 @@ function comment_node_view($node, $view_mode) { 'attributes' => array('title' => t('Add a new comment to this page.')), 'fragment' => 'comment-form', ); - if ($comment_form_location == COMMENT_FORM_SEPARATE_PAGE) { + if ($comment_form_location === COMMENT_FORM_SEPARATE_PAGE) { $links['comment-add']['href'] = "comment/reply/$node->nid"; } } @@ -687,24 +687,24 @@ function comment_node_view($node, $view_mode) { } } } - elseif ($view_mode != 'search_index' && $view_mode != 'search_result') { + elseif ($view_mode !== 'search_index' && $view_mode !== 'search_result') { // Node in other view modes: add a "post comment" link if the user is // allowed to post comments and if this node is allowing new comments. // But we don't want this link if we're building the node for search // indexing or constructing a search result excerpt. - if ($node->comment == COMMENT_NODE_OPEN) { + if ($node->comment === COMMENT_NODE_OPEN) { $comment_form_location = variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW); if (user_access('post comments')) { // Show the "post comment" link if the form is on another page, or // if there are existing comments that the link will skip past. - if ($comment_form_location == COMMENT_FORM_SEPARATE_PAGE || (!empty($node->comment_count) && user_access('access comments'))) { + if ($comment_form_location === COMMENT_FORM_SEPARATE_PAGE || (!empty($node->comment_count) && user_access('access comments'))) { $links['comment-add'] = array( 'title' => t('Add new comment'), 'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')), 'href' => "node/$node->nid", 'fragment' => 'comment-form', ); - if ($comment_form_location == COMMENT_FORM_SEPARATE_PAGE) { + if ($comment_form_location === COMMENT_FORM_SEPARATE_PAGE) { $links['comment-add']['href'] = "comment/reply/$node->nid"; } } @@ -728,7 +728,7 @@ function comment_node_view($node, $view_mode) { // page. We compare $node and $page_node to ensure that comments are not // appended to other nodes shown on the page, for example a node_reference // displayed in 'full' view mode within another node. - if ($node->comment && $view_mode == 'full' && node_is_page($node) && empty($node->in_preview)) { + if ($node->comment && $view_mode === 'full' && node_is_page($node) && empty($node->in_preview)) { $node->content['comments'] = comment_node_page_additions($node); } } @@ -763,7 +763,7 @@ function comment_node_page_additions($node) { } // Append comment form if needed. - if (user_access('post comments') && $node->comment == COMMENT_NODE_OPEN && (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) == COMMENT_FORM_BELOW)) { + if (user_access('post comments') && $node->comment === COMMENT_NODE_OPEN && (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) === COMMENT_FORM_BELOW)) { $comment = entity_create('comment', array('nid' => $node->nid)); $additions['comment_form'] = drupal_get_form("comment_node_{$node->type}_form", $comment); } @@ -904,7 +904,7 @@ function comment_prepare_thread(&$comments) { $divs = 0; foreach ($comments as $key => $comment) { - if ($first_new && $comment->new != MARK_READ) { + if ($first_new && $comment->new !== MARK_READ) { // Assign the anchor only for the first new comment. This avoids duplicate // id attributes on a page. $first_new = FALSE; @@ -969,7 +969,7 @@ function comment_view($comment, $node, $view_mode = 'full', $langcode = NULL) { if (empty($comment->in_preview)) { $prefix = ''; - $is_threaded = isset($comment->divs) && variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED) == COMMENT_MODE_THREADED; + $is_threaded = isset($comment->divs) && variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED) === COMMENT_MODE_THREADED; // Add 'new' anchor if needed. if (!empty($comment->first_new)) { @@ -1058,7 +1058,7 @@ function comment_build_content($comment, $node, $view_mode = 'full', $langcode = */ function comment_links($comment, $node) { $links = array(); - if ($node->comment == COMMENT_NODE_OPEN) { + if ($node->comment === COMMENT_NODE_OPEN) { if (user_access('administer comments') && user_access('post comments')) { $links['comment-delete'] = array( 'title' => t('delete'), @@ -1075,7 +1075,7 @@ function comment_links($comment, $node) { 'href' => "comment/reply/$comment->nid/$comment->cid", 'html' => TRUE, ); - if ($comment->status == COMMENT_NOT_PUBLISHED) { + if ($comment->status === COMMENT_NOT_PUBLISHED) { $links['comment-approve'] = array( 'title' => t('approve'), 'href' => "comment/$comment->cid/approve", @@ -1239,7 +1239,7 @@ function comment_form_node_form_alter(&$form, $form_state) { '#weight' => 30, ); $comment_count = isset($node->nid) ? db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array(':nid' => $node->nid))->fetchField() : 0; - $comment_settings = ($node->comment == COMMENT_NODE_HIDDEN && empty($comment_count)) ? COMMENT_NODE_CLOSED : $node->comment; + $comment_settings = ($node->comment === COMMENT_NODE_HIDDEN && empty($comment_count)) ? COMMENT_NODE_CLOSED : $node->comment; $form['comment_settings']['comment'] = array( '#type' => 'radios', '#title' => t('Comments'), @@ -1280,7 +1280,7 @@ function comment_node_load($nodes, $types) { // assign values without hitting the database. foreach ($nodes as $node) { // Store whether comments are enabled for this node. - if ($node->comment != COMMENT_NODE_HIDDEN) { + if ($node->comment !== COMMENT_NODE_HIDDEN) { $comments_enabled[] = $node->nid; } else { @@ -1399,11 +1399,11 @@ function comment_update_index() { */ function comment_node_search_result($node) { // Do not make a string if comments are hidden. - if (user_access('access comments') && $node->comment != COMMENT_NODE_HIDDEN) { + if (user_access('access comments') && $node->comment !== COMMENT_NODE_HIDDEN) { $comments = db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array('nid' => $node->nid))->fetchField(); // Do not make a string if comments are closed and there are currently // zero comments. - if ($node->comment != COMMENT_NODE_CLOSED || $comments > 0) { + if ($node->comment !== COMMENT_NODE_CLOSED || $comments > 0) { return array('comment' => format_plural($comments, '1 comment', '@count comments')); } } @@ -1459,8 +1459,8 @@ function comment_user_predelete($account) { function comment_access($op, $comment) { global $user; - if ($op == 'edit') { - return ($user->uid && $user->uid == $comment->uid && $comment->status == COMMENT_PUBLISHED && user_access('edit own comments')) || user_access('administer comments'); + if ($op === 'edit') { + return ($user->uid && $user->uid === $comment->uid && $comment->status === COMMENT_PUBLISHED && user_access('edit own comments')) || user_access('administer comments'); } } @@ -1604,7 +1604,7 @@ function comment_get_display_ordinal($cid, $node_type) { } $mode = variable_get('comment_default_mode_' . $node_type, COMMENT_MODE_THREADED); - if ($mode == COMMENT_MODE_FLAT) { + if ($mode === COMMENT_MODE_FLAT) { // For flat comments, cid is used for ordering comments due to // unpredicatable behavior with timestamp, so we make the same assumption // here. @@ -1696,7 +1696,7 @@ function comment_form($form, &$form_state, $comment) { $anonymous_contact = variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT); $is_admin = (!empty($comment->cid) && user_access('administer comments')); - if (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT) { + if (!$user->uid && $anonymous_contact !== COMMENT_ANONYMOUS_MAYNOT_CONTACT) { $form['#attached']['library'][] = array('system', 'jquery.cookie'); $form['#attributes']['class'][] = 'user-info-from-cookie'; } @@ -1773,7 +1773,7 @@ function comment_form($form, &$form_state, $comment) { '#type' => 'textfield', '#title' => t('Your name'), '#default_value' => $author, - '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT), + '#required' => (!$user->uid && $anonymous_contact === COMMENT_ANONYMOUS_MUST_CONTACT), '#maxlength' => 60, '#size' => 30, ); @@ -1784,11 +1784,11 @@ function comment_form($form, &$form_state, $comment) { '#type' => 'email', '#title' => t('E-mail'), '#default_value' => $comment->mail, - '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT), + '#required' => (!$user->uid && $anonymous_contact === COMMENT_ANONYMOUS_MUST_CONTACT), '#maxlength' => 64, '#size' => 30, '#description' => t('The content of this field is kept private and will not be shown publicly.'), - '#access' => $is_admin || (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT), + '#access' => $is_admin || (!$user->uid && $anonymous_contact !== COMMENT_ANONYMOUS_MAYNOT_CONTACT), ); $form['author']['homepage'] = array( '#type' => 'url', @@ -1796,7 +1796,7 @@ function comment_form($form, &$form_state, $comment) { '#default_value' => $comment->homepage, '#maxlength' => 255, '#size' => 30, - '#access' => $is_admin || (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT), + '#access' => $is_admin || (!$user->uid && $anonymous_contact !== COMMENT_ANONYMOUS_MAYNOT_CONTACT), ); // Add administrative comment publishing options. @@ -1824,7 +1824,7 @@ function comment_form($form, &$form_state, $comment) { '#title' => t('Subject'), '#maxlength' => 64, '#default_value' => $comment->subject, - '#access' => variable_get('comment_subject_field_' . $node->type, 1) == 1, + '#access' => variable_get('comment_subject_field_' . $node->type, 1) === 1, '#weight' => -1, ); @@ -1843,7 +1843,7 @@ function comment_form($form, &$form_state, $comment) { // If a content type has multilingual support we set the comment to inherit the // content language. Otherwise mark the comment as language neutral. $comment_langcode = $comment->langcode; - if (($comment_langcode == LANGUAGE_NOT_SPECIFIED) && variable_get('node_type_language_' . $node->type, 0)) { + if (($comment_langcode === LANGUAGE_NOT_SPECIFIED) && variable_get('node_type_language_' . $node->type, 0)) { $comment_langcode = $language_content->langcode; } $form['langcode'] = array( @@ -1857,13 +1857,13 @@ function comment_form($form, &$form_state, $comment) { $form['actions']['submit'] = array( '#type' => 'submit', '#value' => t('Save'), - '#access' => ($comment->cid && user_access('administer comments')) || variable_get('comment_preview_' . $node->type, DRUPAL_OPTIONAL) != DRUPAL_REQUIRED || isset($form_state['comment_preview']), + '#access' => ($comment->cid && user_access('administer comments')) || variable_get('comment_preview_' . $node->type, DRUPAL_OPTIONAL) !== DRUPAL_REQUIRED || isset($form_state['comment_preview']), '#weight' => 19, ); $form['actions']['preview'] = array( '#type' => 'submit', '#value' => t('Preview'), - '#access' => (variable_get('comment_preview_' . $node->type, DRUPAL_OPTIONAL) != DRUPAL_DISABLED), + '#access' => (variable_get('comment_preview_' . $node->type, DRUPAL_OPTIONAL) !== DRUPAL_DISABLED), '#weight' => 20, '#submit' => array('comment_form_build_preview'), ); @@ -2006,7 +2006,7 @@ function comment_submit($comment) { } // Validate the comment's subject. If not specified, extract from comment body. - if (trim($comment->subject) == '') { + if (trim($comment->subject) === '') { // The body may be in any format, so: // 1) Filter it into HTML // 2) Strip out all HTML tags @@ -2021,7 +2021,7 @@ function comment_submit($comment) { $comment->subject = truncate_utf8(trim(decode_entities(strip_tags($comment_text))), 29, TRUE); // Edge cases where the comment body is populated only by HTML tags will // require a default subject. - if ($comment->subject == '') { + if ($comment->subject === '') { $comment->subject = t('(No subject)'); } } @@ -2057,7 +2057,7 @@ function comment_form_submit_build_comment($form, &$form_state) { function comment_form_submit($form, &$form_state) { $node = node_load($form_state['values']['nid']); $comment = comment_form_submit_build_comment($form, $form_state); - if (user_access('post comments') && (user_access('administer comments') || $node->comment == COMMENT_NODE_OPEN)) { + if (user_access('post comments') && (user_access('administer comments') || $node->comment === COMMENT_NODE_OPEN)) { // Save the anonymous user information to a cookie for reuse. if (user_is_anonymous()) { user_cookie_save(array_intersect_key($form_state['values'], array_flip(array('name', 'mail', 'homepage')))); @@ -2070,7 +2070,7 @@ function comment_form_submit($form, &$form_state) { watchdog('content', 'Comment posted: %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid))); // Explain the approval queue if necessary. - if ($comment->status == COMMENT_NOT_PUBLISHED) { + if ($comment->status === COMMENT_NOT_PUBLISHED) { if (!user_access('administer comments')) { drupal_set_message(t('Your comment has been queued for review by site administrators and will be published after approval.')); } @@ -2103,7 +2103,7 @@ function comment_form_submit($form, &$form_state) { * Implements hook_preprocess_block(). */ function comment_preprocess_block(&$variables) { - if ($variables['block']->module == 'comment') { + if ($variables['block']->module === 'comment') { $variables['attributes_array']['role'] = 'navigation'; } } @@ -2146,12 +2146,12 @@ function template_preprocess_comment(&$variables) { $variables['status'] = 'preview'; } else { - $variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'unpublished' : 'published'; + $variables['status'] = ($comment->status === COMMENT_NOT_PUBLISHED) ? 'unpublished' : 'published'; } // Gather comment classes. // 'published' class is not needed, it is either 'preview' or 'unpublished'. - if ($variables['status'] != 'published') { + if ($variables['status'] !== 'published') { $variables['classes_array'][] = $variables['status']; } if ($variables['new']) { @@ -2161,10 +2161,10 @@ function template_preprocess_comment(&$variables) { $variables['classes_array'][] = 'by-anonymous'; } else { - if ($comment->uid == $variables['node']->uid) { + if ($comment->uid === $variables['node']->uid) { $variables['classes_array'][] = 'by-node-author'; } - if ($comment->uid == $variables['user']->uid) { + if ($comment->uid === $variables['user']->uid) { $variables['classes_array'][] = 'by-viewer'; } } @@ -2198,7 +2198,7 @@ function theme_comment_post_forbidden($variables) { if ($authenticated_post_comments) { // We cannot use drupal_get_destination() because these links // sometimes appear on /node and taxonomy listing pages. - if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) == COMMENT_FORM_SEPARATE_PAGE) { + if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) === COMMENT_FORM_SEPARATE_PAGE) { $destination = array('destination' => "comment/reply/$node->nid#comment-form"); } else { @@ -2507,8 +2507,8 @@ function comment_rdf_mapping() { * Implements hook_file_download_access(). */ function comment_file_download_access($field, $entity_type, $entity) { - if ($entity_type == 'comment') { - if (user_access('access comments') && $entity->status == COMMENT_PUBLISHED || user_access('administer comments')) { + if ($entity_type === 'comment') { + if (user_access('access comments') && $entity->status === COMMENT_PUBLISHED || user_access('administer comments')) { $node = node_load($entity->nid); return node_access('view', $node); } diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc index 344e757..f083e73 100644 --- a/core/modules/comment/comment.pages.inc +++ b/core/modules/comment/comment.pages.inc @@ -33,7 +33,7 @@ function comment_reply($node, $pid = NULL) { $build = array(); // The user is previewing a comment prior to submitting it. - if ($op == t('Preview')) { + if ($op === t('Preview')) { if (user_access('post comments')) { $comment = entity_create('comment', array('nid' => $node->nid, 'pid' => $pid)); $build['comment_form'] = drupal_get_form("comment_node_{$node->type}_form", $comment); @@ -55,7 +55,7 @@ function comment_reply($node, $pid = NULL) { if ($comment) { // If that comment exists, make sure that the current comment and the // parent comment both belong to the same parent node. - if ($comment->nid != $node->nid) { + if ($comment->nid !== $node->nid) { // Attempting to reply to a comment not belonging to the current nid. drupal_set_message(t('The comment you are replying to does not exist.'), 'error'); drupal_goto("node/$node->nid"); @@ -82,7 +82,7 @@ function comment_reply($node, $pid = NULL) { } // Should we show the reply box? - if ($node->comment != COMMENT_NODE_OPEN) { + if ($node->comment !== COMMENT_NODE_OPEN) { drupal_set_message(t("This discussion is closed: you can't post new comments."), 'error'); drupal_goto("node/$node->nid"); } diff --git a/core/modules/comment/comment.test b/core/modules/comment/comment.test index 9257513..e43f2a4 100644 --- a/core/modules/comment/comment.test +++ b/core/modules/comment/comment.test @@ -46,7 +46,7 @@ class CommentHelperCase extends DrupalWebTestCase { $this->drupalGet('comment/reply/' . $node->nid); } - if ($subject_mode == TRUE) { + if ($subject_mode === TRUE) { $edit['subject'] = $subject; } else { @@ -239,7 +239,7 @@ class CommentHelperCase extends DrupalWebTestCase { $edit['comments[' . $comment->id . ']'] = TRUE; $this->drupalPost('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update')); - if ($operation == 'delete') { + if ($operation === 'delete') { $this->drupalPost(NULL, array(), t('Delete comments')); $this->assertRaw(format_plural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), t('Operation "' . $operation . '" was performed on comment.')); } @@ -324,7 +324,7 @@ class CommentInterfaceTest extends CommentHelperCase { $this->drupalGet('comment/' . $comment->id . '/edit'); $comment = $this->postComment(NULL, $comment->comment, $comment->subject, array('name' => '')); $comment_loaded = comment_load($comment->id); - $this->assertTrue(empty($comment_loaded->name) && $comment_loaded->uid == 0, t('Comment author successfully changed to anonymous.')); + $this->assertTrue(empty($comment_loaded->name) && $comment_loaded->uid === 0, t('Comment author successfully changed to anonymous.')); // Test changing the comment author to an unverified user. $random_name = $this->randomName(); @@ -337,7 +337,7 @@ class CommentInterfaceTest extends CommentHelperCase { $this->drupalGet('comment/' . $comment->id . '/edit'); $comment = $this->postComment(NULL, $comment->comment, $comment->subject, array('name' => $this->web_user->name)); $comment_loaded = comment_load($comment->id); - $this->assertTrue($comment_loaded->name == $this->web_user->name && $comment_loaded->uid == $this->web_user->uid, t('Comment author successfully changed to a registered user.')); + $this->assertTrue($comment_loaded->name === $this->web_user->name && $comment_loaded->uid === $this->web_user->uid, t('Comment author successfully changed to a registered user.')); $this->drupalLogout(); @@ -440,7 +440,7 @@ class CommentInterfaceTest extends CommentHelperCase { $this->assertNoLink(t('@count new comments', array('@count' => 0))); $this->assertLink(t('Read more')); $count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper')); - $this->assertTrue(count($count) == 1, t('One child found')); + $this->assertTrue(count($count) === 1, t('One child found')); // Create a new comment. This helper function may be run with different // comment settings so use comment_save() to avoid complex setup. @@ -474,7 +474,7 @@ class CommentInterfaceTest extends CommentHelperCase { $this->assertNoLink(t('1 new comment')); $this->assertNoLink(t('@count new comments', array('@count' => 0))); $count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper')); - $this->assertTrue(count($count) == 2, print_r($count, TRUE)); + $this->assertTrue(count($count) === 2, print_r($count, TRUE)); } /** @@ -526,11 +526,11 @@ class CommentInterfaceTest extends CommentHelperCase { $this->drupalGet('node/' . $node->nid); // Verify classes if the comment is visible for the current user. - if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') { + if ($case['comment_status'] === COMMENT_PUBLISHED || $case['user'] === 'admin') { // Verify the by-anonymous class. $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-anonymous")]'); - if ($case['comment_uid'] == 0) { - $this->assertTrue(count($comments) == 1, 'by-anonymous class found.'); + if ($case['comment_uid'] === 0) { + $this->assertTrue(count($comments) === 1, 'by-anonymous class found.'); } else { $this->assertFalse(count($comments), 'by-anonymous class not found.'); @@ -538,8 +538,8 @@ class CommentInterfaceTest extends CommentHelperCase { // Verify the by-node-author class. $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-node-author")]'); - if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['node_uid']) { - $this->assertTrue(count($comments) == 1, 'by-node-author class found.'); + if ($case['comment_uid'] > 0 && $case['comment_uid'] === $case['node_uid']) { + $this->assertTrue(count($comments) === 1, 'by-node-author class found.'); } else { $this->assertFalse(count($comments), 'by-node-author class not found.'); @@ -547,8 +547,8 @@ class CommentInterfaceTest extends CommentHelperCase { // Verify the by-viewer class. $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-viewer")]'); - if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['user_uid']) { - $this->assertTrue(count($comments) == 1, 'by-viewer class found.'); + if ($case['comment_uid'] > 0 && $case['comment_uid'] === $case['user_uid']) { + $this->assertTrue(count($comments) === 1, 'by-viewer class found.'); } else { $this->assertFalse(count($comments), 'by-viewer class not found.'); @@ -557,18 +557,18 @@ class CommentInterfaceTest extends CommentHelperCase { // Verify the unpublished class. $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "unpublished")]'); - if ($case['comment_status'] == COMMENT_NOT_PUBLISHED && $case['user'] == 'admin') { - $this->assertTrue(count($comments) == 1, 'unpublished class found.'); + if ($case['comment_status'] === COMMENT_NOT_PUBLISHED && $case['user'] === 'admin') { + $this->assertTrue(count($comments) === 1, 'unpublished class found.'); } else { $this->assertFalse(count($comments), 'unpublished class not found.'); } // Verify the new class. - if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') { + if ($case['comment_status'] === COMMENT_PUBLISHED || $case['user'] === 'admin') { $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "new")]'); - if ($case['user'] != 'anonymous') { - $this->assertTrue(count($comments) == 1, 'new class found.'); + if ($case['user'] !== 'anonymous') { + $this->assertTrue(count($comments) === 1, 'new class found.'); // Request the node again. The new class should disappear. $this->drupalGet('node/' . $node->nid); @@ -759,7 +759,7 @@ class CommentInterfaceTest extends CommentHelperCase { $info = array_merge($current, $info); // Change environment conditions. - if ($current['authenticated'] != $info['authenticated']) { + if ($current['authenticated'] !== $info['authenticated']) { if ($this->loggedInUser) { $this->drupalLogout(); } @@ -767,7 +767,7 @@ class CommentInterfaceTest extends CommentHelperCase { $this->drupalLogin($this->web_user); } } - if ($current['comment count'] != $info['comment count']) { + if ($current['comment count'] !== $info['comment count']) { if ($info['comment count']) { // Create a comment via CRUD API functionality, since // $this->postComment() relies on actual user permissions. @@ -800,7 +800,7 @@ class CommentInterfaceTest extends CommentHelperCase { // Change comment settings. variable_set('comment_form_location_' . $this->node->type, $info['form']); variable_set('comment_anonymous_' . $this->node->type, $info['contact']); - if ($this->node->comment != $info['comments']) { + if ($this->node->comment !== $info['comments']) { $this->node->comment = $info['comments']; node_save($this->node); } @@ -861,7 +861,7 @@ class CommentInterfaceTest extends CommentHelperCase { // User is allowed to view comments. if ($info['access comments']) { - if ($path == '') { + if ($path === '') { // In teaser view, a link containing the comment count is always // expected. if ($info['comment count']) { @@ -884,7 +884,7 @@ class CommentInterfaceTest extends CommentHelperCase { // comment_num_new() is based on node views, so comments are marked as // read when a node is viewed, regardless of whether we have access to // comments. - if ($path == "node/$nid" && $this->loggedInUser && isset($this->comment)) { + if ($path === "node/$nid" && $this->loggedInUser && isset($this->comment)) { $this->comment->seen = TRUE; } @@ -917,7 +917,7 @@ class CommentInterfaceTest extends CommentHelperCase { // "Add new comment" is always expected, except when there are no // comments or if the user cannot see them. - if ($path == "node/$nid" && $info['form'] == COMMENT_FORM_BELOW && (!$info['comment count'] || !$info['access comments'])) { + if ($path === "node/$nid" && $info['form'] === COMMENT_FORM_BELOW && (!$info['comment count'] || !$info['access comments'])) { $this->assertNoLink('Add new comment'); } else { @@ -925,7 +925,7 @@ class CommentInterfaceTest extends CommentHelperCase { // Verify that the "Add new comment" link points to the correct URL // based on the comment form location configuration. - if ($info['form'] == COMMENT_FORM_SEPARATE_PAGE) { + if ($info['form'] === COMMENT_FORM_SEPARATE_PAGE) { $this->assertLinkByHref("comment/reply/$nid#comment-form", 0, 'Comment form link destination is on a separate page.'); $this->assertNoLinkByHref("node/$nid#comment-form"); } @@ -937,9 +937,9 @@ class CommentInterfaceTest extends CommentHelperCase { // Also verify that the comment form appears according to the configured // location. - if ($path == "node/$nid") { + if ($path === "node/$nid") { $elements = $this->xpath('//form[@id=:id]', array(':id' => 'comment-form')); - if ($info['form'] == COMMENT_FORM_BELOW) { + if ($info['form'] === COMMENT_FORM_BELOW) { $this->assertTrue(count($elements), t('Comment form found below.')); } else { diff --git a/core/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc index 1c6a7ee..4b34a5d 100644 --- a/core/modules/comment/comment.tokens.inc +++ b/core/modules/comment/comment.tokens.inc @@ -115,7 +115,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options = $replacements = array(); - if ($type == 'comment' && !empty($data['comment'])) { + if ($type === 'comment' && !empty($data['comment'])) { $comment = $data['comment']; foreach ($tokens as $name => $original) { @@ -131,12 +131,12 @@ function comment_tokens($type, $tokens, array $data = array(), array $options = break; case 'name': - $name = ($comment->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $comment->name; + $name = ($comment->uid === 0) ? variable_get('anonymous', t('Anonymous')) : $comment->name; $replacements[$original] = $sanitize ? filter_xss($name) : $name; break; case 'mail': - if ($comment->uid != 0) { + if ($comment->uid !== 0) { $account = user_load($comment->uid); $mail = $account->mail; } @@ -223,7 +223,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options = $replacements += token_generate('user', $author_tokens, array('user' => $account), $options); } } - elseif ($type == 'node' & !empty($data['node'])) { + elseif ($type === 'node' & !empty($data['node'])) { $node = $data['node']; foreach ($tokens as $name => $original) { diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index 89ce0bc..ea8d5dd 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -128,7 +128,7 @@ function _contact_personal_tab_access($account) { } // Users may not contact themselves. - if ($user->uid == $account->uid) { + if ($user->uid === $account->uid) { return FALSE; } diff --git a/core/modules/dashboard/dashboard.js b/core/modules/dashboard/dashboard.js index 39d87c2..8b584a6 100644 --- a/core/modules/dashboard/dashboard.js +++ b/core/modules/dashboard/dashboard.js @@ -25,7 +25,7 @@ Drupal.behaviors.dashboard = { var $this = $(this); var empty_text = ""; // If the region is empty - if ($this.find('.block').length == 0) { + if ($this.find('.block').length === 0) { // Check if we are in customize mode and grab the correct empty text if ($('#dashboard').hasClass('customize-mode')) { empty_text = Drupal.settings.dashboard.emptyRegionTextActive; @@ -33,7 +33,7 @@ Drupal.behaviors.dashboard = { empty_text = Drupal.settings.dashboard.emptyRegionTextInactive; } // We need a placeholder. - if ($this.find('.placeholder').length == 0) { + if ($this.find('.placeholder').length === 0) { $this.append('
      '); } $this.find('.placeholder').html(empty_text); diff --git a/core/modules/dashboard/dashboard.module b/core/modules/dashboard/dashboard.module index 889af83..c41a17d 100644 --- a/core/modules/dashboard/dashboard.module +++ b/core/modules/dashboard/dashboard.module @@ -101,12 +101,12 @@ function dashboard_permission() { */ function dashboard_block_info_alter(&$blocks, $theme, $code_blocks) { $admin_theme = variable_get('admin_theme'); - if (($admin_theme && $theme == $admin_theme) || (!$admin_theme && $theme == variable_get('theme_default', 'stark'))) { + if (($admin_theme && $theme === $admin_theme) || (!$admin_theme && $theme === variable_get('theme_default', 'stark'))) { foreach ($blocks as $module => &$module_blocks) { foreach ($module_blocks as $delta => &$block) { // Make administrative blocks that are not already in use elsewhere // available for the dashboard. - if (empty($block['status']) && (empty($block['region']) || $block['region'] == BLOCK_REGION_NONE) && !empty($code_blocks[$module][$delta]['properties']['administrative'])) { + if (empty($block['status']) && (empty($block['region']) || $block['region'] === BLOCK_REGION_NONE) && !empty($code_blocks[$module][$delta]['properties']['administrative'])) { $block['status'] = 1; $block['region'] = 'dashboard_inactive'; } @@ -148,7 +148,7 @@ function dashboard_page_build(&$page) { $page['content']['dashboard'] = array('#theme_wrappers' => array('dashboard')); foreach (dashboard_regions() as $region) { // Do not show dashboard blocks that are disabled. - if ($region == 'dashboard_inactive') { + if ($region === 'dashboard_inactive') { continue; } // Insert regions even when they are empty, so that they will be @@ -206,7 +206,7 @@ function dashboard_page_build(&$page) { * Add regions to each theme to store the dashboard blocks. */ function dashboard_system_info_alter(&$info, $file, $type) { - if ($type == 'theme') { + if ($type === 'theme') { // Add the dashboard regions (the "inactive" region should always appear // last in the list, for usability reasons). $dashboard_regions = dashboard_region_descriptions(); @@ -348,12 +348,12 @@ function dashboard_form_block_admin_display_form_alter(&$form, &$form_state, $fo // function is called for both the dashboard block configuration form and the // standard block configuration form so that both forms can share the same // constructor. As a result the form_id must be checked. - if ($form_id != 'dashboard_admin_display_form') { + if ($form_id !== 'dashboard_admin_display_form') { $dashboard_regions = dashboard_region_descriptions(); $form['block_regions']['#value'] = array_diff_key($form['block_regions']['#value'], $dashboard_regions); foreach (element_children($form['blocks']) as $i) { $block = &$form['blocks'][$i]; - if (isset($block['region']['#default_value']) && isset($dashboard_regions[$block['region']['#default_value']]) && $block['region']['#default_value'] != 'dashboard_inactive') { + if (isset($block['region']['#default_value']) && isset($dashboard_regions[$block['region']['#default_value']]) && $block['region']['#default_value'] !== 'dashboard_inactive') { $block['#access'] = FALSE; } elseif (isset($block['region']['#options'])) { @@ -366,7 +366,7 @@ function dashboard_form_block_admin_display_form_alter(&$form, &$form_state, $fo // 'dashboard_inactive' region, because dashboard_block_info_alter() is // called when the blocks are rehashed. Fortunately, this is the exact // behavior we want. - if ($block['region']['#default_value'] == 'dashboard_inactive') { + if ($block['region']['#default_value'] === 'dashboard_inactive') { // @todo These do not wind up in correct alphabetical order. $block['region']['#default_value'] = NULL; } @@ -404,7 +404,7 @@ function dashboard_form_block_admin_configure_alter(&$form, &$form_state) { $dashboard_regions = dashboard_region_descriptions(); foreach (element_children($form['regions']) as $region_name) { $region = &$form['regions'][$region_name]; - if ($region_name != $theme_key && isset($region['#options'])) { + if ($region_name !== $theme_key && isset($region['#options'])) { $region['#options'] = array_diff_key($region['#options'], $dashboard_regions); } } @@ -456,7 +456,7 @@ function dashboard_is_visible() { // the dashboard, and if the current user has access to see it, return // TRUE. $menu_item = menu_get_item(); - $is_visible = isset($menu_item['page_callback']) && $menu_item['page_callback'] == 'dashboard_admin' && !empty($menu_item['access']); + $is_visible = isset($menu_item['page_callback']) && $menu_item['page_callback'] === 'dashboard_admin' && !empty($menu_item['access']); } return $is_visible; } @@ -505,7 +505,7 @@ function dashboard_show_disabled() { // Limit the list to blocks that are marked as disabled for the dashboard. foreach ($blocks as $key => $block) { - if ($block['theme'] != $theme_key || $block['region'] != 'dashboard_inactive') { + if ($block['theme'] !== $theme_key || $block['region'] !== 'dashboard_inactive') { unset($blocks[$key]); } } @@ -554,7 +554,7 @@ function dashboard_update() { if (!empty($_REQUEST['form_token']) && drupal_valid_token($_REQUEST['form_token'], 'dashboard-update')) { parse_str($_REQUEST['regions'], $regions); foreach ($regions as $region_name => $blocks) { - if ($region_name == 'disabled_blocks') { + if ($region_name === 'disabled_blocks') { $region_name = 'dashboard_inactive'; } foreach ($blocks as $weight => $block_string) { @@ -679,7 +679,7 @@ function theme_dashboard_disabled_block($variables) { $output .= '
      ' - . '

      ' . (!empty($block['title']) && $block['title'] != '' ? check_plain($block['title']) : check_plain($block['info'])) . '

      ' + . '

      ' . (!empty($block['title']) && $block['title'] !== '' ? check_plain($block['title']) : check_plain($block['info'])) . '

      ' . '
      ' . '
      '; } diff --git a/core/modules/dashboard/dashboard.test b/core/modules/dashboard/dashboard.test index ff37d57..faa4906 100644 --- a/core/modules/dashboard/dashboard.test +++ b/core/modules/dashboard/dashboard.test @@ -148,7 +148,7 @@ class DashboardBlockAvailabilityTestCase extends DrupalWebTestCase { $this->assertNoText(t('Syndicate'), t('Drawer of disabled blocks excludes a block not defined as "administrative".')); $this->drupalGet('admin/dashboard/configure'); $elements = $this->xpath('//select[@id=:id]//option[@selected="selected"]', array(':id' => 'edit-blocks-comment-recent-region')); - $this->assertTrue($elements[0]['value'] == 'dashboard_inactive', t('A block defined as "administrative" defaults to dashboard_inactive.')); + $this->assertTrue($elements[0]['value'] === 'dashboard_inactive', t('A block defined as "administrative" defaults to dashboard_inactive.')); // Now enable the block on the dashboard. $values = array(); diff --git a/core/modules/dblog/dblog.admin.inc b/core/modules/dblog/dblog.admin.inc index b2da7ed..9859011 100644 --- a/core/modules/dblog/dblog.admin.inc +++ b/core/modules/dblog/dblog.admin.inc @@ -322,7 +322,7 @@ function dblog_filter_form($form) { * Validate result from dblog administration filter form. */ function dblog_filter_form_validate($form, &$form_state) { - if ($form_state['values']['op'] == t('Filter') && empty($form_state['values']['type']) && empty($form_state['values']['severity'])) { + if ($form_state['values']['op'] === t('Filter') && empty($form_state['values']['type']) && empty($form_state['values']['severity'])) { form_set_error('type', t('You must select something to filter by.')); } } diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index a43e0a5..e8050bf 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -89,7 +89,7 @@ function dblog_menu() { * Implements hook_init(). */ function dblog_init() { - if (arg(0) == 'admin' && arg(1) == 'reports') { + if (arg(0) === 'admin' && arg(1) === 'reports') { // Add the CSS for this module drupal_add_css(drupal_get_path('module', 'dblog') . '/dblog.css'); } diff --git a/core/modules/dblog/dblog.test b/core/modules/dblog/dblog.test index 77765d7..8d98c51 100644 --- a/core/modules/dblog/dblog.test +++ b/core/modules/dblog/dblog.test @@ -61,10 +61,10 @@ class DBLogTestCase extends DrupalWebTestCase { // Check row limit variable. $current_limit = variable_get('dblog_row_limit', 1000); - $this->assertTrue($current_limit == $row_limit, t('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit))); + $this->assertTrue($current_limit === $row_limit, t('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit))); // Verify dblog row limit equals specified row limit. $current_limit = unserialize(db_query("SELECT value FROM {variable} WHERE name = :dblog_limit", array(':dblog_limit' => 'dblog_row_limit'))->fetchField()); - $this->assertTrue($current_limit == $row_limit, t('[Variable table] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit))); + $this->assertTrue($current_limit === $row_limit, t('[Variable table] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit))); } /** @@ -83,7 +83,7 @@ class DBLogTestCase extends DrupalWebTestCase { $this->cronRun(); // Verify dblog row count equals row limit plus one because cron adds a record after it runs. $count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField(); - $this->assertTrue($count == $row_limit + 1, t('Dblog row count of @count equals row limit of @limit plus one', array('@count' => $count, '@limit' => $row_limit))); + $this->assertTrue($count === $row_limit + 1, t('Dblog row count of @count equals row limit of @limit plus one', array('@count' => $count, '@limit' => $row_limit))); } /** @@ -131,35 +131,35 @@ class DBLogTestCase extends DrupalWebTestCase { // View dblog help node. $this->drupalGet('admin/help/dblog'); $this->assertResponse($response); - if ($response == 200) { + if ($response === 200) { $this->assertText(t('Database Logging'), t('DBLog help was displayed')); } // View dblog report node. $this->drupalGet('admin/reports/dblog'); $this->assertResponse($response); - if ($response == 200) { + if ($response === 200) { $this->assertText(t('Recent log messages'), t('DBLog report was displayed')); } // View dblog page-not-found report node. $this->drupalGet('admin/reports/page-not-found'); $this->assertResponse($response); - if ($response == 200) { + if ($response === 200) { $this->assertText(t('Top ' . $quote . 'page not found' . $quote . ' errors'), t('DBLog page-not-found report was displayed')); } // View dblog access-denied report node. $this->drupalGet('admin/reports/access-denied'); $this->assertResponse($response); - if ($response == 200) { + if ($response === 200) { $this->assertText(t('Top ' . $quote . 'access denied' . $quote . ' errors'), t('DBLog access-denied report was displayed')); } // View dblog event node. $this->drupalGet('admin/reports/event/1'); $this->assertResponse($response); - if ($response == 200) { + if ($response === 200) { $this->assertText(t('Details'), t('DBLog event node was displayed')); } } @@ -198,7 +198,7 @@ class DBLogTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Retrieve user object. $user = user_load_by_name($name); - $this->assertTrue($user != NULL, t('User @name was loaded', array('@name' => $name))); + $this->assertTrue($user !== NULL, t('User @name was loaded', array('@name' => $name))); $user->pass_raw = $pass; // Needed by drupalLogin. // Login user. $this->drupalLogin($user); @@ -239,7 +239,7 @@ class DBLogTestCase extends DrupalWebTestCase { // Found link with the message text. $links = array_shift($links); foreach ($links->attributes() as $attr => $value) { - if ($attr == 'href') { + if ($attr === 'href') { // Extract link to details page. $link = drupal_substr($value, strpos($value, 'admin/reports/event/')); $this->drupalGet($link); @@ -281,7 +281,7 @@ class DBLogTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Retrieve node object. $node = $this->drupalGetNodeByTitle($title); - $this->assertTrue($node != NULL, t('Node @title was loaded', array('@title' => $title))); + $this->assertTrue($node !== NULL, t('Node @title was loaded', array('@title' => $title))); // Edit node. $edit = $this->getContentUpdate($type); $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); @@ -453,7 +453,7 @@ class DBLogTestCase extends DrupalWebTestCase { // Count the number of entries of this type. $type_count = 0; foreach ($types as $type) { - if ($type['type'] == $type_name) { + if ($type['type'] === $type_name) { $type_count += $type['count']; } } @@ -515,7 +515,7 @@ class DBLogTestCase extends DrupalWebTestCase { $count = array_fill(0, count($types), 0); foreach ($entries as $entry) { foreach ($types as $key => $type) { - if ($entry['type'] == $type['type'] && $entry['severity'] == $type['severity']) { + if ($entry['type'] === $type['type'] && $entry['severity'] === $type['severity']) { $count[$key]++; break; } diff --git a/core/modules/entity/entity.api.php b/core/modules/entity/entity.api.php index e983778..8450a29 100644 --- a/core/modules/entity/entity.api.php +++ b/core/modules/entity/entity.api.php @@ -414,7 +414,7 @@ function hook_entity_view($entity, $type, $view_mode, $langcode) { * @see hook_user_view_alter() */ function hook_entity_view_alter(&$build, $type) { - if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) { + if ($build['#view_mode'] === 'full' && isset($build['an_additional_field'])) { // Change its weight. $build['an_additional_field']['#weight'] = -10; @@ -437,7 +437,7 @@ function hook_entity_view_alter(&$build, $type) { */ function hook_entity_prepare_view($entities, $type) { // Load a specific node into the user object for later theming. - if ($type == 'user') { + if ($type === 'user') { $nodes = mymodule_get_user_nodes(array_keys($entities)); foreach ($entities as $uid => $entity) { $entity->user_node = $nodes[$uid]; diff --git a/core/modules/entity/entity.query.inc b/core/modules/entity/entity.query.inc index f854369..79ad34f 100644 --- a/core/modules/entity/entity.query.inc +++ b/core/modules/entity/entity.query.inc @@ -610,8 +610,8 @@ class EntityFieldQuery { $order = tablesort_get_order($headers); $direction = tablesort_get_sort($headers); foreach ($headers as $header) { - if (is_array($header) && ($header['data'] == $order['name'])) { - if ($header['type'] == 'field') { + if (is_array($header) && ($header['data'] === $order['name'])) { + if ($header['type'] === 'field') { $this->fieldOrderBy($header['specifier']['field'], $header['specifier']['column'], $direction); } else { @@ -773,7 +773,7 @@ class EntityFieldQuery { if (!isset($storage)) { $storage = $field['storage']['module']; } - elseif ($storage != $field['storage']['module']) { + elseif ($storage !== $field['storage']['module']) { throw new EntityFieldQueryException(t("Can't handle more than one field storage engine")); } } @@ -855,14 +855,14 @@ class EntityFieldQuery { // Order the query. foreach ($this->order as $order) { - if ($order['type'] == 'entity') { + if ($order['type'] === 'entity') { $key = $order['specifier']; if (!isset($id_map[$key])) { throw new EntityFieldQueryException(t('Do not know how to order on @key for @entity_type', array('@key' => $key, '@entity_type' => $entity_type))); } $select_query->orderBy($id_map[$key], $order['direction']); } - elseif ($order['type'] == 'property') { + elseif ($order['type'] === 'property') { $select_query->orderBy("$base_table." . $order['specifier'], $order['direction']); } } diff --git a/core/modules/entity/tests/entity_cache_test.module b/core/modules/entity/tests/entity_cache_test.module index 5ae9ecc..a9dbcd6 100644 --- a/core/modules/entity/tests/entity_cache_test.module +++ b/core/modules/entity/tests/entity_cache_test.module @@ -18,7 +18,7 @@ * @see entity_cache_test_dependency_entity_info() */ function entity_cache_test_watchdog($log_entry) { - if ($log_entry['type'] == 'system' && $log_entry['message'] == '%module module installed.') { + if ($log_entry['type'] === 'system' && $log_entry['message'] === '%module module installed.') { $info = entity_get_info('entity_cache_test'); // Store the information in a system variable to analyze it later in the // test case. diff --git a/core/modules/entity/tests/entity_crud_hook_test.test b/core/modules/entity/tests/entity_crud_hook_test.test index be59e99..949ab7f 100644 --- a/core/modules/entity/tests/entity_crud_hook_test.test +++ b/core/modules/entity/tests/entity_crud_hook_test.test @@ -55,7 +55,7 @@ class EntityCrudHookTestCase extends DrupalWebTestCase { // Sort the positions and ensure they remain in the same order. $sorted = $positions; sort($sorted); - $this->assertTrue($sorted == $positions, 'The hook messages appear in the correct order.'); + $this->assertTrue($sorted === $positions, 'The hook messages appear in the correct order.'); } /** diff --git a/core/modules/entity/tests/entity_query.test b/core/modules/entity/tests/entity_query.test index fb5dc14..f9d9ea0 100644 --- a/core/modules/entity/tests/entity_query.test +++ b/core/modules/entity/tests/entity_query.test @@ -1043,7 +1043,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase { $query->execute(); } catch (EntityFieldQueryException $exception) { - $pass = ($exception->getMessage() == t('For this query an entity type must be specified.')); + $pass = ($exception->getMessage() === t('For this query an entity type must be specified.')); } $this->assertTrue($pass, t("Can't query the universe.")); } @@ -1262,7 +1262,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase { $query->queryCallback(); } catch (EntityFieldQueryException $exception) { - $pass = ($exception->getMessage() == t("Can't handle more than one field storage engine")); + $pass = ($exception->getMessage() === t("Can't handle more than one field storage engine")); } $this->assertTrue($pass, t('Cannot query across field storage engines.')); } diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php index d9061e1..f1f21c8 100644 --- a/core/modules/field/field.api.php +++ b/core/modules/field/field.api.php @@ -219,7 +219,7 @@ function hook_field_info_alter(&$info) { * definitions. */ function hook_field_schema($field) { - if ($field['type'] == 'text_long') { + if ($field['type'] === 'text_long') { $columns = array( 'value' => array( 'type' => 'text', @@ -302,7 +302,7 @@ function hook_field_load($entity_type, $entities, $field, $instances, $langcode, // by formatters if needed. if (empty($instances[$id]['settings']['text_processing']) || filter_format_allowcache($item['format'])) { $items[$id][$delta]['safe_value'] = isset($item['value']) ? _text_sanitize($instances[$id], $langcode, $item, 'value') : ''; - if ($field['type'] == 'text_with_summary') { + if ($field['type'] === 'text_with_summary') { $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? _text_sanitize($instances[$id], $langcode, $item, 'summary') : ''; } } @@ -414,7 +414,7 @@ function hook_field_validate($entity_type, $entity, $field, $instance, $langcode * $entity->{$field['field_name']}[$langcode], or an empty array if unset. */ function hook_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) { - if ($field['type'] == 'number_decimal') { + if ($field['type'] === 'number_decimal') { // Let PHP round the value to ensure consistent behavior across storage // backends. foreach ($items as $delta => $item) { @@ -452,7 +452,7 @@ function hook_field_presave($entity_type, $entity, $field, $instance, $langcode, * @see hook_field_delete() */ function hook_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) { - if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] == 'field_sql_storage' && $entity_type == 'node' && $entity->status) { + if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] === 'field_sql_storage' && $entity_type === 'node' && $entity->status) { $query = db_insert('taxonomy_index')->fields(array('nid', 'tid', 'sticky', 'created', )); foreach ($items as $item) { $query->values(array( @@ -493,7 +493,7 @@ function hook_field_insert($entity_type, $entity, $field, $instance, $langcode, * @see hook_field_delete() */ function hook_field_update($entity_type, $entity, $field, $instance, $langcode, &$items) { - if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] == 'field_sql_storage' && $entity_type == 'node') { + if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] === 'field_sql_storage' && $entity_type === 'node') { $first_call = &drupal_static(__FUNCTION__, array()); // We don't maintain data for old revisions, so clear all previous values @@ -896,7 +896,7 @@ function hook_field_widget_form(&$form, &$form_state, $field, $instance, $langco */ function hook_field_widget_form_alter(&$element, &$form_state, $context) { // Add a css class to widget form elements for all fields of type mytype. - if ($context['field']['type'] == 'mytype') { + if ($context['field']['type'] === 'mytype') { // Be sure not to overwrite existing attributes. $element['#attributes']['class'][] = 'myclass'; } @@ -1393,7 +1393,7 @@ function hook_field_attach_delete_revision($entity_type, $entity) { */ function hook_field_attach_purge($entity_type, $entity, $field, $instance) { // find the corresponding data in mymodule and purge it - if ($entity_type == 'node' && $field->field_name == 'my_field_name') { + if ($entity_type === 'node' && $field->field_name === 'my_field_name') { mymodule_remove_mydata($entity->nid); } } @@ -1422,7 +1422,7 @@ function hook_field_attach_view_alter(&$output, $context) { // Append RDF term mappings on displayed taxonomy links. foreach (element_children($output) as $field_name) { $element = &$output[$field_name]; - if ($element['#field_type'] == 'taxonomy_term_reference' && $element['#formatter'] == 'taxonomy_term_reference_link') { + if ($element['#field_type'] === 'taxonomy_term_reference' && $element['#formatter'] === 'taxonomy_term_reference_link') { foreach ($element['#items'] as $delta => $item) { $term = $item['taxonomy_term']; if (!empty($term->rdf_mapping['rdftype'])) { @@ -1451,7 +1451,7 @@ function hook_field_attach_view_alter(&$output, $context) { * - source_langcode: The source language from which translate. */ function hook_field_attach_prepare_translation_alter(&$entity, $context) { - if ($context['entity_type'] == 'custom_entity_type') { + if ($context['entity_type'] === 'custom_entity_type') { $entity->custom_field = $context['source_entity']->custom_field; } } @@ -1656,7 +1656,7 @@ function hook_field_storage_details($field) { * @see hook_field_storage_details() */ function hook_field_storage_details_alter(&$details, $field) { - if ($field['field_name'] == 'field_of_interest') { + if ($field['field_name'] === 'field_of_interest') { $columns = array(); foreach ((array) $field['columns'] as $column_name => $attributes) { $columns[$column_name] = $column_name; @@ -1701,7 +1701,7 @@ function hook_field_storage_details_alter(&$details, $field) { */ function hook_field_storage_load($entity_type, $entities, $age, $fields, $options) { $field_info = field_info_field_by_ids(); - $load_current = $age == FIELD_LOAD_CURRENT; + $load_current = $age === FIELD_LOAD_CURRENT; foreach ($fields as $field_id => $ids) { $field = $field_info[$field_id]; @@ -1727,7 +1727,7 @@ function hook_field_storage_load($entity_type, $entities, $age, $fields, $option $delta_count[$row->entity_id][$row->langcode] = 0; } - if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) { + if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) { $item = array(); // For each column declared by the field, populate the item // from the prefixed database column. @@ -1777,7 +1777,7 @@ function hook_field_storage_write($entity_type, $entity, $op, $fields) { $field_langcodes = array_intersect($all_langcodes, array_keys((array) $entity->$field_name)); // Delete and insert, rather than update, in case a value was added. - if ($op == FIELD_STORAGE_UPDATE) { + if ($op === FIELD_STORAGE_UPDATE) { // Delete language codes present in the incoming $entity->$field_name. // Delete all language codes if $entity->$field_name is empty. $langcodes = !empty($entity->$field_name) ? $field_langcodes : $all_langcodes; @@ -1827,7 +1827,7 @@ function hook_field_storage_write($entity_type, $entity, $op, $fields) { $revision_query->values($record); } - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) { + if ($field['cardinality'] !== FIELD_CARDINALITY_UNLIMITED && ++$delta_count === $field['cardinality']) { break; } } @@ -1917,7 +1917,7 @@ function hook_field_storage_delete_revision($entity_type, $entity, $fields) { */ function hook_field_storage_query($query) { $groups = array(); - if ($query->age == FIELD_LOAD_CURRENT) { + if ($query->age === FIELD_LOAD_CURRENT) { $tablename_function = '_field_sql_storage_tablename'; $id_key = 'entity_id'; } @@ -1942,7 +1942,7 @@ function hook_field_storage_query($query) { $select_query->fields($table_alias, array('entity_type', 'entity_id', 'revision_id', 'bundle')); $field_base_table = $table_alias; } - if ($field['cardinality'] != 1) { + if ($field['cardinality'] !== 1) { $select_query->distinct(); } } @@ -1975,7 +1975,7 @@ function hook_field_storage_query($query) { // Is there a need to sort the query by property? $has_property_order = FALSE; foreach ($query->order as $order) { - if ($order['type'] == 'property') { + if ($order['type'] === 'property') { $has_property_order = TRUE; } } @@ -1997,18 +1997,18 @@ function hook_field_storage_query($query) { // Order the query. foreach ($query->order as $order) { - if ($order['type'] == 'entity') { + if ($order['type'] === 'entity') { $key = $order['specifier']; $select_query->orderBy("$field_base_table.$key", $order['direction']); } - elseif ($order['type'] == 'field') { + elseif ($order['type'] === 'field') { $specifier = $order['specifier']; $field = $specifier['field']; $table_alias = $table_aliases[$specifier['index']]; $sql_field = "$table_alias." . _field_sql_storage_columnname($field['field_name'], $specifier['column']); $select_query->orderBy($sql_field, $order['direction']); } - elseif ($order['type'] == 'property') { + elseif ($order['type'] === 'property') { $select_query->orderBy("$entity_base_table." . $order['specifier'], $order['direction']); } } @@ -2141,7 +2141,7 @@ function hook_field_storage_pre_load($entity_type, $entities, $age, &$skip_field * Saved field IDs are set set as keys in $skip_fields. */ function hook_field_storage_pre_insert($entity_type, $entity, &$skip_fields) { - if ($entity_type == 'node' && $entity->status && _forum_node_check_node_type($entity)) { + if ($entity_type === 'node' && $entity->status && _forum_node_check_node_type($entity)) { $query = db_insert('forum_index')->fields(array('nid', 'title', 'tid', 'sticky', 'created', 'comment_count', 'last_comment_timestamp')); foreach ($entity->taxonomy_forums as $language) { foreach ($language as $delta) { @@ -2180,7 +2180,7 @@ function hook_field_storage_pre_insert($entity_type, $entity, &$skip_fields) { function hook_field_storage_pre_update($entity_type, $entity, &$skip_fields) { $first_call = &drupal_static(__FUNCTION__, array()); - if ($entity_type == 'node' && $entity->status && _forum_node_check_node_type($entity)) { + if ($entity_type === 'node' && $entity->status && _forum_node_check_node_type($entity)) { // We don't maintain data for old revisions, so clear all previous values // from the table. Since this hook runs once per field, per entity, make // sure we only wipe values once. @@ -2265,11 +2265,11 @@ function hook_field_info_max_weight($entity_type, $bundle, $context) { */ function hook_field_display_alter(&$display, $context) { // Leave field labels out of the search index. - // Note: The check against $context['entity_type'] == 'node' could be avoided + // Note: The check against $context['entity_type'] === 'node' could be avoided // by using hook_field_display_node_alter() instead of // hook_field_display_alter(), resulting in less function calls when // rendering non-node entities. - if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') { + if ($context['entity_type'] === 'node' && $context['view_mode'] === 'search_index') { $display['label'] = 'hidden'; } } @@ -2300,7 +2300,7 @@ function hook_field_display_alter(&$display, $context) { */ function hook_field_display_ENTITY_TYPE_alter(&$display, $context) { // Leave field labels out of the search index. - if ($context['view_mode'] == 'search_index') { + if ($context['view_mode'] === 'search_index') { $display['label'] = 'hidden'; } } @@ -2322,7 +2322,7 @@ function hook_field_display_ENTITY_TYPE_alter(&$display, $context) { * - view_mode: The view mode, e.g. 'full', 'teaser'... */ function hook_field_extra_fields_display_alter(&$displays, $context) { - if ($context['entity_type'] == 'taxonomy_term' && $context['view_mode'] == 'full') { + if ($context['entity_type'] === 'taxonomy_term' && $context['view_mode'] === 'full') { $displays['description']['visible'] = FALSE; } } @@ -2353,7 +2353,7 @@ function hook_field_extra_fields_display_alter(&$displays, $context) { function hook_field_widget_properties_alter(&$widget, $context) { // Change a widget's type according to the time of day. $field = $context['field']; - if ($context['entity_type'] == 'node' && $field['field_name'] == 'field_foo') { + if ($context['entity_type'] === 'node' && $field['field_name'] === 'field_foo') { $time = date('H'); $widget['type'] = $time < 12 ? 'widget_am' : 'widget_pm'; } @@ -2385,7 +2385,7 @@ function hook_field_widget_properties_alter(&$widget, $context) { function hook_field_widget_properties_ENTITY_TYPE_alter(&$widget, $context) { // Change a widget's type according to the time of day. $field = $context['field']; - if ($field['field_name'] == 'field_foo') { + if ($field['field_name'] === 'field_foo') { $time = date('H'); $widget['type'] = $time < 12 ? 'widget_am' : 'widget_pm'; } @@ -2669,7 +2669,7 @@ function hook_field_storage_purge($entity_type, $entity, $field, $instance) { * TRUE if the operation is allowed, and FALSE if the operation is denied. */ function hook_field_access($op, $field, $entity_type, $entity, $account) { - if ($field['field_name'] == 'field_of_interest' && $op == 'edit') { + if ($field['field_name'] === 'field_of_interest' && $op === 'edit') { return user_access('edit field of interest', $account); } return TRUE; diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc index ff579c7..a86d295 100644 --- a/core/modules/field/field.attach.inc +++ b/core/modules/field/field.attach.inc @@ -442,7 +442,7 @@ function _field_invoke_get_instances($entity_type, $bundle, $options) { // Single-field mode by field id: we need to loop on each instance to // find the right one. foreach ($instances as $instance) { - if ($instance['field_id'] == $options['field_id']) { + if ($instance['field_id'] === $options['field_id']) { $instances = array($instance); break; } @@ -615,7 +615,7 @@ function field_attach_form($entity_type, $entity, &$form, &$form_state, $langcod */ function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $options = array()) { $field_info = field_info_field_by_ids(); - $load_current = $age == FIELD_LOAD_CURRENT; + $load_current = $age === FIELD_LOAD_CURRENT; // Merge default options. $default_options = array( diff --git a/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc index f9c96c9..8145716 100644 --- a/core/modules/field/field.crud.inc +++ b/core/modules/field/field.crud.inc @@ -230,13 +230,13 @@ function field_update_field($field) { $field['settings'] += $prior_field['settings']; // Some updates are always disallowed. - if ($field['type'] != $prior_field['type']) { + if ($field['type'] !== $prior_field['type']) { throw new FieldException("Cannot change an existing field's type."); } - if ($field['entity_types'] != $prior_field['entity_types']) { + if ($field['entity_types'] !== $prior_field['entity_types']) { throw new FieldException("Cannot change an existing field's entity_types property."); } - if ($field['storage']['type'] != $prior_field['storage']['type']) { + if ($field['storage']['type'] !== $prior_field['storage']['type']) { throw new FieldException("Cannot change an existing field's storage type."); } @@ -596,7 +596,7 @@ function _field_write_instance($instance, $update = FALSE) { 'type' => isset($field_type['default_formatter']) ? $field_type['default_formatter'] : 'hidden', 'settings' => array(), ); - if ($display['type'] != 'hidden') { + if ($display['type'] !== 'hidden') { $formatter_type = field_info_formatter_types($display['type']); $display['module'] = $formatter_type['module']; $display['settings'] += field_info_formatter_settings($display['type']); @@ -753,7 +753,7 @@ function field_delete_instance($instance, $field_cleanup = TRUE) { module_invoke_all('field_delete_instance', $instance); // Delete the field itself if we just deleted its last instance. - if ($field_cleanup && count($field['bundles']) == 0) { + if ($field_cleanup && count($field['bundles']) === 0) { field_delete_field($field['field_name']); } } diff --git a/core/modules/field/field.default.inc b/core/modules/field/field.default.inc index 1e1675c..171141b 100644 --- a/core/modules/field/field.default.inc +++ b/core/modules/field/field.default.inc @@ -78,7 +78,7 @@ function field_default_validate($entity_type, $entity, $field, $instance, $langc // Check that the number of values doesn't exceed the field cardinality. // For form submitted values, this can only happen with 'multiple value' // widgets. - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && count($items) > $field['cardinality']) { + if ($field['cardinality'] !== FIELD_CARDINALITY_UNLIMITED && count($items) > $field['cardinality']) { $errors[$field['field_name']][$langcode][0][] = array( 'error' => 'field_cardinality', 'message' => t('%name: this field cannot hold more than @count values.', array('%name' => $instance['label'], '@count' => $field['cardinality'])), @@ -108,7 +108,7 @@ function field_default_insert($entity_type, $entity, $field, $instance, $langcod // languages get a default value. Otherwise we could have default values for // not yet open languages. if (empty($entity) || !property_exists($entity, $field['field_name']) || - (isset($entity->{$field['field_name']}[$langcode]) && count($entity->{$field['field_name']}[$langcode]) == 0)) { + (isset($entity->{$field['field_name']}[$langcode]) && count($entity->{$field['field_name']}[$langcode]) === 0)) { $items = field_get_default_value($entity_type, $entity, $field, $instance, $langcode); } } @@ -259,7 +259,7 @@ function field_default_view($entity_type, $entity, $field, $instance, $langcode, function field_default_prepare_translation($entity_type, $entity, $field, $instance, $langcode, &$items, $source_entity, $source_langcode) { $field_name = $field['field_name']; // If the field is untranslatable keep using LANGUAGE_NOT_SPECIFIED. - if ($langcode == LANGUAGE_NOT_SPECIFIED) { + if ($langcode === LANGUAGE_NOT_SPECIFIED) { $source_langcode = LANGUAGE_NOT_SPECIFIED; } if (isset($source_entity->{$field_name}[$source_langcode])) { diff --git a/core/modules/field/field.form.inc b/core/modules/field/field.form.inc index be3685d..14c9498 100644 --- a/core/modules/field/field.form.inc +++ b/core/modules/field/field.form.inc @@ -52,7 +52,7 @@ function field_default_form($entity_type, $entity, $field, $instance, $langcode, // If field module handles multiple values for this form element, and we // are displaying an individual element, process the multiple value form. - if (!isset($get_delta) && field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) { + if (!isset($get_delta) && field_behaviors_widget('multiple values', $instance) === FIELD_BEHAVIOR_DEFAULT) { $elements = field_multiple_value_form($field, $instance, $langcode, $items, $form, $form_state); } // If the widget is handling multiple values (e.g Options), or if we are @@ -72,7 +72,7 @@ function field_default_form($entity_type, $entity, $field, $instance, $langcode, '#title' => check_plain($instance['label']), '#description' => field_filter_xss($instance['description']), // Only the first widget should be required. - '#required' => $delta == 0 && $instance['required'], + '#required' => $delta === 0 && $instance['required'], '#delta' => $delta, ); if ($element = $function($form, $form_state, $field, $instance, $langcode, $items, $delta, $element)) { @@ -92,7 +92,7 @@ function field_default_form($entity_type, $entity, $field, $instance, $langcode, // For fields that handle their own processing, we can't make // assumptions about how the field is structured, just merge in the // returned element. - if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) { + if (field_behaviors_widget('multiple values', $instance) === FIELD_BEHAVIOR_DEFAULT) { $elements[$delta] = $element; } else { @@ -173,7 +173,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, $function = $instance['widget']['module'] . '_field_widget_form'; if (function_exists($function)) { for ($delta = 0; $delta <= $max; $delta++) { - $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED; + $multiple = $field['cardinality'] > 1 || $field['cardinality'] === FIELD_CARDINALITY_UNLIMITED; $element = array( '#entity_type' => $instance['entity_type'], '#bundle' => $instance['bundle'], @@ -185,7 +185,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, '#title' => $multiple ? '' : $title, '#description' => $multiple ? '' : $description, // Only the first widget should be required. - '#required' => $delta == 0 && $instance['required'], + '#required' => $delta === 0 && $instance['required'], '#delta' => $delta, '#weight' => $delta, ); @@ -233,7 +233,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, '#max_delta' => $max, ); // Add 'add more' button, if not working with a programmed form. - if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED && empty($form_state['programmed'])) { + if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED && empty($form_state['programmed'])) { $field_elements['add_more'] = array( '#type' => 'submit', '#name' => strtr($id_prefix, '-', '_') . '_add_more', @@ -270,7 +270,7 @@ function theme_field_multiple_value_form($variables) { $element = $variables['element']; $output = ''; - if ($element['#cardinality'] > 1 || $element['#cardinality'] == FIELD_CARDINALITY_UNLIMITED) { + if ($element['#cardinality'] > 1 || $element['#cardinality'] === FIELD_CARDINALITY_UNLIMITED) { $table_id = drupal_html_id($element['#field_name'] . '_values'); $order_class = $element['#field_name'] . '-delta-order'; $required = !empty($element['#required']) ? theme('form_required_marker', $variables) : ''; @@ -364,7 +364,7 @@ function field_default_form_errors($entity_type, $entity, $field, $instance, $la // Locate the correct element in the the form. $element = drupal_array_get_nested_value($form_state['complete_form'], $field_state['array_parents']); - $multiple_widget = field_behaviors_widget('multiple values', $instance) != FIELD_BEHAVIOR_DEFAULT; + $multiple_widget = field_behaviors_widget('multiple values', $instance) !== FIELD_BEHAVIOR_DEFAULT; foreach ($field_state['errors'] as $delta => $delta_errors) { // For multiple single-value widgets, pass errors by delta. // For a multiple-value widget, all errors are passed to the main widget. @@ -432,7 +432,7 @@ function field_add_more_js($form, $form_state) { $field_state = field_form_get_state($parents, $field_name, $langcode, $form_state); $field = $field_state['field']; - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED) { + if ($field['cardinality'] !== FIELD_CARDINALITY_UNLIMITED) { return; } diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc index 78bc62e..43dd9bb 100644 --- a/core/modules/field/field.info.inc +++ b/core/modules/field/field.info.inc @@ -305,7 +305,7 @@ function _field_info_prepare_instance($instance, $field) { $instance['settings'] += field_info_instance_settings($field['type']); // Set a default value for the instance. - if (field_behaviors_widget('default value', $instance) == FIELD_BEHAVIOR_DEFAULT && !isset($instance['default_value'])) { + if (field_behaviors_widget('default value', $instance) === FIELD_BEHAVIOR_DEFAULT && !isset($instance['default_value'])) { $instance['default_value'] = NULL; } @@ -321,7 +321,7 @@ function _field_info_prepare_instance($instance, $field) { $view_modes = array_merge(array('default'), array_keys($entity_info['view modes'])); $view_mode_settings = field_view_mode_settings($instance['entity_type'], $instance['bundle']); foreach ($view_modes as $view_mode) { - if ($view_mode == 'default' || !empty($view_mode_settings[$view_mode]['custom_settings'])) { + if ($view_mode === 'default' || !empty($view_mode_settings[$view_mode]['custom_settings'])) { if (!isset($instance['display'][$view_mode])) { $instance['display'][$view_mode] = array( 'type' => 'hidden', @@ -355,7 +355,7 @@ function _field_info_prepare_instance_display($field, $display) { 'settings' => array(), 'weight' => 0, ); - if ($display['type'] != 'hidden') { + if ($display['type'] !== 'hidden') { $formatter_type = field_info_formatter_types($display['type']); // Fallback to default formatter if formatter type is not available. if (!$formatter_type) { @@ -803,7 +803,7 @@ function field_info_max_weight($entity_type, $bundle, $context) { // Collect weights for fields. foreach (field_info_instances($entity_type, $bundle) as $instance) { - if ($context == 'form') { + if ($context === 'form') { $weights[] = $instance['widget']['weight']; } elseif (isset($instance['display'][$context]['weight'])) { diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 2f3041c..7db9ed2 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -349,7 +349,7 @@ function field_cron() { * required if there are any active fields of that type. */ function field_system_info_alter(&$info, $file, $type) { - if ($type == 'module' && module_hook($file->name, 'field_info')) { + if ($type === 'module' && module_hook($file->name, 'field_info')) { $fields = field_read_fields(array('module' => $file->name), array('include_deleted' => TRUE)); if ($fields) { $info['required'] = TRUE; @@ -509,7 +509,7 @@ function _field_filter_items($field, $items) { * user drag-n-drop reordering. */ function _field_sort_items($field, $items) { - if (($field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED) && isset($items[0]['_weight'])) { + if (($field['cardinality'] > 1 || $field['cardinality'] === FIELD_CARDINALITY_UNLIMITED) && isset($items[0]['_weight'])) { usort($items, '_field_sort_items_helper'); foreach ($items as $delta => $item) { if (is_array($items[$delta])) { @@ -720,7 +720,7 @@ function _field_extra_fields_pre_render($elements) { $entity_type = $elements['#entity_type']; $bundle = $elements['#bundle']; - if (isset($elements['#type']) && $elements['#type'] == 'form') { + if (isset($elements['#type']) && $elements['#type'] === 'form') { $extra_fields = field_info_extra_fields($entity_type, $bundle, 'form'); foreach ($extra_fields as $name => $settings) { if (isset($elements[$name])) { @@ -1037,7 +1037,7 @@ function template_preprocess_field(&$variables, $hook) { // supposed to be hidden. If a theme implementation needs to print a hidden // label, it needs to supply a preprocess function that sets it to the // sanitized element title or whatever else is wanted in its place. - $variables['label_hidden'] = ($element['#label_display'] == 'hidden'); + $variables['label_hidden'] = ($element['#label_display'] === 'hidden'); $variables['label'] = $variables['label_hidden'] ? NULL : check_plain($element['#title']); // We want other preprocess functions and the theme implementation to have @@ -1065,7 +1065,7 @@ function template_preprocess_field(&$variables, $hook) { ); // Add a "clearfix" class to the wrapper since we float the label and the // field items in field.css if the label is inline. - if ($element['#label_display'] == 'inline') { + if ($element['#label_display'] === 'inline') { $variables['classes_array'][] = 'clearfix'; } diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.install b/core/modules/field/modules/field_sql_storage/field_sql_storage.install index 2229ef4..026c3bf 100644 --- a/core/modules/field/modules/field_sql_storage/field_sql_storage.install +++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.install @@ -16,7 +16,7 @@ function field_sql_storage_schema() { $fields = field_read_fields(array(), array('include_deleted' => TRUE, 'include_inactive' => TRUE)); drupal_load('module', 'field_sql_storage'); foreach ($fields as $field) { - if ($field['storage']['type'] == 'field_sql_storage') { + if ($field['storage']['type'] === 'field_sql_storage') { $schema += _field_sql_storage_schema($field); } } diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.module b/core/modules/field/modules/field_sql_storage/field_sql_storage.module index 14e5745..39a5041 100644 --- a/core/modules/field/modules/field_sql_storage/field_sql_storage.module +++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.module @@ -228,7 +228,7 @@ function field_sql_storage_field_storage_create_field($field) { * any data. */ function field_sql_storage_field_update_forbid($field, $prior_field, $has_data) { - if ($has_data && $field['columns'] != $prior_field['columns']) { + if ($has_data && $field['columns'] !== $prior_field['columns']) { throw new FieldUpdateForbiddenException("field_sql_storage cannot change the schema for an existing field with data."); } } @@ -279,7 +279,7 @@ function field_sql_storage_field_storage_update_field($field, $prior_field, $has $table = _field_sql_storage_tablename($prior_field); $revision_table = _field_sql_storage_revision_tablename($prior_field); foreach ($prior_field['indexes'] as $name => $columns) { - if (!isset($field['indexes'][$name]) || $columns != $field['indexes'][$name]) { + if (!isset($field['indexes'][$name]) || $columns !== $field['indexes'][$name]) { $real_name = _field_sql_storage_indexname($field['field_name'], $name); db_drop_index($table, $real_name); db_drop_index($revision_table, $real_name); @@ -288,7 +288,7 @@ function field_sql_storage_field_storage_update_field($field, $prior_field, $has $table = _field_sql_storage_tablename($field); $revision_table = _field_sql_storage_revision_tablename($field); foreach ($field['indexes'] as $name => $columns) { - if (!isset($prior_field['indexes'][$name]) || $columns != $prior_field['indexes'][$name]) { + if (!isset($prior_field['indexes'][$name]) || $columns !== $prior_field['indexes'][$name]) { $real_name = _field_sql_storage_indexname($field['field_name'], $name); $real_columns = array(); foreach ($columns as $column_name) { @@ -328,7 +328,7 @@ function field_sql_storage_field_storage_delete_field($field) { */ function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fields, $options) { $field_info = field_info_field_by_ids(); - $load_current = $age == FIELD_LOAD_CURRENT; + $load_current = $age === FIELD_LOAD_CURRENT; foreach ($fields as $field_id => $ids) { $field = $field_info[$field_id]; @@ -354,7 +354,7 @@ function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fi $delta_count[$row->entity_id][$row->langcode] = 0; } - if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) { + if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) { $item = array(); // For each column declared by the field, populate the item // from the prefixed database column. @@ -390,7 +390,7 @@ function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fiel $field_langcodes = array_intersect($all_langcodes, array_keys((array) $entity->$field_name)); // Delete and insert, rather than update, in case a value was added. - if ($op == FIELD_STORAGE_UPDATE) { + if ($op === FIELD_STORAGE_UPDATE) { // Delete language codes present in the incoming $entity->$field_name. // Delete all language codes if $entity->$field_name is empty. $langcodes = !empty($entity->$field_name) ? $field_langcodes : $all_langcodes; @@ -440,7 +440,7 @@ function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fiel $revision_query->values($record); } - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) { + if ($field['cardinality'] !== FIELD_CARDINALITY_UNLIMITED && ++$delta_count === $field['cardinality']) { break; } } @@ -495,7 +495,7 @@ function field_sql_storage_field_storage_purge($entity_type, $entity, $field, $i * Implements hook_field_storage_query(). */ function field_sql_storage_field_storage_query(EntityFieldQuery $query) { - if ($query->age == FIELD_LOAD_CURRENT) { + if ($query->age === FIELD_LOAD_CURRENT) { $tablename_function = '_field_sql_storage_tablename'; $id_key = 'entity_id'; } @@ -520,7 +520,7 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) { $select_query->fields($table_alias, array('entity_type', 'entity_id', 'revision_id', 'bundle')); $field_base_table = $table_alias; } - if ($field['cardinality'] != 1 || $field['translatable']) { + if ($field['cardinality'] !== 1 || $field['translatable']) { $select_query->distinct(); } } @@ -539,7 +539,7 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) { // Is there a need to sort the query by property? $has_property_order = FALSE; foreach ($query->order as $order) { - if ($order['type'] == 'property') { + if ($order['type'] === 'property') { $has_property_order = TRUE; } } @@ -561,18 +561,18 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) { // Order the query. foreach ($query->order as $order) { - if ($order['type'] == 'entity') { + if ($order['type'] === 'entity') { $key = $order['specifier']; $select_query->orderBy("$field_base_table.$key", $order['direction']); } - elseif ($order['type'] == 'field') { + elseif ($order['type'] === 'field') { $specifier = $order['specifier']; $field = $specifier['field']; $table_alias = $table_aliases[$specifier['index']]; $sql_field = "$table_alias." . _field_sql_storage_columnname($field['field_name'], $specifier['column']); $select_query->orderBy($sql_field, $order['direction']); } - elseif ($order['type'] == 'property') { + elseif ($order['type'] === 'property') { $select_query->orderBy("$entity_base_table." . $order['specifier'], $order['direction']); } } @@ -691,7 +691,7 @@ function field_sql_storage_field_attach_rename_bundle($entity_type, $bundle_old, $instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE)); foreach ($instances as $instance) { $field = field_info_field_by_id($instance['field_id']); - if ($field['storage']['type'] == 'field_sql_storage') { + if ($field['storage']['type'] === 'field_sql_storage') { $table_name = _field_sql_storage_tablename($field); $revision_name = _field_sql_storage_revision_tablename($field); db_update($table_name) diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.test b/core/modules/field/modules/field_sql_storage/field_sql_storage.test index 87c388a..1cc98fc 100644 --- a/core/modules/field/modules/field_sql_storage/field_sql_storage.test +++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.test @@ -165,7 +165,7 @@ class FieldSqlStorageTestCase extends DrupalWebTestCase { foreach ($results as $row) { $this->assertEqual($row->{$this->field_name . '_value'}, $rev_values[$row->revision_id][$row->delta]['value'], "Value {$row->delta} for revision {$row->revision_id} stored correctly"); unset($rev_values[$row->revision_id][$row->delta]); - if (count($rev_values[$row->revision_id]) == 1) { + if (count($rev_values[$row->revision_id]) === 1) { unset($rev_values[$row->revision_id]); } } diff --git a/core/modules/field/modules/list/list.module b/core/modules/field/modules/list/list.module index c2bff2a..8bffc71 100644 --- a/core/modules/field/modules/list/list.module +++ b/core/modules/field/modules/list/list.module @@ -77,7 +77,7 @@ function list_field_settings_form($field, $instance, $has_data) { ); $description = '

      ' . t('The possible values this field can contain. Enter one value per line, in the format key|label.'); - if ($field['type'] == 'list_integer' || $field['type'] == 'list_float') { + if ($field['type'] === 'list_integer' || $field['type'] === 'list_float') { $description .= '
      ' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); $description .= '
      ' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); $description .= '
      ' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); @@ -132,10 +132,10 @@ function list_field_settings_form($field, $instance, $has_data) { } // Alter the description for allowed values depending on the widget type. - if ($instance['widget']['type'] == 'options_onoff') { + if ($instance['widget']['type'] === 'options_onoff') { $form['allowed_values']['#description'] .= '

      ' . t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the Allowed values section. Note that the checkbox will be labeled with the label of the 'on' value.") . '

      '; } - elseif ($instance['widget']['type'] == 'options_buttons') { + elseif ($instance['widget']['type'] === 'options_buttons') { $form['allowed_values']['#description'] .= '

      ' . t("The 'checkboxes/radio buttons' widget will display checkboxes if the Number of values option is greater than 1 for this field, otherwise radios will be displayed.") . '

      '; } $form['allowed_values']['#description'] .= '

      ' . t('Allowed HTML tags in labels: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())) . '

      '; @@ -161,7 +161,7 @@ function list_allowed_values_setting_validate($element, &$form_state) { $field = $element['#field']; $has_data = $element['#field_has_data']; $field_type = $field['type']; - $generate_keys = ($field_type == 'list_integer' || $field_type == 'list_float') && !$has_data; + $generate_keys = ($field_type === 'list_integer' || $field_type === 'list_float') && !$has_data; $values = list_extract_allowed_values($element['#value'], $field['type'], $generate_keys); @@ -171,15 +171,15 @@ function list_allowed_values_setting_validate($element, &$form_state) { else { // Check that keys are valid for the field type. foreach ($values as $key => $value) { - if ($field_type == 'list_integer' && !preg_match('/^-?\d+$/', $key)) { + if ($field_type === 'list_integer' && !preg_match('/^-?\d+$/', $key)) { form_error($element, t('Allowed values list: keys must be integers.')); break; } - if ($field_type == 'list_float' && !is_numeric($key)) { + if ($field_type === 'list_float' && !is_numeric($key)) { form_error($element, t('Allowed values list: each key must be a valid integer or decimal.')); break; } - elseif ($field_type == 'list_text' && drupal_strlen($key) > 255) { + elseif ($field_type === 'list_text' && drupal_strlen($key) > 255) { form_error($element, t('Allowed values list: each key must be a string at most 255 characters long.')); break; } @@ -282,9 +282,9 @@ function list_extract_allowed_values($string, $field_type, $generate_keys) { } // Otherwise see if we can use the value as the key. Detecting true integer // strings takes a little trick. - elseif ($field_type == 'list_text' - || ($field_type == 'list_float' && is_numeric($text)) - || ($field_type == 'list_integer' && is_numeric($text) && (float) $text == intval($text))) { + elseif ($field_type === 'list_text' + || ($field_type === 'list_float' && is_numeric($text)) + || ($field_type === 'list_integer' && is_numeric($text) && (float) $text === intval($text))) { $key = $value = $text; $explicit_keys = TRUE; } @@ -300,7 +300,7 @@ function list_extract_allowed_values($string, $field_type, $generate_keys) { // Float keys are represented as strings and need to be disambiguated // ('.5' is '0.5'). - if ($field_type == 'list_float' && is_numeric($key)) { + if ($field_type === 'list_float' && is_numeric($key)) { $key = (string) (float) $key; } @@ -341,7 +341,7 @@ function list_allowed_values_string($values) { * Implements hook_field_update_forbid(). */ function list_field_update_forbid($field, $prior_field, $has_data) { - if ($field['module'] == 'list' && $has_data) { + if ($field['module'] === 'list' && $has_data) { // Forbid any update that removes allowed values with actual data. $lost_keys = array_diff(array_keys($prior_field['settings']['allowed_values']), array_keys($field['settings']['allowed_values'])); if (_list_values_in_use($field, $lost_keys)) { diff --git a/core/modules/field/modules/number/number.module b/core/modules/field/modules/number/number.module index 1b9a300..3df2994 100644 --- a/core/modules/field/modules/number/number.module +++ b/core/modules/field/modules/number/number.module @@ -55,7 +55,7 @@ function number_field_settings_form($field, $instance, $has_data) { $settings = $field['settings']; $form = array(); - if ($field['type'] == 'number_decimal') { + if ($field['type'] === 'number_decimal') { $form['precision'] = array( '#type' => 'select', '#title' => t('Precision'), @@ -124,7 +124,7 @@ function number_field_instance_settings_form($field, $instance) { */ function number_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { foreach ($items as $delta => $item) { - if ($item['value'] != '') { + if ($item['value'] !== '') { if (is_numeric($instance['settings']['min']) && $item['value'] < $instance['settings']['min']) { $errors[$field['field_name']][$langcode][$delta][] = array( 'error' => 'number_min', @@ -145,7 +145,7 @@ function number_field_validate($entity_type, $entity, $field, $instance, $langco * Implements hook_field_presave(). */ function number_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) { - if ($field['type'] == 'number_decimal') { + if ($field['type'] === 'number_decimal') { // Let PHP round the value to ensure consistent behavior across storage // backends. foreach ($items as $delta => $item) { @@ -212,7 +212,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo $display = $instance['display'][$view_mode]; $settings = $display['settings']; - if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') { + if ($display['type'] === 'number_decimal' || $display['type'] === 'number_integer') { $options = array( '' => t(''), '.' => t('Decimal point'), @@ -226,7 +226,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo '#default_value' => $settings['thousand_separator'], ); - if ($display['type'] == 'number_decimal') { + if ($display['type'] === 'number_decimal') { $element['decimal_separator'] = array( '#type' => 'select', '#title' => t('Decimal marker'), @@ -260,7 +260,7 @@ function number_field_formatter_settings_summary($field, $instance, $view_mode) $settings = $display['settings']; $summary = array(); - if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') { + if ($display['type'] === 'number_decimal' || $display['type'] === 'number_integer') { $summary[] = number_format(1234.1234567890, $settings['scale'], $settings['decimal_separator'], $settings['thousand_separator']); if ($settings['prefix_suffix']) { $summary[] = t('Display with prefix and suffix.'); @@ -326,9 +326,9 @@ function number_field_widget_form(&$form, &$form_state, $field, $instance, $lang '#default_value' => $value, // Allow a slightly larger size that the field length to allow for some // configurations where all characters won't fit in input field. - '#size' => $field['type'] == 'number_decimal' ? $field['settings']['precision'] + 4 : 12, + '#size' => $field['type'] === 'number_decimal' ? $field['settings']['precision'] + 4 : 12, // Allow two extra characters for signed values and decimal separator. - '#maxlength' => $field['type'] == 'number_decimal' ? $field['settings']['precision'] + 2 : 10, + '#maxlength' => $field['type'] === 'number_decimal' ? $field['settings']['precision'] + 2 : 10, ); // Set the step for floating point and decimal numbers. diff --git a/core/modules/field/modules/options/options.module b/core/modules/field/modules/options/options.module index 04b88d8..94dfc6b 100644 --- a/core/modules/field/modules/options/options.module +++ b/core/modules/field/modules/options/options.module @@ -74,7 +74,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan $value_key = key($field['columns']); $type = str_replace('options_', '', $instance['widget']['type']); - $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED; + $multiple = $field['cardinality'] > 1 || $field['cardinality'] === FIELD_CARDINALITY_UNLIMITED; $required = $element['#required']; $has_value = isset($items[0][$value_key]); $properties = _options_properties($type, $multiple, $required, $has_value); @@ -98,7 +98,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan case 'buttons': // If required and there is one single option, preselect it. - if ($required && count($options) == 1) { + if ($required && count($options) === 1) { reset($options); $default_value = array(key($options)); } @@ -124,7 +124,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan $on_value = array_shift($keys); $element += array( '#type' => 'checkbox', - '#default_value' => (isset($default_value[0]) && $default_value[0] == $on_value) ? 1 : 0, + '#default_value' => (isset($default_value[0]) && $default_value[0] === $on_value) ? 1 : 0, '#on_value' => $on_value, '#off_value' => $off_value, ); @@ -151,7 +151,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan */ function options_field_widget_settings_form($field, $instance) { $form = array(); - if ($instance['widget']['type'] == 'options_onoff') { + if ($instance['widget']['type'] === 'options_onoff') { $form['display_label'] = array( '#type' => 'checkbox', '#title' => t('Use field label instead of the "On value" as label'), @@ -166,7 +166,7 @@ function options_field_widget_settings_form($field, $instance) { * Form element validation handler for options element. */ function options_field_widget_validate($element, &$form_state) { - if ($element['#required'] && $element['#value'] == '_none') { + if ($element['#required'] && $element['#value'] === '_none') { form_error($element, t('!name field is required.', array('!name' => $element['#title']))); } // Transpose selections from field => delta to delta => field, turning @@ -302,12 +302,12 @@ function _options_form_to_storage($element) { $properties = $element['#properties']; // On/off checkbox: transform '0 / 1' into the 'on / off' values. - if ($element['#type'] == 'checkbox') { + if ($element['#type'] === 'checkbox') { $values = array($values[0] ? $element['#on_value'] : $element['#off_value']); } // Filter out the 'none' option. Use a strict comparison, because - // 0 == 'any string'. + // 0 === 'any string'. if ($properties['empty_option']) { $index = array_search('_none', $values, TRUE); if ($index !== FALSE) { @@ -406,7 +406,7 @@ function theme_options_none($variables) { break; case 'options_select': - $output = ($option == 'option_none' ? t('- None -') : t('- Select a value -')); + $output = ($option === 'option_none' ? t('- None -') : t('- Select a value -')); break; } diff --git a/core/modules/field/modules/text/text.js b/core/modules/field/modules/text/text.js index 8527355..f8d480f 100644 --- a/core/modules/field/modules/text/text.js +++ b/core/modules/field/modules/text/text.js @@ -17,7 +17,7 @@ Drupal.behaviors.textSummary = { // Create a placeholder label when the field cardinality is // unlimited or greater than 1. - if ($fullLabel.length == 0) { + if ($fullLabel.length === 0) { $fullLabel = $('').prependTo($full); } @@ -36,7 +36,7 @@ Drupal.behaviors.textSummary = { ).appendTo($summaryLabel); // If no summary is set, hide the summary field. - if ($(this).find('.text-summary').val() == '') { + if ($(this).find('.text-summary').val() === '') { $link.click(); } return; diff --git a/core/modules/field/modules/text/text.module b/core/modules/field/modules/text/text.module index 985fa9b..90a70f8 100644 --- a/core/modules/field/modules/text/text.module +++ b/core/modules/field/modules/text/text.module @@ -64,7 +64,7 @@ function text_field_settings_form($field, $instance, $has_data) { $form = array(); - if ($field['type'] == 'text') { + if ($field['type'] === 'text') { $form['max_length'] = array( '#type' => 'number', '#title' => t('Maximum length'), @@ -96,7 +96,7 @@ function text_field_instance_settings_form($field, $instance) { t('Filtered text (user selects text format)'), ), ); - if ($field['type'] == 'text_with_summary') { + if ($field['type'] === 'text_with_summary') { $form['display_summary'] = array( '#type' => 'checkbox', '#title' => t('Summary input'), @@ -157,7 +157,7 @@ function text_field_load($entity_type, $entities, $field, $instances, $langcode, // by formatters if needed. if (empty($instances[$id]['settings']['text_processing']) || filter_format_allowcache($item['format'])) { $items[$id][$delta]['safe_value'] = isset($item['value']) ? _text_sanitize($instances[$id], $langcode, $item, 'value') : ''; - if ($field['type'] == 'text_with_summary') { + if ($field['type'] === 'text_with_summary') { $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? _text_sanitize($instances[$id], $langcode, $item, 'summary') : ''; } } @@ -262,7 +262,7 @@ function text_field_formatter_view($entity_type, $entity, $field, $instance, $la case 'text_trimmed': foreach ($items as $delta => $item) { $output = _text_sanitize($instance, $langcode, $item, 'value'); - if ($display['type'] == 'text_trimmed') { + if ($display['type'] === 'text_trimmed') { $output = text_summary($output, $instance['settings']['text_processing'] ? $item['format'] : NULL, $display['settings']['trim_length']); } $element[$delta] = array('#markup' => $output); @@ -356,7 +356,7 @@ function text_summary($text, $format = NULL, $size = NULL) { $delimiter = strpos($text, ''); // If the size is zero, and there is no delimiter, the entire body is the summary. - if ($size == 0 && $delimiter === FALSE) { + if ($size === 0 && $delimiter === FALSE) { return $text; } @@ -474,7 +474,7 @@ function text_field_widget_settings_form($field, $instance) { $widget = $instance['widget']; $settings = $widget['settings']; - if ($widget['type'] == 'text_textfield') { + if ($widget['type'] === 'text_textfield') { $form['size'] = array( '#type' => 'number', '#title' => t('Size of textfield'), diff --git a/core/modules/field/modules/text/text.test b/core/modules/field/modules/text/text.test index 0dbaccc..b5d0757 100644 --- a/core/modules/field/modules/text/text.test +++ b/core/modules/field/modules/text/text.test @@ -170,7 +170,7 @@ class TextFieldTestCase extends DrupalWebTestCase { // Disable all text formats besides the plain text fallback format. $this->drupalLogin($this->admin_user); foreach (filter_formats() as $format) { - if ($format->format != filter_fallback_format()) { + if ($format->format !== filter_fallback_format()) { $this->drupalPost('admin/config/content/formats/' . $format->format . '/disable', array(), t('Disable')); } } diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test index 8f94063..f8e5557 100644 --- a/core/modules/field/tests/field.test +++ b/core/modules/field/tests/field.test @@ -928,7 +928,7 @@ class FieldAttachOtherTestCase extends FieldAttachTestCase { } foreach ($values as $delta => $value) { - if ($value['value'] != 1) { + if ($value['value'] !== 1) { $this->assertIdentical($errors[$this->field_name][$langcode][$delta][0]['error'], 'field_test_invalid', "Error set on value $delta"); $this->assertEqual(count($errors[$this->field_name][$langcode][$delta]), 1, "Only one error set on value $delta"); unset($errors[$this->field_name][$langcode][$delta]); @@ -1010,7 +1010,7 @@ class FieldAttachOtherTestCase extends FieldAttachTestCase { asort($weights); $expected_values = array(); foreach ($weights as $key => $value) { - if ($key != 1) { + if ($key !== 1) { $expected_values[] = array('value' => $values[$key]['value']); } } @@ -2734,7 +2734,7 @@ class FieldTranslationsTestCase extends FieldTestCase { $enabled_langcodes = field_content_languages(); $available_langcodes = field_available_languages($this->entity_type, $this->field); foreach ($available_langcodes as $delta => $langcode) { - if ($langcode != 'xx' && $langcode != 'en') { + if ($langcode !== 'xx' && $langcode !== 'en') { $this->assertTrue(in_array($langcode, $enabled_langcodes), t('%language is an enabled language.', array('%language' => $langcode))); } } @@ -2745,7 +2745,7 @@ class FieldTranslationsTestCase extends FieldTestCase { $this->field['translatable'] = FALSE; field_update_field($this->field); $available_langcodes = field_available_languages($this->entity_type, $this->field); - $this->assertTrue(count($available_langcodes) == 1 && $available_langcodes[0] === LANGUAGE_NOT_SPECIFIED, t('For untranslatable fields only LANGUAGE_NOT_SPECIFIED is available.')); + $this->assertTrue(count($available_langcodes) === 1 && $available_langcodes[0] === LANGUAGE_NOT_SPECIFIED, t('For untranslatable fields only LANGUAGE_NOT_SPECIFIED is available.')); } /** @@ -2890,7 +2890,7 @@ class FieldTranslationsTestCase extends FieldTestCase { foreach ($field_translations as $langcode => $items) { $result = TRUE; foreach ($items as $delta => $item) { - $result = $result && $item['value'] == $entity->{$this->field_name}[$langcode][$delta]['value']; + $result = $result && $item['value'] === $entity->{$this->field_name}[$langcode][$delta]['value']; } $this->assertTrue($result, t('%language translation correctly handled.', array('%language' => $langcode))); } @@ -2948,7 +2948,7 @@ class FieldTranslationsTestCase extends FieldTestCase { $display_langcodes = field_language($entity_type, $entity, NULL, $requested_langcode); foreach ($instances as $instance) { $field_name = $instance['field_name']; - $this->assertTrue($display_langcodes[$field_name] == LANGUAGE_NOT_SPECIFIED, t('The display language for field %field_name is %language.', array('%field_name' => $field_name, '%language' => LANGUAGE_NOT_SPECIFIED))); + $this->assertTrue($display_langcodes[$field_name] === LANGUAGE_NOT_SPECIFIED, t('The display language for field %field_name is %language.', array('%field_name' => $field_name, '%language' => LANGUAGE_NOT_SPECIFIED))); } // Test multiple-fields display languages for translatable entities. @@ -2962,13 +2962,13 @@ class FieldTranslationsTestCase extends FieldTestCase { // As the requested language was not assinged to any field, if the // returned language is defined for the current field, core fallback rules // were successfully applied. - $this->assertTrue(isset($entity->{$field_name}[$langcode]) && $langcode != $requested_langcode, t('The display language for the field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode))); + $this->assertTrue(isset($entity->{$field_name}[$langcode]) && $langcode !== $requested_langcode, t('The display language for the field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode))); } // Test single-field display language. drupal_static_reset('field_language'); $langcode = field_language($entity_type, $entity, $this->field_name, $requested_langcode); - $this->assertTrue(isset($entity->{$this->field_name}[$langcode]) && $langcode != $requested_langcode, t('The display language for the (single) field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode))); + $this->assertTrue(isset($entity->{$this->field_name}[$langcode]) && $langcode !== $requested_langcode, t('The display language for the (single) field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode))); // Test field_language() basic behavior without language fallback. variable_set('field_test_language_fallback', FALSE); @@ -3018,7 +3018,7 @@ class FieldTranslationsTestCase extends FieldTestCase { $field_name = $this->field['field_name']; $entity = field_test_entity_test_load($eid, $evid); foreach ($available_langcodes as $langcode => $value) { - $passed = isset($entity->{$field_name}[$langcode]) && $entity->{$field_name}[$langcode][0]['value'] == $value + 1; + $passed = isset($entity->{$field_name}[$langcode]) && $entity->{$field_name}[$langcode][0]['value'] === $value + 1; $this->assertTrue($passed, t('The @language translation for revision @revision was correctly stored', array('@language' => $langcode, '@revision' => $entity->ftvid))); } } @@ -3089,7 +3089,7 @@ class FieldBulkDeleteTestCase extends FieldTestCase { foreach ($invocations as $argument) { $found = FALSE; foreach ($actual_invocations as $actual_arguments) { - if ($actual_arguments[1] == $argument) { + if ($actual_arguments[1] === $argument) { $found = TRUE; break; } diff --git a/core/modules/field/tests/field_test.field.inc b/core/modules/field/tests/field_test.field.inc index cc76a99..30aa536 100644 --- a/core/modules/field/tests/field_test.field.inc +++ b/core/modules/field/tests/field_test.field.inc @@ -49,7 +49,7 @@ function field_test_field_info() { * Implements hook_field_update_forbid(). */ function field_test_field_update_forbid($field, $prior_field, $has_data) { - if ($field['type'] == 'test_field' && $field['settings']['unchangeable'] != $prior_field['settings']['unchangeable']) { + if ($field['type'] === 'test_field' && $field['settings']['unchangeable'] !== $prior_field['settings']['unchangeable']) { throw new FieldException("field_test 'unchangeable' setting cannot be changed'"); } } @@ -110,7 +110,7 @@ function field_test_field_validate($entity_type, $entity, $field, $instance, $la field_test_memorize(__FUNCTION__, $args); foreach ($items as $delta => $item) { - if ($item['value'] == -1) { + if ($item['value'] === -1) { $errors[$field['field_name']][$langcode][$delta][] = array( 'error' => 'field_test_invalid', 'message' => t('%name does not accept the value -1.', array('%name' => $instance['label'])), @@ -348,7 +348,7 @@ function field_test_field_formatter_prepare_view($entity_type, $entities, $field foreach ($items as $id => $item) { // To keep the test non-intrusive, only act on the // 'field_test_with_prepare_view' formatter. - if ($displays[$id]['type'] == 'field_test_with_prepare_view') { + if ($displays[$id]['type'] === 'field_test_with_prepare_view') { foreach ($item as $delta => $value) { // Don't add anything on empty values. if ($value) { @@ -404,7 +404,7 @@ function field_test_default_value($entity_type, $entity, $field, $instance) { * Implements hook_field_access(). */ function field_test_field_access($op, $field, $entity_type, $entity, $account) { - if ($field['field_name'] == "field_no_{$op}_access") { + if ($field['field_name'] === "field_no_{$op}_access") { return FALSE; } return TRUE; diff --git a/core/modules/field/tests/field_test.install b/core/modules/field/tests/field_test.install index 5957561..9368d79 100644 --- a/core/modules/field/tests/field_test.install +++ b/core/modules/field/tests/field_test.install @@ -117,7 +117,7 @@ function field_test_schema() { * Implements hook_field_schema(). */ function field_test_field_schema($field) { - if ($field['type'] == 'test_field') { + if ($field['type'] === 'test_field') { return array( 'columns' => array( 'value' => array( diff --git a/core/modules/field/tests/field_test.module b/core/modules/field/tests/field_test.module index 90e25c8..be9bb81 100644 --- a/core/modules/field/tests/field_test.module +++ b/core/modules/field/tests/field_test.module @@ -232,7 +232,7 @@ function field_test_field_attach_view_alter(&$output, $context) { */ function field_test_field_widget_properties_alter(&$widget, $context) { // Make the alter_test_text field 42 characters for nodes and comments. - if (in_array($context['entity_type'], array('node', 'comment')) && ($context['field']['field_name'] == 'alter_test_text')) { + if (in_array($context['entity_type'], array('node', 'comment')) && ($context['field']['field_name'] === 'alter_test_text')) { $widget['settings']['size'] = 42; } } @@ -242,7 +242,7 @@ function field_test_field_widget_properties_alter(&$widget, $context) { */ function field_test_field_widget_properties_user_alter(&$widget, $context) { // Always use buttons for the alter_test_options field on user forms. - if ($context['field']['field_name'] == 'alter_test_options') { + if ($context['field']['field_name'] === 'alter_test_options') { $widget['type'] = 'options_buttons'; } } diff --git a/core/modules/field/tests/field_test.storage.inc b/core/modules/field/tests/field_test.storage.inc index eaa0851..a053e98 100644 --- a/core/modules/field/tests/field_test.storage.inc +++ b/core/modules/field/tests/field_test.storage.inc @@ -49,7 +49,7 @@ function field_test_field_storage_details($field) { function field_test_field_storage_details_alter(&$details, $field) { // For testing, storage details are changed only because of the field name. - if ($field['field_name'] == 'field_test_change_my_details') { + if ($field['field_name'] === 'field_test_change_my_details') { $columns = array(); foreach ((array) $field['columns'] as $column_name => $attributes) { $columns[$column_name] = $column_name; @@ -83,7 +83,7 @@ function _field_test_storage_data($data = NULL) { function field_test_field_storage_load($entity_type, $entities, $age, $fields, $options) { $data = _field_test_storage_data(); - $load_current = $age == FIELD_LOAD_CURRENT; + $load_current = $age === FIELD_LOAD_CURRENT; foreach ($fields as $field_id => $ids) { $field = field_info_field_by_id($field_id); @@ -92,13 +92,13 @@ function field_test_field_storage_load($entity_type, $entities, $age, $fields, $ $sub_table = $load_current ? 'current' : 'revisions'; $delta_count = array(); foreach ($field_data[$sub_table] as $row) { - if ($row->type == $entity_type && (!$row->deleted || $options['deleted'])) { + if ($row->type === $entity_type && (!$row->deleted || $options['deleted'])) { if (($load_current && in_array($row->entity_id, $ids)) || (!$load_current && in_array($row->revision_id, $ids))) { if (in_array($row->langcode, field_available_languages($entity_type, $field))) { if (!isset($delta_count[$row->entity_id][$row->langcode])) { $delta_count[$row->entity_id][$row->langcode] = 0; } - if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) { + if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) { $item = array(); foreach ($field['columns'] as $column => $attributes) { $item[$column] = $row->{$column}; @@ -130,19 +130,19 @@ function field_test_field_storage_write($entity_type, $entity, $op, $fields) { $field_langcodes = array_intersect($all_langcodes, array_keys((array) $entity->$field_name)); // Delete and insert, rather than update, in case a value was added. - if ($op == FIELD_STORAGE_UPDATE) { + if ($op === FIELD_STORAGE_UPDATE) { // Delete languages present in the incoming $entity->$field_name. // Delete all languages if $entity->$field_name is empty. $langcodes = !empty($entity->$field_name) ? $field_langcodes : $all_langcodes; if ($langcodes) { foreach ($field_data['current'] as $key => $row) { - if ($row->type == $entity_type && $row->entity_id == $id && in_array($row->langcode, $langcodes)) { + if ($row->type === $entity_type && $row->entity_id === $id && in_array($row->langcode, $langcodes)) { unset($field_data['current'][$key]); } } if (isset($vid)) { foreach ($field_data['revisions'] as $key => $row) { - if ($row->type == $entity_type && $row->revision_id == $vid) { + if ($row->type === $entity_type && $row->revision_id === $vid) { unset($field_data['revisions'][$key]); } } @@ -173,7 +173,7 @@ function field_test_field_storage_write($entity_type, $entity, $op, $fields) { $field_data['revisions'][] = $row; } - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) { + if ($field['cardinality'] !== FIELD_CARDINALITY_UNLIMITED && ++$delta_count === $field['cardinality']) { break; } } @@ -210,7 +210,7 @@ function field_test_field_storage_purge($entity_type, $entity, $field, $instance $field_data = &$data[$field['id']]; foreach (array('current', 'revisions') as $sub_table) { foreach ($field_data[$sub_table] as $key => $row) { - if ($row->type == $entity_type && $row->entity_id == $id) { + if ($row->type === $entity_type && $row->entity_id === $id) { unset($field_data[$sub_table][$key]); } } @@ -230,7 +230,7 @@ function field_test_field_storage_delete_revision($entity_type, $entity, $fields $field_data = &$data[$field_id]; foreach (array('current', 'revisions') as $sub_table) { foreach ($field_data[$sub_table] as $key => $row) { - if ($row->type == $entity_type && $row->entity_id == $id && $row->revision_id == $vid) { + if ($row->type === $entity_type && $row->entity_id === $id && $row->revision_id === $vid) { unset($field_data[$sub_table][$key]); } } @@ -246,7 +246,7 @@ function field_test_field_storage_delete_revision($entity_type, $entity, $fields function field_test_field_storage_query($field_id, $conditions, $count, &$cursor = NULL, $age) { $data = _field_test_storage_data(); - $load_current = $age == FIELD_LOAD_CURRENT; + $load_current = $age === FIELD_LOAD_CURRENT; $field = field_info_field_by_id($field_id); $field_columns = array_keys($field['columns']); @@ -265,11 +265,11 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor $skipped = 0; foreach ($field_data[$sub_table] as $row) { - if ($count != FIELD_QUERY_NO_LIMIT && $entity_count >= $count) { + if ($count !== FIELD_QUERY_NO_LIMIT && $entity_count >= $count) { break; } - if ($row->field_id == $field['id']) { + if ($row->field_id === $field['id']) { $match = TRUE; $condition_deleted = FALSE; // Add conditions. @@ -280,7 +280,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor } switch ($operator) { case '=': - $match = $match && $row->{$column} == $value; + $match = $match && $row->{$column} === $value; break; case '<>': case '<': @@ -306,7 +306,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor break; } // Track condition on 'deleted'. - if ($column == 'deleted') { + if ($column === 'deleted') { $condition_deleted = TRUE; } } @@ -337,7 +337,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor $rows_count++; // The query is complete if we walked the whole array. - if ($count != FIELD_QUERY_NO_LIMIT && $rows_count >= $rows_total) { + if ($count !== FIELD_QUERY_NO_LIMIT && $rows_count >= $rows_total) { $cursor = FIELD_QUERY_COMPLETE; } } @@ -351,8 +351,8 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor * Sorts by entity type and entity id. */ function _field_test_field_storage_query_sort_helper($a, $b) { - if ($a->type == $b->type) { - if ($a->entity_id == $b->entity_id) { + if ($a->type === $b->type) { + if ($a->entity_id === $b->entity_id) { return 0; } else { @@ -368,7 +368,7 @@ function _field_test_field_storage_query_sort_helper($a, $b) { * Implements hook_field_storage_create_field(). */ function field_test_field_storage_create_field($field) { - if ($field['storage']['type'] == 'field_test_storage_failure') { + if ($field['storage']['type'] === 'field_test_storage_failure') { throw new Exception('field_test_storage_failure engine always fails to create fields'); } @@ -408,7 +408,7 @@ function field_test_field_storage_delete_instance($instance) { $field_data = &$data[$field['id']]; foreach (array('current', 'revisions') as $sub_table) { foreach ($field_data[$sub_table] as &$row) { - if ($row->bundle == $instance['bundle']) { + if ($row->bundle === $instance['bundle']) { $row->deleted = TRUE; } } @@ -434,11 +434,11 @@ function field_test_field_attach_rename_bundle($bundle_old, $bundle_new) { $instances = field_read_instances(array('bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE)); foreach ($instances as $field_name => $instance) { $field = field_info_field_by_id($instance['field_id']); - if ($field['storage']['type'] == 'field_test_storage') { + if ($field['storage']['type'] === 'field_test_storage') { $field_data = &$data[$field['id']]; foreach (array('current', 'revisions') as $sub_table) { foreach ($field_data[$sub_table] as &$row) { - if ($row->bundle == $bundle_old) { + if ($row->bundle === $bundle_old) { $row->bundle = $bundle_new; } } @@ -457,11 +457,11 @@ function field_test_field_attach_delete_bundle($entity_type, $bundle, $instances foreach ($instances as $field_name => $instance) { $field = field_info_field($field_name); - if ($field['storage']['type'] == 'field_test_storage') { + if ($field['storage']['type'] === 'field_test_storage') { $field_data = &$data[$field['id']]; foreach (array('current', 'revisions') as $sub_table) { foreach ($field_data[$sub_table] as &$row) { - if ($row->bundle == $bundle_old) { + if ($row->bundle === $bundle_old) { $row->deleted = TRUE; } } diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc index c22fe21..36f7251 100644 --- a/core/modules/field_ui/field_ui.admin.inc +++ b/core/modules/field_ui/field_ui.admin.inc @@ -120,7 +120,7 @@ function field_ui_display_overview_row_region($row) { switch ($row['#row_type']) { case 'field': case 'extra_field': - return ($row['format']['type']['#value'] == 'hidden' ? 'hidden' : 'visible'); + return ($row['format']['type']['#value'] === 'hidden' ? 'hidden' : 'visible'); } } @@ -267,7 +267,7 @@ function theme_field_ui_table($variables) { foreach (element_children($element) as $cell_key) { $child = &$element[$cell_key]; // Do not render a cell for children of #type 'value'. - if (!(isset($child['#type']) && $child['#type'] == 'value')) { + if (!(isset($child['#type']) && $child['#type'] === 'value')) { $cell = array('data' => drupal_render($child)); if (isset($child['#cell_attributes'])) { $cell += $child['#cell_attributes']; @@ -1048,7 +1048,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund '#field_name' => $name, ); - if ($form_state['formatter_settings_edit'] == $name) { + if ($form_state['formatter_settings_edit'] === $name) { // We are currently editing this field's formatter settings. Display the // settings form and submit buttons. $table[$name]['format']['settings_edit_form'] = array(); @@ -1174,7 +1174,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund $form['fields'] = $table; // Custom display settings. - if ($view_mode == 'default') { + if ($view_mode === 'default') { $form['modes'] = array( '#type' => 'fieldset', '#title' => t('Custom display settings'), @@ -1365,12 +1365,12 @@ function field_ui_display_overview_form_submit($form, &$form_state) { foreach ($form['#extra'] as $name) { $bundle_settings['extra_fields']['display'][$name][$view_mode] = array( 'weight' => $form_values['fields'][$name]['weight'], - 'visible' => $form_values['fields'][$name]['type'] == 'visible', + 'visible' => $form_values['fields'][$name]['type'] === 'visible', ); } // Save view modes data. - if ($view_mode == 'default') { + if ($view_mode === 'default') { $entity_info = entity_get_info($entity_type); foreach ($form_values['view_modes_custom'] as $view_mode_name => $value) { // Display a message for each view mode newly configured to use custom @@ -1535,7 +1535,7 @@ function field_ui_existing_field_options($entity_type, $bundle) { foreach (field_info_instances() as $existing_entity_type => $bundles) { foreach ($bundles as $existing_bundle => $instances) { // No need to look in the current bundle. - if (!($existing_bundle == $bundle && $existing_entity_type == $entity_type)) { + if (!($existing_bundle === $bundle && $existing_entity_type === $entity_type)) { foreach ($instances as $instance) { $field = field_info_field($instance['field_name']); // Don't show @@ -1912,7 +1912,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) { } // Add handling for default value if not provided by any other module. - if (field_behaviors_widget('default value', $instance) == FIELD_BEHAVIOR_DEFAULT && empty($instance['default_value_function'])) { + if (field_behaviors_widget('default value', $instance) === FIELD_BEHAVIOR_DEFAULT && empty($instance['default_value_function'])) { $form['instance']['default_value_widget'] = field_ui_default_value_widget($field, $instance, $form, $form_state); } @@ -1936,7 +1936,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) { // Build the configurable field values. $description = t('Maximum number of values users can enter for this field.'); - if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) { + if (field_behaviors_widget('multiple values', $instance) === FIELD_BEHAVIOR_DEFAULT) { $description .= '
      ' . t("'Unlimited' will provide an 'Add more' button so the users can add as many values as they like."); } $form['field']['cardinality'] = array( diff --git a/core/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php index b6c8aee..c8e39fc 100644 --- a/core/modules/field_ui/field_ui.api.php +++ b/core/modules/field_ui/field_ui.api.php @@ -74,7 +74,7 @@ function hook_field_instance_settings_form($field, $instance) { t('Filtered text (user selects text format)'), ), ); - if ($field['type'] == 'text_with_summary') { + if ($field['type'] === 'text_with_summary') { $form['display_summary'] = array( '#type' => 'select', '#title' => t('Display summary'), @@ -108,7 +108,7 @@ function hook_field_widget_settings_form($field, $instance) { $widget = $instance['widget']; $settings = $widget['settings']; - if ($widget['type'] == 'text_textfield') { + if ($widget['type'] === 'text_textfield') { $form['size'] = array( '#type' => 'number', '#title' => t('Size of textfield'), @@ -154,7 +154,7 @@ function hook_field_formatter_settings_form($field, $instance, $view_mode, $form $element = array(); - if ($display['type'] == 'text_trimmed' || $display['type'] == 'text_summary_or_trimmed') { + if ($display['type'] === 'text_trimmed' || $display['type'] === 'text_summary_or_trimmed') { $element['trim_length'] = array( '#title' => t('Length'), '#type' => 'number', @@ -192,7 +192,7 @@ function hook_field_formatter_settings_summary($field, $instance, $view_mode) { $summary = ''; - if ($display['type'] == 'text_trimmed' || $display['type'] == 'text_summary_or_trimmed') { + if ($display['type'] === 'text_trimmed' || $display['type'] === 'text_summary_or_trimmed') { $summary = t('Length: @chars chars', array('@chars' => $settings['trim_length'])); } diff --git a/core/modules/field_ui/field_ui.js b/core/modules/field_ui/field_ui.js index 6de5c15..8f129a1 100644 --- a/core/modules/field_ui/field_ui.js +++ b/core/modules/field_ui/field_ui.js @@ -52,11 +52,11 @@ Drupal.fieldUIFieldOverview = { this.targetTextfield .data('field_ui_edited', false) .bind('keyup', function (e) { - $(this).data('field_ui_edited', $(this).val() != ''); + $(this).data('field_ui_edited', $(this).val() !== ''); }); $this.bind('change keyup', function (e, updateText) { - var updateText = (typeof updateText == 'undefined' ? true : updateText); + var updateText = (typeof updateText === 'undefined' ? true : updateText); var selectedField = this.options[this.selectedIndex].value; var selectedFieldType = (selectedField in fields ? fields[selectedField].type : null); var selectedFieldWidget = (selectedField in fields ? fields[selectedField].widget : null); @@ -83,7 +83,7 @@ Drupal.fieldUIFieldOverview = { jQuery.fn.fieldUIPopulateOptions = function (options, selected) { return this.each(function () { var disabled = false; - if (options.length == 0) { + if (options.length === 0) { options = [this.initialValue]; disabled = true; } @@ -97,7 +97,7 @@ jQuery.fn.fieldUIPopulateOptions = function (options, selected) { jQuery.each(options, function (value, text) { // Figure out which value should be selected. The 'selected' param // takes precedence. - var is_selected = ((typeof selected != 'undefined' && value == selected) || (typeof selected == 'undefined' && text == previousSelectedText)); + var is_selected = ((typeof selected !== 'undefined' && value === selected) || (typeof selected === 'undefined' && text === previousSelectedText)); html += ''; }); @@ -152,7 +152,7 @@ Drupal.fieldUIOverview = { // Handle region change. var region = rowHandler.getRegion(); - if (region != rowHandler.region) { + if (region !== rowHandler.region) { // Remove parenting. $row.find('select.field-parent').val(''); // Let the row handler deal with the region change. @@ -177,7 +177,7 @@ Drupal.fieldUIOverview = { var regionRow = $row.prevAll('tr.region-message').get(0); var region = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); - if (region != rowHandler.region) { + if (region !== rowHandler.region) { // Let the row handler deal with the region change. var refreshRows = rowHandler.regionChange(region); // Update the row region. @@ -204,14 +204,14 @@ Drupal.fieldUIOverview = { var $this = $(this); // If the dragged row is in this region, but above the message row, swap // it down one space. - if ($this.prev('tr').get(0) == rowObject.group[rowObject.group.length - 1]) { + if ($this.prev('tr').get(0) === rowObject.group[rowObject.group.length - 1]) { // Prevent a recursion problem when using the keyboard to move rows up. - if ((rowObject.method != 'keyboard' || rowObject.direction == 'down')) { + if ((rowObject.method !== 'keyboard' || rowObject.direction === 'down')) { rowObject.swap('after', this); } } // This region has become empty. - if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length == 0) { + if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) { $this.removeClass('region-populated').addClass('region-empty'); } // This region has become populated. @@ -298,7 +298,7 @@ Drupal.fieldUIDisplayOverview.field.prototype = { * Returns the region corresponding to the current form values of the row. */ getRegion: function () { - return (this.$formatSelect.val() == 'hidden') ? 'hidden' : 'visible'; + return (this.$formatSelect.val() === 'hidden') ? 'hidden' : 'visible'; }, /** @@ -325,10 +325,10 @@ Drupal.fieldUIDisplayOverview.field.prototype = { var currentValue = this.$formatSelect.val(); switch (region) { case 'visible': - if (currentValue == 'hidden') { + if (currentValue === 'hidden') { // Restore the formatter back to the default formatter. Pseudo-fields do // not have default formatters, we just return to 'visible' for those. - var value = (this.defaultFormatter != undefined) ? this.defaultFormatter : 'visible'; + var value = (this.defaultFormatter !== undefined) ? this.defaultFormatter : 'visible'; } break; @@ -336,7 +336,7 @@ Drupal.fieldUIDisplayOverview.field.prototype = { var value = 'hidden'; break; } - if (value != undefined) { + if (value !== undefined) { this.$formatSelect.val(value); } diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index c75005a..b233218 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -179,8 +179,8 @@ function field_ui_menu() { // rules for the bundle admin pages. 'access callback' => '_field_ui_view_mode_menu_access', 'access arguments' => array_merge(array($entity_type, $bundle_arg, $view_mode, $access['access callback']), $access['access arguments']), - 'type' => ($view_mode == 'default' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK), - 'weight' => ($view_mode == 'default' ? -10 : $weight++), + 'type' => ($view_mode === 'default' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK), + 'weight' => ($view_mode === 'default' ? -10 : $weight++), 'file' => 'field_ui.admin.inc', ); } @@ -255,7 +255,7 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc // setting for the view mode. $bundle = field_extract_bundle($entity_type, $bundle); $view_mode_settings = field_view_mode_settings($entity_type, $bundle); - $visibility = ($view_mode == 'default') || !empty($view_mode_settings[$view_mode]['custom_settings']); + $visibility = ($view_mode === 'default') || !empty($view_mode_settings[$view_mode]['custom_settings']); // Then, determine access according to the $access parameter. This duplicates // part of _menu_check_access(). @@ -269,8 +269,8 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc else { // As call_user_func_array() is quite slow and user_access is a very // common callback, it is worth making a special case for it. - if ($access_callback == 'user_access') { - return (count($args) == 1) ? user_access($args[0]) : user_access($args[0], $args[1]); + if ($access_callback === 'user_access') { + return (count($args) === 1) ? user_access($args[0]) : user_access($args[0], $args[1]); } else { return call_user_func_array($access_callback, $args); diff --git a/core/modules/field_ui/field_ui.test b/core/modules/field_ui/field_ui.test index 9b71064..718e44b 100644 --- a/core/modules/field_ui/field_ui.test +++ b/core/modules/field_ui/field_ui.test @@ -301,12 +301,12 @@ class FieldUIManageFieldsTestCase extends FieldUITestCase { _field_info_collate_fields_reset(); // Assert field settings. $field = field_info_field($field_name); - $this->assertTrue($field['settings']['test_field_setting'] == $string, t('Field settings were found.')); + $this->assertTrue($field['settings']['test_field_setting'] === $string, t('Field settings were found.')); // Assert instance and widget settings. $instance = field_info_instance($entity_type, $field_name, $bundle); - $this->assertTrue($instance['settings']['test_instance_setting'] == $string, t('Field instance settings were found.')); - $this->assertTrue($instance['widget']['settings']['test_widget_setting'] == $string, t('Field widget settings were found.')); + $this->assertTrue($instance['settings']['test_instance_setting'] === $string, t('Field instance settings were found.')); + $this->assertTrue($instance['widget']['settings']['test_widget_setting'] === $string, t('Field widget settings were found.')); } /** diff --git a/core/modules/file/file.api.php b/core/modules/file/file.api.php index 7f20d83..8df8c14 100644 --- a/core/modules/file/file.api.php +++ b/core/modules/file/file.api.php @@ -27,7 +27,7 @@ * @see hook_field_access(). */ function hook_file_download_access($field, $entity_type, $entity) { - if ($entity_type == 'node') { + if ($entity_type === 'node') { return node_access('view', $entity); } } diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc index a1a2ef9..fb1b76b 100644 --- a/core/modules/file/file.field.inc +++ b/core/modules/file/file.field.inc @@ -351,7 +351,7 @@ function file_field_delete_file($item, $field, $entity_type, $id, $count = 1) { // are not yet associated with any content at all. $file = (object) $item; $file_usage = file_usage_list($file); - if ($file->status == 0 || !empty($file_usage['file'])) { + if ($file->status === 0 || !empty($file_usage['file'])) { file_usage_delete($file, 'file', $entity_type, $id, $count); return file_delete($file); } @@ -480,7 +480,7 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco '#extended' => TRUE, ); - if ($field['cardinality'] == 1) { + if ($field['cardinality'] === 1) { // Set the default value. $element['#default_value'] = !empty($items) ? $items[0] : $defaults; // If there's only one field, return it as delta 0. @@ -499,11 +499,11 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco } // And then add one more empty row for new uploads except when this is a // programmed form as it is not necessary. - if (($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta < $field['cardinality']) && empty($form_state['programmed'])) { + if (($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta < $field['cardinality']) && empty($form_state['programmed'])) { $elements[$delta] = $element; $elements[$delta]['#default_value'] = $defaults; $elements[$delta]['#weight'] = $delta; - $elements[$delta]['#required'] = ($element['#required'] && $delta == 0); + $elements[$delta]['#required'] = ($element['#required'] && $delta === 0); } // The group of elements all-together need some extra functionality // after building up the full list (like draggable table rows). @@ -656,7 +656,7 @@ function file_field_widget_process($element, &$form_state, $form) { // Adjust the Ajax settings so that on upload and remove of any individual // file, the entire group of file fields is updated together. - if ($field['cardinality'] != 1) { + if ($field['cardinality'] !== 1) { $parents = array_slice($element['#array_parents'], 0, -1); $new_path = 'file/ajax/' . implode('/', $parents) . '/' . $form['form_build_id']['#value']; $field_element = drupal_array_get_nested_value($form, $parents); @@ -695,7 +695,7 @@ function file_field_widget_process_multiple($element, &$form_state, $form) { $count = count($element_children); foreach ($element_children as $delta => $key) { - if ($key != $element['#file_upload_delta']) { + if ($key !== $element['#file_upload_delta']) { $description = _file_field_get_description_from_element($element[$key]); $element[$key]['_weight'] = array( '#type' => 'weight', @@ -807,7 +807,7 @@ function theme_file_widget($variables) { // The "form-managed-file" class is required for proper Ajax functionality. $output .= '
      '; - if ($element['fid']['#value'] != 0) { + if ($element['fid']['#value'] !== 0) { // Add the file size after the file name. $element['filename']['#markup'] .= ' (' . format_size($element['#file']->filesize) . ') '; } @@ -856,7 +856,7 @@ function theme_file_widget_multiple($variables) { $rows = array(); foreach ($widgets as $key => &$widget) { // Save the uploading row for last. - if ($widget['#file'] == FALSE) { + if ($widget['#file'] === FALSE) { $widget['#title'] = $element['#file_upload_title']; $widget['#description'] = $element['#file_upload_description']; continue; @@ -866,7 +866,7 @@ function theme_file_widget_multiple($variables) { // "operations" column. $operations_elements = array(); foreach (element_children($widget) as $sub_key) { - if (isset($widget[$sub_key]['#type']) && $widget[$sub_key]['#type'] == 'submit') { + if (isset($widget[$sub_key]['#type']) && $widget[$sub_key]['#type'] === 'submit') { hide($widget[$sub_key]); $operations_elements[] = &$widget[$sub_key]; } @@ -953,7 +953,7 @@ function theme_file_upload_help($variables) { if (isset($upload_validators['file_validate_image_resolution'])) { $max = $upload_validators['file_validate_image_resolution'][0]; $min = $upload_validators['file_validate_image_resolution'][1]; - if ($min && $max && $min == $max) { + if ($min && $max && $min === $max) { $descriptions[] = t('Images must be exactly !size pixels.', array('!size' => '' . $max . '')); } elseif ($min && $max) { diff --git a/core/modules/file/file.install b/core/modules/file/file.install index dff930b..8d6bf56 100644 --- a/core/modules/file/file.install +++ b/core/modules/file/file.install @@ -52,7 +52,7 @@ function file_requirements($phase) { $requirements = array(); // Check the server's ability to indicate upload progress. - if ($phase == 'runtime') { + if ($phase === 'runtime') { $implementation = file_progress_implementation(); $apache = strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== FALSE; $fastcgi = strpos($_SERVER['SERVER_SOFTWARE'], 'mod_fastcgi') !== FALSE || strpos($_SERVER["SERVER_SOFTWARE"], 'mod_fcgi') !== FALSE; @@ -77,12 +77,12 @@ function file_requirements($phase) { $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.'); $severity = REQUIREMENT_INFO; } - elseif ($implementation == 'apc') { + elseif ($implementation === 'apc') { $value = t('Enabled (APC RFC1867)'); $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.'); $severity = REQUIREMENT_OK; } - elseif ($implementation == 'uploadprogress') { + elseif ($implementation === 'uploadprogress') { $value = t('Enabled (PECL uploadprogress)'); $severity = REQUIREMENT_OK; } diff --git a/core/modules/file/file.module b/core/modules/file/file.module index a2a5a80..5bf5381 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -147,7 +147,7 @@ function file_file_download($uri, $field_type = 'file') { // temporary files where the host entity has not yet been saved (for example, // an image preview on a node/add form) in which case, allow download by the // file's owner. - if (empty($references) && ($file->status == FILE_STATUS_PERMANENT || $file->uid != $user->uid)) { + if (empty($references) && ($file->status === FILE_STATUS_PERMANENT || $file->uid !== $user->uid)) { return; } @@ -172,7 +172,7 @@ function file_file_download($uri, $field_type = 'file') { // Find the field item with the matching URI. foreach ($field_items as $field_item) { - if ($field_item['uri'] == $uri) { + if ($field_item['uri'] === $uri) { $field = field_info_field($field_name); break; } @@ -237,7 +237,7 @@ function file_ajax_upload() { $form_parents = func_get_args(); $form_build_id = (string) array_pop($form_parents); - if (empty($_POST['form_build_id']) || $form_build_id != $_POST['form_build_id']) { + if (empty($_POST['form_build_id']) || $form_build_id !== $_POST['form_build_id']) { // Invalid request. drupal_set_message(t('An unrecoverable error occurred. The uploaded file likely exceeded the maximum file size (@size) that this server supports.', array('@size' => format_size(file_upload_max_size()))), 'error'); $commands = array(); @@ -301,14 +301,14 @@ function file_ajax_progress($key) { ); $implementation = file_progress_implementation(); - if ($implementation == 'uploadprogress') { + if ($implementation === 'uploadprogress') { $status = uploadprogress_get_info($key); if (isset($status['bytes_uploaded']) && !empty($status['bytes_total'])) { $progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['bytes_uploaded']), '@total' => format_size($status['bytes_total']))); $progress['percentage'] = round(100 * $status['bytes_uploaded'] / $status['bytes_total']); } } - elseif ($implementation == 'apc') { + elseif ($implementation === 'apc') { $status = apc_fetch('upload_' . $key); if (isset($status['current']) && !empty($status['total'])) { $progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['current']), '@total' => format_size($status['total']))); @@ -390,7 +390,7 @@ function file_managed_file_process($element, &$form_state, $form) { // Force the progress indicator for the remove button to be either 'none' or // 'throbber', even if the upload button is using something else. - $ajax_settings['progress']['type'] = ($element['#progress_indicator'] == 'none') ? 'none' : 'throbber'; + $ajax_settings['progress']['type'] = ($element['#progress_indicator'] === 'none') ? 'none' : 'throbber'; $ajax_settings['progress']['message'] = NULL; $ajax_settings['effect'] = 'none'; $element['remove_button'] = array( @@ -410,10 +410,10 @@ function file_managed_file_process($element, &$form_state, $form) { ); // Add progress bar support to the upload if possible. - if ($element['#progress_indicator'] == 'bar' && $implementation = file_progress_implementation()) { + if ($element['#progress_indicator'] === 'bar' && $implementation = file_progress_implementation()) { $upload_progress_key = mt_rand(); - if ($implementation == 'uploadprogress') { + if ($implementation === 'uploadprogress') { $element['UPLOAD_IDENTIFIER'] = array( '#type' => 'hidden', '#value' => $upload_progress_key, @@ -423,7 +423,7 @@ function file_managed_file_process($element, &$form_state, $form) { '#weight' => -20, ); } - elseif ($implementation == 'apc') { + elseif ($implementation === 'apc') { $element['APC_UPLOAD_PROGRESS'] = array( '#type' => 'hidden', '#value' => $upload_progress_key, @@ -554,9 +554,9 @@ function file_managed_file_validate(&$element, &$form_state) { // references. This prevents unmanaged files from being deleted if this // item were to be deleted. $clicked_button = end($form_state['triggering_element']['#parents']); - if ($clicked_button != 'remove_button' && !empty($element['fid']['#value'])) { + if ($clicked_button !== 'remove_button' && !empty($element['fid']['#value'])) { if ($file = file_load($element['fid']['#value'])) { - if ($file->status == FILE_STATUS_PERMANENT) { + if ($file->status === FILE_STATUS_PERMANENT) { $references = file_usage_list($file); if (empty($references)) { form_error($element, t('The file used in the !name field may not be referenced.', array('!name' => $element['#title']))); @@ -595,10 +595,10 @@ function file_managed_file_submit($form, &$form_state) { // the form are processed by file_managed_file_value() regardless of which // button was clicked. Action is needed here for the remove button, because we // only remove a file in response to its remove button being clicked. - if ($button_key == 'remove_button') { + if ($button_key === 'remove_button') { // If it's a temporary file we can safely remove it immediately, otherwise // it's up to the implementing module to clean up files that are in use. - if ($element['#file'] && $element['#file']->status == 0) { + if ($element['#file'] && $element['#file']->status === 0) { file_delete($element['#file']); } // Update both $form_state['values'] and $form_state['input'] to reflect @@ -1003,7 +1003,7 @@ function file_get_file_references($file, $field = NULL, $age = FIELD_LOAD_REVISI $fields = isset($field) ? array($field['field_name'] => $field) : field_info_fields(); foreach ($fields as $field_name => $file_field) { - if ((empty($field_type) || $file_field['type'] == $field_type) && !isset($references[$field_name])) { + if ((empty($field_type) || $file_field['type'] === $field_type) && !isset($references[$field_name])) { // Get each time this file is used within a field. $query = new EntityFieldQuery(); $query diff --git a/core/modules/file/tests/file.test b/core/modules/file/tests/file.test index 05083fc..1450a41 100644 --- a/core/modules/file/tests/file.test +++ b/core/modules/file/tests/file.test @@ -218,7 +218,7 @@ class FileFieldTestCase extends DrupalWebTestCase { */ function assertFileIsPermanent($file, $message = NULL) { $message = isset($message) ? $message : t('File %file is permanent.', array('%file' => $file->uri)); - $this->assertTrue($file->status == FILE_STATUS_PERMANENT, $message); + $this->assertTrue($file->status === FILE_STATUS_PERMANENT, $message); } } @@ -446,7 +446,7 @@ class FileFieldWidgetTestCase extends FileFieldTestCase { foreach ($buttons as $i => $button) { $key = $i >= $remaining ? $i - $remaining : $i; $check_field_name = $field_name2; - if ($current_field_name == $field_name && $i < $remaining) { + if ($current_field_name === $field_name && $i < $remaining) { $check_field_name = $field_name; } @@ -465,7 +465,7 @@ class FileFieldWidgetTestCase extends FileFieldTestCase { // data, and since drupalPost() will result in $this being updated // with a newly rebuilt form, this doesn't cause problems. foreach ($buttons as $button) { - if ($button['name'] != $button_name) { + if ($button['name'] !== $button_name) { $button['value'] = 'DUMMY'; } } @@ -484,12 +484,12 @@ class FileFieldWidgetTestCase extends FileFieldTestCase { // correct name. $upload_button_name = $current_field_name . '_' . LANGUAGE_NOT_SPECIFIED . '_' . $remaining . '_upload_button'; $buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', array(':name' => $upload_button_name)); - $this->assertTrue(is_array($buttons) && count($buttons) == 1, t('The upload button is displayed with the correct name (JSMode=%type).', array('%type' => $type))); + $this->assertTrue(is_array($buttons) && count($buttons) === 1, t('The upload button is displayed with the correct name (JSMode=%type).', array('%type' => $type))); // Ensure only at most one button per field is displayed. $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]'); - $expected = $current_field_name == $field_name ? 1 : 2; - $this->assertTrue(is_array($buttons) && count($buttons) == $expected, t('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', array('%type' => $type))); + $expected = $current_field_name === $field_name ? 1 : 2; + $this->assertTrue(is_array($buttons) && count($buttons) === $expected, t('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', array('%type' => $type))); } } diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc index 40a5eab..ed0fbbb 100644 --- a/core/modules/filter/filter.admin.inc +++ b/core/modules/filter/filter.admin.inc @@ -20,7 +20,7 @@ function filter_admin_overview($form) { foreach ($formats as $id => $format) { // Check whether this is the fallback text format. This format is available // to all roles and cannot be disabled via the admin interface. - $form['formats'][$id]['#is_fallback'] = ($id == $fallback_format); + $form['formats'][$id]['#is_fallback'] = ($id === $fallback_format); if ($form['formats'][$id]['#is_fallback']) { $form['formats'][$id]['name'] = array('#markup' => drupal_placeholder($format->name)); $roles_markup = drupal_placeholder(t('All roles may use this format')); @@ -116,7 +116,7 @@ function filter_admin_format_page($format = NULL) { * @see filter_admin_format_form_submit() */ function filter_admin_format_form($form, &$form_state, $format) { - $is_fallback = ($format->format == filter_fallback_format()); + $is_fallback = ($format->format === filter_fallback_format()); $form['#format'] = $format; $form['#tree'] = TRUE; diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 5fe4caa..dd77cde 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -142,7 +142,7 @@ function filter_menu() { */ function _filter_disable_format_access($format) { // The fallback format can never be disabled. - return user_access('administer filters') && ($format->format != filter_fallback_format()); + return user_access('administer filters') && ($format->format !== filter_fallback_format()); } /** @@ -250,7 +250,7 @@ function filter_format_save($format) { ->execute(); } - if ($return == SAVED_NEW) { + if ($return === SAVED_NEW) { module_invoke_all('filter_format_insert', $format); } else { @@ -355,7 +355,7 @@ function filter_permission() { * is malformed or is the fallback format (which is available to all users). */ function filter_permission_name($format) { - if (isset($format->format) && $format->format != filter_fallback_format()) { + if (isset($format->format) && $format->format !== filter_fallback_format()) { return 'use text format ' . $format->format; } return FALSE; @@ -448,7 +448,7 @@ function filter_formats_reset() { */ function filter_get_roles_by_format($format) { // Handle the fallback format upfront (all roles have access to this format). - if ($format->format == filter_fallback_format()) { + if ($format->format === filter_fallback_format()) { return user_roles(); } // Do not list any roles if the permission does not exist. @@ -923,7 +923,7 @@ function filter_process_format($element) { // Hide the text format selector and any other child element (such as text // field's summary). foreach (element_children($element) as $key) { - if ($key != 'value') { + if ($key !== 'value') { $element[$key]['#access'] = FALSE; } } @@ -988,7 +988,7 @@ function filter_access($format, $account = NULL) { } // Handle special cases up front. All users have access to the fallback // format. - if ($format->format == filter_fallback_format()) { + if ($format->format === filter_fallback_format()) { return TRUE; } // Check the permission if one exists; otherwise, we have a non-existent @@ -1009,7 +1009,7 @@ function _filter_tips($format_id, $long = FALSE) { $tips = array(); // If only listing one format, extract it from the $formats array. - if ($format_id != -1) { + if ($format_id !== -1) { $formats = array($formats[$format_id]); } @@ -1105,7 +1105,7 @@ function filter_dom_serialize($dom_document) { */ function filter_dom_serialize_escape_cdata_element($dom_document, $dom_element, $comment_start = '//', $comment_end = '') { foreach ($dom_element->childNodes as $node) { - if (get_class($node) == 'DOMCdataSection') { + if (get_class($node) === 'DOMCdataSection') { // See drupal_get_js(). This code is more or less duplicated there. $embed_prefix = "\n{$comment_end}\n"; @@ -1449,9 +1449,9 @@ function _filter_url($text, $filter) { $open_tag = ''; for ($i = 0; $i < count($chunks); $i++) { - if ($chunk_type == 'text') { + if ($chunk_type === 'text') { // Only process this text if there are no unclosed $ignore_tags. - if ($open_tag == '') { + if ($open_tag === '') { // If there is a match, inject a link into this chunk via the callback // function contained in $task. $chunks[$i] = preg_replace_callback($pattern, $task, $chunks[$i]); @@ -1461,7 +1461,7 @@ function _filter_url($text, $filter) { } else { // Only process this tag if there are no unclosed $ignore_tags. - if ($open_tag == '') { + if ($open_tag === '') { // Check whether this tag is contained in $ignore_tags. if (preg_match("`<($ignore_tags)(?:\s|>)`i", $chunks[$i], $matches)) { $open_tag = $matches[1]; @@ -1615,14 +1615,14 @@ function _filter_autop($text) { $output = ''; foreach ($chunks as $i => $chunk) { if ($i % 2) { - $comment = (substr($chunk, 0, 4) == '