Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.118
diff -u -r1.118 node.pages.inc
--- modules/node/node.pages.inc 18 Mar 2010 06:50:37 -0000 1.118
+++ modules/node/node.pages.inc 23 Mar 2010 21:23:20 -0000
@@ -62,7 +62,7 @@
// If a node type has been specified, validate its existence.
if (isset($types[$type])) {
// Initialize settings:
- $node = (object)array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'language' => LANGUAGE_NONE);
+ $node = (object) array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'language' => LANGUAGE_NONE);
drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
$output = drupal_get_form($type . '_node_form', $node);
@@ -72,7 +72,7 @@
}
function node_form_validate($form, &$form_state) {
- $node = (object)$form_state['values'];
+ $node = (object) $form_state['values'];
node_validate($node, $form);
// Field validation. Requires access to $form_state, so this cannot be
@@ -91,7 +91,7 @@
}
if (isset($form_state['node'])) {
- $node = (object)($form_state['node'] + (array)$node);
+ $node = (object) ($form_state['node'] + (array) $node);
}
if (isset($form_state['node_preview'])) {
$form['#prefix'] = $form_state['node_preview'];
@@ -407,11 +407,11 @@
// functions to process the form values into an updated node.
unset($form_state['submit_handlers']);
form_execute_handlers('submit', $form, $form_state);
- $node = node_submit((object)$form_state['values']);
+ $node = node_submit((object) $form_state['values']);
field_attach_submit('node', $node, $form, $form_state);
- $form_state['node'] = (array)$node;
+ $form_state['node'] = (array) $node;
$form_state['rebuild'] = TRUE;
return $node;
}
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1248
diff -u -r1.1248 node.module
--- modules/node/node.module 21 Mar 2010 21:20:43 -0000 1.1248
+++ modules/node/node.module 23 Mar 2010 21:23:19 -0000
@@ -1351,7 +1351,7 @@
}
// Flatten the node object's member fields.
- $variables = array_merge((array)$node, $variables);
+ $variables = array_merge((array) $node, $variables);
// Helpful $content variable for templates.
foreach (element_children($variables['elements']) as $key) {
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.76
diff -u -r1.76 node.test
--- modules/node/node.test 6 Mar 2010 06:39:00 -0000 1.76
+++ modules/node/node.test 23 Mar 2010 21:23:21 -0000
@@ -942,7 +942,7 @@
'nid' => $test_nid,
'is_new' => TRUE,
);
- $node = node_submit((object)$node);
+ $node = node_submit((object) $node);
// Verify that node_submit did not overwrite the user ID.
$this->assertEqual($node->uid, $this->web_user->uid, t('Function node_submit() preserves user ID'));
@@ -1569,7 +1569,7 @@
}
catch (Exception $e) {
$this->fail($e->getMessage());
- $this->fail((string)$query);
+ $this->fail((string) $query);
$this->fail(t('Altered query is malformed'));
}
}
Index: modules/field/tests/field_test.entity.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/tests/field_test.entity.inc,v
retrieving revision 1.4
diff -u -r1.4 field_test.entity.inc
--- modules/field/tests/field_test.entity.inc 12 Feb 2010 05:38:10 -0000 1.4
+++ modules/field/tests/field_test.entity.inc 23 Mar 2010 21:23:17 -0000
@@ -242,9 +242,9 @@
*/
function field_test_entity_form($form, &$form_state, $entity, $add = FALSE) {
if (isset($form_state['test_entity'])) {
- $entity = $form_state['test_entity'] + (array)$entity;
+ $entity = $form_state['test_entity'] + (array) $entity;
}
- $entity = (object)$entity;
+ $entity = (object) $entity;
foreach (array('ftid', 'ftvid', 'fttype') as $key) {
$form[$key] = array(
@@ -312,7 +312,7 @@
$entity->revision = !empty($form_state['values']['revision']);
field_attach_submit('test_entity', $entity, $form, $form_state);
- $form_state['test_entity'] = (array)$entity;
+ $form_state['test_entity'] = (array) $entity;
$form_state['rebuild'] = TRUE;
return $entity;
Index: modules/field/tests/field.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/tests/field.test,v
retrieving revision 1.22
diff -u -r1.22 field.test
--- modules/field/tests/field.test 21 Mar 2010 21:31:34 -0000 1.22
+++ modules/field/tests/field.test 23 Mar 2010 21:23:17 -0000
@@ -1563,7 +1563,7 @@
// We'll need three slightly different formats to check the values.
$values[$delta] = $value;
$weights[$delta] = $weight;
- $field_values[$weight]['value'] = (string)$value;
+ $field_values[$weight]['value'] = (string) $value;
$pattern[$weight] = "]*value=\"$value\" [^>]*";
}
@@ -1631,7 +1631,7 @@
// We'll need three slightly different formats to check the values.
$values[$delta] = $value;
$weights[$delta] = $weight;
- $field_values[$weight]['value'] = (string)$value;
+ $field_values[$weight]['value'] = (string) $value;
$pattern[$weight] = "]*value=\"$value\" [^>]*";
}
// Press 'add more' button through AJAX, and place the expected HTML result
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.262
diff -u -r1.262 system.admin.inc
--- modules/system/system.admin.inc 7 Mar 2010 07:36:27 -0000 1.262
+++ modules/system/system.admin.inc 23 Mar 2010 21:23:27 -0000
@@ -2465,7 +2465,7 @@
REQUIREMENT_WARNING => 'warning',
REQUIREMENT_ERROR => 'error',
);
- $class = $classes[isset($requirement['severity']) ? (int)$requirement['severity'] : 0] . ' ' . $class;
+ $class = $classes[isset($requirement['severity']) ? (int) $requirement['severity'] : 0] . ' ' . $class;
// Output table row(s)
if (!empty($requirement['description'])) {
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.579
diff -u -r1.579 taxonomy.module
--- modules/taxonomy/taxonomy.module 8 Mar 2010 17:50:40 -0000 1.579
+++ modules/taxonomy/taxonomy.module 23 Mar 2010 21:23:28 -0000
@@ -432,7 +432,7 @@
foreach ($tree as $term) {
// Update the changed term with the new parent value before comparison.
if ($term->tid == $changed_term['tid']) {
- $term = (object)$changed_term;
+ $term = (object) $changed_term;
$term->parents = $term->parent;
}
// Check this term's parent count.
@@ -618,7 +618,7 @@
$variables['page'] = taxonomy_term_is_page($term);
// Flatten the term object's member fields.
- $variables = array_merge((array)$term, $variables);
+ $variables = array_merge((array) $term, $variables);
// Helpful $content variable for templates.
foreach (element_children($variables['elements']) as $key) {
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.96
diff -u -r1.96 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc 18 Mar 2010 06:36:39 -0000 1.96
+++ modules/taxonomy/taxonomy.admin.inc 23 Mar 2010 21:23:28 -0000
@@ -96,7 +96,7 @@
*/
function taxonomy_form_vocabulary($form, &$form_state, $edit = array()) {
if (!is_array($edit)) {
- $edit = (array)$edit;
+ $edit = (array) $edit;
}
$edit += array(
'name' => '',
@@ -346,7 +346,7 @@
// Build the actual form.
foreach ($current_page as $key => $term) {
// Save the term for the current page so we don't have to load it a second time.
- $form[$key]['#term'] = (array)$term;
+ $form[$key]['#term'] = (array) $term;
if (isset($term->parents)) {
$form[$key]['#term']['parent'] = $term->parent = $term->parents[0];
unset($form[$key]['#term']['parents'], $term->parents);
@@ -437,7 +437,7 @@
// Build a list of all terms that need to be updated on previous pages.
$weight = 0;
- $term = (array)$tree[0];
+ $term = (array) $tree[0];
while ($term['tid'] != $form['#first_tid']) {
if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
$term['parent'] = $term['parents'][0];
@@ -446,7 +446,7 @@
}
$weight++;
$hierarchy = $term['parents'][0] != 0 ? 1 : $hierarchy;
- $term = (array)$tree[$weight];
+ $term = (array) $tree[$weight];
}
// Renumber the current page weights and assign any new parents.
@@ -479,7 +479,7 @@
// Build a list of all terms that need to be updated on following pages.
for ($weight; $weight < count($tree); $weight++) {
- $term = (array)$tree[$weight];
+ $term = (array) $tree[$weight];
if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
$term['parent'] = $term['parents'][0];
$term['weight'] = $weight;
@@ -490,7 +490,7 @@
// Save all updated terms.
foreach ($changed_terms as $changed) {
- $term = (object)$changed;
+ $term = (object) $changed;
// Update term_hierachy and term_data directly since we don't have a
// fully populated term object to save.
db_update('taxonomy_term_hierarchy')
@@ -608,7 +608,7 @@
function taxonomy_form_term($form, &$form_state, $edit = array(), $vocabulary = NULL) {
if (!isset($vocabulary) && is_object($edit)) {
$vocabulary = taxonomy_vocabulary_load($edit->vid);
- $edit = (array)$edit;
+ $edit = (array) $edit;
}
$edit += array(
'name' => '',
@@ -826,7 +826,7 @@
$term = (object) $form_state['values'];
field_attach_submit('taxonomy_term', $term, $form, $form_state);
- $form_state['term'] = (array)$term;
+ $form_state['term'] = (array) $term;
$form_state['rebuild'] = TRUE;
return $term;
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.537
diff -u -r1.537 book.module
--- modules/book/book.module 30 Jan 2010 04:23:46 -0000 1.537
+++ modules/book/book.module 23 Mar 2010 21:23:11 -0000
@@ -536,7 +536,7 @@
'#title' => t('Book'),
'#default_value' => $node->book['bid'],
'#options' => $options,
- '#access' => (bool)$options,
+ '#access' => (bool) $options,
'#description' => t('Your page will be a part of the selected book.'),
'#weight' => -5,
'#attributes' => array('class' => array('book-title-select')),
Index: includes/database/mysql/query.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/mysql/query.inc,v
retrieving revision 1.14
diff -u -r1.14 query.inc
--- includes/database/mysql/query.inc 11 Oct 2009 13:43:36 -0000 1.14
+++ includes/database/mysql/query.inc 23 Mar 2010 21:23:10 -0000
@@ -34,7 +34,7 @@
$values = $this->fromQuery->getArguments();
}
- $last_insert_id = $this->connection->query((string)$this, $values, $this->queryOptions);
+ $last_insert_id = $this->connection->query((string) $this, $values, $this->queryOptions);
// Re-initialize the values array so that we can re-use this query.
$this->insertValues = array();
@@ -140,7 +140,7 @@
//
// @link http ://dev.mysql.com/doc/refman/5.0/en/mysql-affected-rows.html
$this->queryOptions['return'] = Database::RETURN_AFFECTED;
- return $this->connection->query((string)$this, $values, $this->queryOptions);
+ return $this->connection->query((string) $this, $values, $this->queryOptions);
}
Index: modules/field/modules/text/text.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v
retrieving revision 1.50
diff -u -r1.50 text.module
--- modules/field/modules/text/text.module 8 Mar 2010 03:59:25 -0000 1.50
+++ modules/field/modules/text/text.module 23 Mar 2010 21:23:15 -0000
@@ -220,7 +220,7 @@
* Implements hook_field_is_empty().
*/
function text_field_is_empty($item, $field) {
- if (empty($item['value']) && (string)$item['value'] !== '0') {
+ if (empty($item['value']) && (string) $item['value'] !== '0') {
return TRUE;
}
return FALSE;
Index: includes/database/pgsql/query.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/pgsql/query.inc,v
retrieving revision 1.16
diff -u -r1.16 query.inc
--- includes/database/pgsql/query.inc 11 Sep 2009 02:47:11 -0000 1.16
+++ includes/database/pgsql/query.inc 23 Mar 2010 21:23:10 -0000
@@ -19,7 +19,7 @@
return NULL;
}
- $stmt = $this->connection->prepareQuery((string)$this);
+ $stmt = $this->connection->prepareQuery((string) $this);
// Fetch the list of blobs and sequences used on that table.
$table_information = $this->connection->schema()->queryTableInformation($this->table);
@@ -121,7 +121,7 @@
// Because we filter $fields the same way here and in __toString(), the
// placeholders will all match up properly.
- $stmt = $this->connection->prepareQuery((string)$this);
+ $stmt = $this->connection->prepareQuery((string) $this);
// Fetch the list of blobs and sequences used on that table.
$table_information = $this->connection->schema()->queryTableInformation($this->table);
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.382
diff -u -r1.382 menu.inc
--- includes/menu.inc 12 Mar 2010 05:14:14 -0000 1.382
+++ includes/menu.inc 23 Mar 2010 21:23:06 -0000
@@ -570,7 +570,7 @@
$callback = empty($item['access_callback']) ? 0 : trim($item['access_callback']);
// Check for a TRUE or FALSE value.
if (is_numeric($callback)) {
- $item['access'] = (bool)$callback;
+ $item['access'] = (bool) $callback;
}
else {
$arguments = menu_unserialize($item['access_arguments'], $map);
@@ -969,7 +969,7 @@
// Use $mlid as a flag for whether the data being loaded is for the whole tree.
$mlid = isset($link['mlid']) ? $link['mlid'] : 0;
// Generate a cache ID (cid) specific for this $menu_name, $link, $language, and depth.
- $cid = 'links:' . $menu_name . ':all-cid:' . $mlid . ':' . $GLOBALS['language']->language . ':' . (int)$max_depth;
+ $cid = 'links:' . $menu_name . ':all-cid:' . $mlid . ':' . $GLOBALS['language']->language . ':' . (int) $max_depth;
if (!isset($tree[$cid])) {
// If the static variable doesn't have the data, check {cache_menu}.
@@ -1081,7 +1081,7 @@
$max_depth = min($max_depth, MENU_MAX_DEPTH);
}
// Generate a cache ID (cid) specific for this page.
- $cid = 'links:' . $menu_name . ':page-cid:' . $item['href'] . ':' . $GLOBALS['language']->language . ':' . (int)$item['access'] . ':' . (int)$max_depth;
+ $cid = 'links:' . $menu_name . ':page-cid:' . $item['href'] . ':' . $GLOBALS['language']->language . ':' . (int) $item['access'] . ':' . (int) $max_depth;
if (!isset($tree[$cid])) {
// If the static variable doesn't have the data, check {cache_menu}.
@@ -2121,7 +2121,7 @@
// Make sure the current page is in the trail (needed for the page title),
// but exclude tabs and the front page.
$last = count($trail) - 1;
- if ($trail[$last]['href'] != $item['href'] && !(bool)($item['type'] & MENU_IS_LOCAL_TASK) && !drupal_is_front_page()) {
+ if ($trail[$last]['href'] != $item['href'] && !(bool) ($item['type'] & MENU_IS_LOCAL_TASK) && !drupal_is_front_page()) {
$trail[] = $item;
}
}
@@ -2172,7 +2172,7 @@
$active_trail = menu_get_active_trail();
foreach (array_reverse($active_trail) as $item) {
- if (!(bool)($item['type'] & MENU_IS_LOCAL_TASK)) {
+ if (!(bool) ($item['type'] & MENU_IS_LOCAL_TASK)) {
return $item['title'];
}
}
@@ -3083,8 +3083,8 @@
'_fit' => $fit,
);
$item += array(
- '_visible' => (bool)($item['type'] & MENU_VISIBLE_IN_BREADCRUMB),
- '_tab' => (bool)($item['type'] & MENU_IS_LOCAL_TASK),
+ '_visible' => (bool) ($item['type'] & MENU_VISIBLE_IN_BREADCRUMB),
+ '_tab' => (bool) ($item['type'] & MENU_IS_LOCAL_TASK),
);
if ($move) {
$new_path = implode('/', $item['_parts']);
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.442
diff -u -r1.442 form.inc
--- includes/form.inc 13 Mar 2010 22:33:05 -0000 1.442
+++ includes/form.inc 23 Mar 2010 21:23:04 -0000
@@ -462,7 +462,7 @@
* $form_state['values']['body'] = 'This is the body text!';
* $form_state['values']['name'] = 'robo-user';
* $form_state['values']['op'] = t('Save');
- * drupal_form_submit('story_node_form', $form_state, (object)$node);
+ * drupal_form_submit('story_node_form', $form_state, (object) $node);
* @endcode
*/
function drupal_form_submit($form_id, &$form_state) {
@@ -1751,7 +1751,7 @@
*/
function form_type_token_value($element, $input = FALSE) {
if ($input !== FALSE) {
- return (string)$input;
+ return (string) $input;
}
}
@@ -1886,8 +1886,8 @@
$options .= form_select_options($element, $choice->option);
}
else {
- $key = (string)$key;
- if ($value_valid && (!$value_is_array && (string)$element['#value'] === $key || ($value_is_array && in_array($key, $element['#value'])))) {
+ $key = (string) $key;
+ if ($value_valid && (!$value_is_array && (string) $element['#value'] === $key || ($value_is_array && in_array($key, $element['#value'])))) {
$selected = ' selected="selected"';
}
else {
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.584
diff -u -r1.584 theme.inc
--- includes/theme.inc 21 Mar 2010 04:05:23 -0000 1.584
+++ includes/theme.inc 23 Mar 2010 21:23:08 -0000
@@ -1966,7 +1966,7 @@
}
}
else {
- $variables['uid'] = (int)$account->uid;
+ $variables['uid'] = (int) $account->uid;
}
// Set the name to a formatted name that is safe for printing and
Index: includes/stream_wrappers.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/stream_wrappers.inc,v
retrieving revision 1.12
diff -u -r1.12 stream_wrappers.inc
--- includes/stream_wrappers.inc 6 Feb 2010 05:49:35 -0000 1.12
+++ includes/stream_wrappers.inc 23 Mar 2010 21:23:06 -0000
@@ -336,11 +336,11 @@
$path = $this->getLocalPath();
$this->handle = ($options & STREAM_REPORT_ERRORS) ? fopen($path, $mode) : @fopen($path, $mode);
- if ((bool)$this->handle && $options & STREAM_USE_PATH) {
+ if ((bool) $this->handle && $options & STREAM_USE_PATH) {
$opened_url = $path;
}
- return (bool)$this->handle;
+ return (bool) $this->handle;
}
/**
@@ -506,7 +506,7 @@
*/
public function mkdir($uri, $mode, $options) {
$this->uri = $uri;
- $recursive = (bool)($options & STREAM_MKDIR_RECURSIVE);
+ $recursive = (bool) ($options & STREAM_MKDIR_RECURSIVE);
if ($recursive) {
// $this->getLocalPath() fails if $uri has multiple levels of directories
// that do not yet exist.
@@ -581,7 +581,7 @@
$this->uri = $uri;
$this->handle = opendir($this->getLocalPath());
- return (bool)$this->handle;
+ return (bool) $this->handle;
}
/**
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.365
diff -u -r1.365 bootstrap.inc
--- includes/bootstrap.inc 21 Mar 2010 16:53:36 -0000 1.365
+++ includes/bootstrap.inc 23 Mar 2010 21:23:02 -0000
@@ -2398,7 +2398,7 @@
if ($lookup_cache[$cache_key]) {
require DRUPAL_ROOT . '/' . $lookup_cache[$cache_key];
}
- return (bool)$lookup_cache[$cache_key];
+ return (bool) $lookup_cache[$cache_key];
}
// This function may get called when the default database is not active, but
Index: includes/actions.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/actions.inc,v
retrieving revision 1.36
diff -u -r1.36 actions.inc
--- includes/actions.inc 7 Mar 2010 07:22:41 -0000 1.36
+++ includes/actions.inc 23 Mar 2010 21:23:00 -0000
@@ -166,7 +166,7 @@
}
// See module_implements() for an explanation of this cast.
- return (array)$actions;
+ return (array) $actions;
}
/**
Index: includes/pager.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/pager.inc,v
retrieving revision 1.78
diff -u -r1.78 pager.inc
--- includes/pager.inc 5 Dec 2009 20:17:02 -0000 1.78
+++ includes/pager.inc 23 Mar 2010 21:23:06 -0000
@@ -85,7 +85,7 @@
// We calculate the total of pages as ceil(items / limit).
$pager_total_items[$this->element] = $this->getCountQuery()->execute()->fetchField();
$pager_total[$this->element] = ceil($pager_total_items[$this->element] / $this->limit);
- $pager_page_array[$this->element] = max(0, min((int)$pager_page_array[$this->element], ((int)$pager_total[$this->element]) - 1));
+ $pager_page_array[$this->element] = max(0, min((int) $pager_page_array[$this->element], ((int) $pager_total[$this->element]) - 1));
$pager_limits[$this->element] = $this->limit;
$this->range($pager_page_array[$this->element] * $this->limit, $this->limit);
@@ -546,6 +546,6 @@
}
}
// Update the changed element.
- $new_array[$element] = (int)$value;
+ $new_array[$element] = (int) $value;
return $new_array;
}
Index: includes/xmlrpc.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/xmlrpc.inc,v
retrieving revision 1.64
diff -u -r1.64 xmlrpc.inc
--- includes/xmlrpc.inc 31 Dec 2009 13:43:36 -0000 1.64
+++ includes/xmlrpc.inc 23 Mar 2010 21:23:08 -0000
@@ -261,7 +261,7 @@
// 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'))) {
- $value = (string)$xmlrpc_message->current_tag_contents;
+ $value = (string) $xmlrpc_message->current_tag_contents;
$value_flag = TRUE;
}
unset($xmlrpc_message->last_open);
Index: includes/database/select.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/select.inc,v
retrieving revision 1.34
diff -u -r1.34 select.inc
--- includes/database/select.inc 17 Feb 2010 05:24:53 -0000 1.34
+++ includes/database/select.inc 23 Mar 2010 21:23:10 -0000
@@ -727,7 +727,7 @@
}
public function __toString() {
- return (string)$this->query;
+ return (string) $this->query;
}
public function __clone() {
@@ -1085,7 +1085,7 @@
}
$args = $this->getArguments();
- return $this->connection->query((string)$this, $args, $this->queryOptions);
+ return $this->connection->query((string) $this, $args, $this->queryOptions);
}
public function distinct($distinct = TRUE) {
@@ -1319,7 +1319,7 @@
// If the table is a subquery, compile it and integrate it into this query.
if ($table['table'] instanceof SelectQueryInterface) {
- $table_string = '(' . (string)$table['table'] . ')';
+ $table_string = '(' . (string) $table['table'] . ')';
}
else {
$table_string = '{' . $this->connection->escapeTable($table['table']) . '}';
Index: includes/database/query.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/query.inc,v
retrieving revision 1.43
diff -u -r1.43 query.inc
--- includes/database/query.inc 1 Mar 2010 11:30:37 -0000 1.43
+++ includes/database/query.inc 23 Mar 2010 21:23:09 -0000
@@ -468,7 +468,7 @@
// If we're selecting from a SelectQuery, finish building the query and
// pass it back, as any remaining options are irrelevant.
if (!empty($this->fromQuery)) {
- $sql = (string)$this;
+ $sql = (string) $this;
// The SelectQuery may contain arguments, load and pass them through.
return $this->connection->query($sql, $this->fromQuery->getArguments(), $this->queryOptions);
}
@@ -479,7 +479,7 @@
// we wrap it in a transaction so that it is atomic where possible. On many
// databases, such as SQLite, this is also a notable performance boost.
$transaction = $this->connection->startTransaction();
- $sql = (string)$this;
+ $sql = (string) $this;
foreach ($this->insertValues as $insert_values) {
$last_insert_id = $this->connection->query($sql, $insert_values, $this->queryOptions);
}
@@ -806,7 +806,7 @@
}
$select = $select->countQuery();
- $sql = (string)$select;
+ $sql = (string) $select;
$arguments = $select->getArguments();
$num_existing = $this->connection->query($sql, $arguments)->fetchField();
@@ -922,7 +922,7 @@
$values = $this->condition->arguments();
}
- return $this->connection->query((string)$this, $values, $this->queryOptions);
+ return $this->connection->query((string) $this, $values, $this->queryOptions);
}
public function __toString() {
@@ -962,7 +962,7 @@
}
public function execute() {
- return $this->connection->query((string)$this, array(), $this->queryOptions);
+ return $this->connection->query((string) $this, array(), $this->queryOptions);
}
public function __toString() {
@@ -1122,7 +1122,7 @@
$update_values = array_merge($update_values, $this->condition->arguments());
}
- return $this->connection->query((string)$this, $update_values, $this->queryOptions);
+ return $this->connection->query((string) $this, $update_values, $this->queryOptions);
}
public function __toString() {
@@ -1244,7 +1244,7 @@
if ($condition['field'] instanceof QueryConditionInterface) {
// Compile the sub-condition recursively and add it to the list.
$condition['field']->compile($connection, $queryPlaceholder);
- $condition_fragments[] = '(' . (string)$condition['field'] . ')';
+ $condition_fragments[] = '(' . (string) $condition['field'] . ')';
$arguments += $condition['field']->arguments();
}
else {
@@ -1266,7 +1266,7 @@
$placeholders = array();
if ($condition['value'] instanceof SelectQueryInterface) {
$condition['value']->compile($connection, $queryPlaceholder);
- $placeholders[] = (string)$condition['value'];
+ $placeholders[] = (string) $condition['value'];
$arguments += $condition['value']->arguments();
}
// We assume that if there is a delimiter, then the value is an
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1142
diff -u -r1.1142 user.module
--- modules/user/user.module 22 Mar 2010 18:55:45 -0000 1.1142
+++ modules/user/user.module 23 Mar 2010 21:23:31 -0000
@@ -1371,7 +1371,7 @@
}
function user_is_logged_in() {
- return (bool)$GLOBALS['user']->uid;
+ return (bool) $GLOBALS['user']->uid;
}
function user_register_access() {
@@ -2947,8 +2947,8 @@
}
function _user_sort($a, $b) {
- $a = (array)$a + array('weight' => 0, 'title' => '');
- $b = (array)$b + array('weight' => 0, 'title' => '');
+ $a = (array) $a + array('weight' => 0, 'title' => '');
+ $b = (array) $b + array('weight' => 0, 'title' => '');
return $a['weight'] < $b['weight'] ? -1 : ($a['weight'] > $b['weight'] ? 1 : ($a['title'] < $b['title'] ? -1 : 1));
}
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.102
diff -u -r1.102 user.admin.inc
--- modules/user/user.admin.inc 21 Mar 2010 21:20:43 -0000 1.102
+++ modules/user/user.admin.inc 23 Mar 2010 21:23:29 -0000
@@ -875,7 +875,7 @@
}
function user_admin_role_submit($form, &$form_state) {
- $role = (object)$form_state['values'];
+ $role = (object) $form_state['values'];
if ($form_state['values']['op'] == t('Save role')) {
user_role_save($role);
drupal_set_message(t('The role has been renamed.'));
Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.68
diff -u -r1.68 user.pages.inc
--- modules/user/user.pages.inc 28 Feb 2010 20:10:34 -0000 1.68
+++ modules/user/user.pages.inc 23 Mar 2010 21:23:32 -0000
@@ -277,7 +277,7 @@
* Validation function for the user account and profile editing form.
*/
function user_profile_form_validate($form, &$form_state) {
- $edit = (object)$form_state['values'];
+ $edit = (object) $form_state['values'];
field_attach_form_validate('user', $edit, $form, $form_state);
}
@@ -290,9 +290,9 @@
// Remove unneeded values.
form_state_values_clean($form_state);
- $edit = (object)$form_state['values'];
+ $edit = (object) $form_state['values'];
field_attach_submit('user', $edit, $form, $form_state);
- $edit = (array)$edit;
+ $edit = (array) $edit;
user_save($account, $edit, $category);
$form_state['values']['uid'] = $account->uid;
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.853
diff -u -r1.853 comment.module
--- modules/comment/comment.module 12 Mar 2010 15:56:29 -0000 1.853
+++ modules/comment/comment.module 23 Mar 2010 21:23:12 -0000
@@ -408,7 +408,7 @@
* Implements hook_block_save().
*/
function comment_block_save($delta = '', $edit = array()) {
- variable_set('comment_block_count', (int)$edit['comment_block_count']);
+ variable_set('comment_block_count', (int) $edit['comment_block_count']);
}
/**
@@ -2060,7 +2060,7 @@
$comment['subject'] = t('(No subject)');
}
}
- return (object)$comment;
+ return (object) $comment;
}
/**
@@ -2071,7 +2071,7 @@
field_attach_submit('comment', $comment, $form, $form_state);
- $form_state['comment'] = (array)$comment;
+ $form_state['comment'] = (array) $comment;
$form_state['rebuild'] = TRUE;
return $comment;
}
@@ -2319,7 +2319,7 @@
* 31000, 31001, ...
*/
function int2vancode($i = 0) {
- $num = base_convert((int)$i, 10, 36);
+ $num = base_convert((int) $i, 10, 36);
$length = strlen($num);
return chr($length + ord('0') - 1) . $num;
Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.71
diff -u -r1.71 comment.test
--- modules/comment/comment.test 7 Mar 2010 23:14:20 -0000 1.71
+++ modules/comment/comment.test 23 Mar 2010 21:23:13 -0000
@@ -1208,15 +1208,15 @@
$comment_container = $this->xpath("//div[contains(@class, 'comment') and contains(@typeof, 'sioct:Comment')]");
$this->assertTrue(!empty($comment_container), t('Comment RDF type for comment found.'));
$comment_title = $this->xpath("//div[contains(@class, 'comment') and contains(@typeof, 'sioct:Comment')]//h3[@property='dc:title']");
- $this->assertEqual((string)$comment_title[0]->a, $comment->subject, t('RDFa markup for the comment title found.'));
+ $this->assertEqual((string) $comment_title[0]->a, $comment->subject, t('RDFa markup for the comment title found.'));
$comment_date = $this->xpath("//div[contains(@class, 'comment') and contains(@typeof, 'sioct:Comment')]//*[contains(@property, 'dc:date') and contains(@property, 'dc:created')]");
$this->assertTrue(!empty($comment_date), t('RDFa markup for the date of the comment found.'));
// The author tag can be either a or span
$comment_author = $this->xpath("//div[contains(@class, 'comment') and contains(@typeof, 'sioct:Comment')]//span[@rel='sioc:has_creator']/*[contains(@class, 'username') and @typeof='sioc:User' and @property='foaf:name']");
$name = empty($account['name']) ? $this->web_user->name : $account['name'] . ' (not verified)';
- $this->assertEqual((string)$comment_author[0], $name, t('RDFa markup for the comment author found.'));
+ $this->assertEqual((string) $comment_author[0], $name, t('RDFa markup for the comment author found.'));
$comment_body = $this->xpath("//div[contains(@class, 'comment') and contains(@typeof, 'sioct:Comment')]//div[@class='content']//div[contains(@class, 'comment-body')]//div[@property='content:encoded']");
- $this->assertEqual((string)$comment_body[0]->p, $comment->comment, t('RDFa markup for the comment body found.'));
+ $this->assertEqual((string) $comment_body[0]->p, $comment->comment, t('RDFa markup for the comment body found.'));
}
}
Index: modules/simpletest/tests/system_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/system_test.module,v
retrieving revision 1.25
diff -u -r1.25 system_test.module
--- modules/simpletest/tests/system_test.module 17 Feb 2010 22:44:52 -0000 1.25
+++ modules/simpletest/tests/system_test.module 23 Mar 2010 21:23:25 -0000
@@ -115,7 +115,7 @@
}
function system_test_redirect($code) {
- $code = (int)$code;
+ $code = (int) $code;
if ($code != 200) {
header("Location: " . url('system-test/redirect/200', array('absolute' => TRUE)), TRUE, $code);
exit;
Index: modules/simpletest/tests/ajax_forms_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/ajax_forms_test.module,v
retrieving revision 1.4
diff -u -r1.4 ajax_forms_test.module
--- modules/simpletest/tests/ajax_forms_test.module 13 Mar 2010 06:55:50 -0000 1.4
+++ modules/simpletest/tests/ajax_forms_test.module 23 Mar 2010 21:23:23 -0000
@@ -75,8 +75,8 @@
*/
function ajax_forms_test_simple_form_checkbox_callback($form, $form_state) {
$commands = array();
- $commands[] = ajax_command_html('#ajax_checkbox_value', (int)$form_state['values']['checkbox']);
- $commands[] = ajax_command_data('#ajax_checkbox_value', 'form_state_value_select', (int)$form_state['values']['checkbox']);
+ $commands[] = ajax_command_html('#ajax_checkbox_value', (int) $form_state['values']['checkbox']);
+ $commands[] = ajax_command_data('#ajax_checkbox_value', 'form_state_value_select', (int) $form_state['values']['checkbox']);
return array('#type' => 'ajax', '#commands' => $commands);
}
Index: modules/simpletest/tests/database_test.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.test,v
retrieving revision 1.83
diff -u -r1.83 database_test.test
--- modules/simpletest/tests/database_test.test 7 Mar 2010 08:03:45 -0000 1.83
+++ modules/simpletest/tests/database_test.test 23 Mar 2010 21:23:25 -0000
@@ -456,7 +456,7 @@
$query->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
- $this->assertIdentical($num_records_before + 1, (int)$num_records_after, t('Record inserts correctly.'));
+ $this->assertIdentical($num_records_before + 1, (int) $num_records_after, t('Record inserts correctly.'));
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Yoko'))->fetchField();
$this->assertIdentical($saved_age, '29', t('Can retrieve after inserting.'));
}
Index: modules/simpletest/tests/xmlrpc.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/xmlrpc.test,v
retrieving revision 1.15
diff -u -r1.15 xmlrpc.test
--- modules/simpletest/tests/xmlrpc.test 2 Dec 2009 00:31:47 -0000 1.15
+++ modules/simpletest/tests/xmlrpc.test 23 Mar 2010 21:23:25 -0000
@@ -127,7 +127,7 @@
for ($y = 2000; $y < 2002; $y++) {
for ($m = 3; $m < 5; $m++) {
for ($d = 1; $d < 6; $d++) {
- $ys = (string)$y;
+ $ys = (string) $y;
$ms = sprintf('%02d', $m);
$ds = sprintf('%02d', $d);
$struct_7[$ys][$ms][$ds]['moe'] = mt_rand(-100, 100);
Index: modules/simpletest/tests/batch.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/batch.test,v
retrieving revision 1.8
diff -u -r1.8 batch.test
--- modules/simpletest/tests/batch.test 8 Jan 2010 06:36:34 -0000 1.8
+++ modules/simpletest/tests/batch.test 23 Mar 2010 21:23:23 -0000
@@ -352,7 +352,7 @@
foreach ($this->testCases as $expected_result => $arguments) {
// PHP sometimes casts numeric strings that are array keys to integers,
// cast them back here.
- $expected_result = (string)$expected_result;
+ $expected_result = (string) $expected_result;
$total = $arguments['total'];
$current = $arguments['current'];
$actual_result = _batch_api_percentage($total, $current);
Index: modules/field/modules/list/list.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/list/list.module,v
retrieving revision 1.27
diff -u -r1.27 list.module
--- modules/field/modules/list/list.module 15 Feb 2010 15:46:23 -0000 1.27
+++ modules/field/modules/list/list.module 23 Mar 2010 21:23:14 -0000
@@ -280,7 +280,7 @@
* Implements hook_field_is_empty().
*/
function list_field_is_empty($item, $field) {
- if (empty($item['value']) && (string)$item['value'] !== '0') {
+ if (empty($item['value']) && (string) $item['value'] !== '0') {
return TRUE;
}
return FALSE;
Index: modules/field/modules/number/number.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/number/number.module,v
retrieving revision 1.37
diff -u -r1.37 number.module
--- modules/field/modules/number/number.module 11 Feb 2010 17:44:47 -0000 1.37
+++ modules/field/modules/number/number.module 23 Mar 2010 21:23:14 -0000
@@ -214,7 +214,7 @@
* Implements hook_field_is_empty().
*/
function number_field_is_empty($item, $field) {
- if (empty($item['value']) && (string)$item['value'] !== '0') {
+ if (empty($item['value']) && (string) $item['value'] !== '0') {
return TRUE;
}
return FALSE;
Index: modules/image/image.effects.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.effects.inc,v
retrieving revision 1.3
diff -u -r1.3 image.effects.inc
--- modules/image/image.effects.inc 4 Dec 2009 16:49:46 -0000 1.3
+++ modules/image/image.effects.inc 23 Mar 2010 21:23:17 -0000
@@ -228,7 +228,7 @@
}
if (!empty($data['random'])) {
- $degrees = abs((float)$data['degrees']);
+ $degrees = abs((float) $data['degrees']);
$data['degrees'] = rand(-1 * $degrees, $degrees);
}
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.339
diff -u -r1.339 poll.module
--- modules/poll/poll.module 12 Mar 2010 15:56:29 -0000 1.339
+++ modules/poll/poll.module 23 Mar 2010 21:23:21 -0000
@@ -424,7 +424,7 @@
function poll_node_form_submit(&$form, &$form_state) {
// Renumber fields
$form_state['values']['choice'] = array_values($form_state['values']['choice']);
- $form_state['values']['teaser'] = poll_teaser((object)$form_state['values']);
+ $form_state['values']['teaser'] = poll_teaser((object) $form_state['values']);
}
/**
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.203
diff -u -r1.203 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php 12 Mar 2010 14:38:37 -0000 1.203
+++ modules/simpletest/drupal_web_test_case.php 23 Mar 2010 21:23:23 -0000
@@ -832,7 +832,7 @@
'locked' => 0,
);
$type = $forced + $settings + $defaults;
- $type = (object)$type;
+ $type = (object) $type;
$saved_type = node_type_save($type);
node_types_rebuild();
@@ -1754,8 +1754,8 @@
$name = (string) $element['name'];
// This can either be the type of or the name of the tag itself
// for