Index: CHANGELOG.txt =================================================================== RCS file: CHANGELOG.txt diff -N CHANGELOG.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ CHANGELOG.txt 18 Oct 2009 12:41:27 -0000 @@ -0,0 +1,6 @@ +// $Id$ + +Coder 7.x-3.x, xxxx-xx-xx +-------------------------- +#607592 (stella) : + - changed menu paths Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/README.txt,v retrieving revision 1.7 diff -u -p -r1.7 README.txt --- README.txt 1 Jun 2007 00:47:57 -0000 1.7 +++ README.txt 18 Oct 2009 12:41:27 -0000 @@ -14,8 +14,8 @@ Installation ------------ Copy coder.module to your module directory and then enable on the admin -modules page. Enable the modules that admin/settings/coder works on, -then view the coder results page at coder. +modules page. Enable the modules that admin/config/development/coder/settings +works on, then view the coder results page at coder. Author ------ Index: coder.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder.module,v retrieving revision 1.99 diff -u -p -r1.99 coder.module --- coder.module 26 Sep 2009 23:00:50 -0000 1.99 +++ coder.module 18 Oct 2009 12:41:27 -0000 @@ -10,10 +10,11 @@ * Implement hook_menu(). */ function coder_menu() { - $items['admin/settings/coder'] = array( - 'title' => 'Coder', + $items['admin/config/development/coder/configure'] = array( + 'title' => 'Configure', 'description' => 'Select code review plugins and modules, and upgrade files.', 'access arguments' => array('administer site configuration'), + 'type' => MENU_LOCAL_TASK, ); $items['admin/config/development/coder'] = array( 'title' => 'Coder', @@ -21,7 +22,7 @@ function coder_menu() { 'access arguments' => array('administer site configuration'), ); if (!module_exists('coder_review') && !module_exists('coder_upgrade')) { - $items['admin/settings/coder']['page callback'] = 'coder_display_required_module_message'; + $items['admin/config/development/coder/configure']['page callback'] = 'coder_display_required_module_message'; $items['admin/config/development/coder']['page callback'] = 'coder_display_required_module_message'; } return $items; Index: coder_review/CHANGELOG.txt =================================================================== RCS file: coder_review/CHANGELOG.txt diff -N coder_review/CHANGELOG.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ coder_review/CHANGELOG.txt 18 Oct 2009 12:41:27 -0000 @@ -0,0 +1,10 @@ +// $Id$ + +Coder Review 7.x-3.x, xxxx-xx-xx +--------------------------------- +#607592 (japerry, stella) : + - changed menu paths. + - updated arguments to theme() function calls and definitions. + - changed drupal_add_css/js calls to use #attached instead. + - changed #markup theme() calls to use #theme. + - coding style fixes. Index: coder_review/coder_review.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/coder_review.drush.inc,v retrieving revision 1.3 diff -u -p -r1.3 coder_review.drush.inc --- coder_review/coder_review.drush.inc 15 May 2009 15:25:21 -0000 1.3 +++ coder_review/coder_review.drush.inc 18 Oct 2009 12:41:28 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_help(). + * Implements hook_help(). */ function coder_review_drush_help($path, $arg) { switch ($path) { @@ -17,7 +17,7 @@ function coder_review_drush_help($path, } /** - * Implementation of hook_drush_command(). + * Implements hook_drush_command(). */ function coder_review_drush_command() { $items['coder review'] = array( Index: coder_review/coder_review.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/coder_review.install,v retrieving revision 1.2 diff -u -p -r1.2 coder_review.install --- coder_review/coder_review.install 24 May 2009 00:27:09 -0000 1.2 +++ coder_review/coder_review.install 18 Oct 2009 12:41:28 -0000 @@ -7,14 +7,14 @@ */ /** - * Implementation of hook_install(). + * Implements hook_install(). */ function coder_review_install() { drupal_install_schema('coder_review'); } /** - * Implementation of hook_uninstall(). + * Implements hook_uninstall(). */ function coder_review_uninstall() { variable_del('coder_cache'); @@ -31,7 +31,7 @@ function coder_review_uninstall() { } /** - * Implementation of hook_schema(). + * Implements hook_schema(). */ function coder_review_schema() { // Use our own cache table because we can create lots of entries, that slow down and clutter the default cache. Index: coder_review/coder_review.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/coder_review.module,v retrieving revision 1.25 diff -u -p -r1.25 coder_review.module --- coder_review/coder_review.module 26 Sep 2009 23:00:50 -0000 1.25 +++ coder_review/coder_review.module 18 Oct 2009 12:41:31 -0000 @@ -29,12 +29,12 @@ define('SEVERITY_NORMAL', 5); define('SEVERITY_CRITICAL', 9); /** - * Implementation of hook_help(). + * Implements hook_help(). */ function coder_review_help($page, $arg) { switch ($page) { case 'coder_review#disclaimer': - return t('Coder provides helpful hints without false positives, but offers no guarantee for creating good code. You are the final arbitrar. If in doubt, read the Drupal documentation (see review links below and api.drupal.org).', array('@api' => 'http://api.drupal.org')); + return t('Coder provides helpful hints without false positives, but offers no guarantee for creating good code. You are the final arbitrar. If in doubt, read the Drupal documentation (see review links below and api.drupal.org).', array('@api' => 'http://api.drupal.org')); case 'drush:coder_review': return t('coder_review [summary] [@reviews] [minor|major|critical] [active|core|all|default|] [no-]', array('@reviews' => implode('|', array_keys(_coder_review_reviews())))); @@ -49,7 +49,7 @@ function _coder_review_reviews() { } /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_reviews() { global $_coder_reviews; @@ -71,7 +71,7 @@ function coder_review_reviews() { } /** - * Implementation of hook_permission(). + * Implements hook_permission(). */ function coder_review_permission() { return array( @@ -87,7 +87,7 @@ function coder_review_permission() { } /** - * Implementation of hook_menu(). + * Implements hook_menu(). */ function coder_review_menu() { $items['admin/config/development/coder/review'] = array( @@ -97,6 +97,13 @@ function coder_review_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -2, ); + $items['admin/config/development/coder/review/select'] = array( + 'title' => 'Select', + 'page callback' => 'coder_review_page', + 'access arguments' => array('view code review'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -2, + ); $items['admin/config/development/coder/review/default'] = array( 'title' => 'Default', 'page callback' => 'coder_review_page', @@ -135,7 +142,7 @@ function coder_review_menu() { 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); - $items['admin/settings/coder/review'] = array( + $items['admin/config/development/coder/configure/review'] = array( 'title' => 'Review', 'description' => 'Select code review plugins and modules', 'page arguments' => array('coder_review_admin_settings'), @@ -148,25 +155,28 @@ function coder_review_menu() { } /** - * Implementation of hook_menu_alter(). + * Implements hook_menu_alter(). */ function coder_review_menu_alter(&$callbacks) { $callbacks['admin/config/development/coder']['page callback'] = 'coder_review_page'; - $callbacks['admin/settings/coder']['page callback'] = 'drupal_get_form'; - $callbacks['admin/settings/coder']['page arguments'] = array('coder_review_admin_settings'); + $callbacks['admin/config/development/coder/configure']['page callback'] = 'drupal_get_form'; + $callbacks['admin/config/development/coder/configure']['page arguments'] = array('coder_review_admin_settings'); + $callbacks['admin/config/development/coder/configure/review']['page callback'] = 'drupal_get_form'; + $callbacks['admin/config/development/coder/configure/review']['page arguments'] = array('coder_review_admin_settings'); } /** - * Implementation of hook_form_alter(). + * Implements hook_form_alter(). * * Modify the module display view by adding a Coder Review link to every * module description. */ -function coder_review_form_alter(&$form, $form_state, $form_id) { +function coder_review_form_alter(&$form, &$form_state, $form_id) { if ($form_id == 'system_modules' && (!isset($form['#theme']) || $form['#theme'] != 'confirm_form')) { if (user_access('view code review')) { - $path = drupal_get_path('module', 'coder_review'); - drupal_add_css($path . '/coder_review.css', 'module'); + $form['#attached']['css'] = array( + drupal_get_path('module', 'coder_review') . '/coder_review.css', + ); foreach ($form['modules'] as $package => $modules) { if (!preg_match('/^#/', $package)) { foreach ($modules as $name => $data) { @@ -194,9 +204,8 @@ function _coder_review_default_reviews() * Generates a form with the default reviews and default modules/themes to * run Coder on. * - * @note - * Actual forms may have additional sections added to them, this - * is simply a base. + * Actual forms may have additional sections added to them, this is simply a + * base. * * @param $settings * Settings array for coder_review in the format of _coder_review_get_default_settings(). @@ -211,8 +220,9 @@ function _coder_review_default_reviews() */ function _coder_review_settings_form($settings, &$system, &$files) { // Add the javascript. - $path = drupal_get_path('module', 'coder_review'); - drupal_add_js($path . '/coder_review.js'); + $form['#attached']['js'] = array( + drupal_get_path('module', 'coder_review') . '/coder_review.js', + ); // Create the list of review options from the coder review plug-ins. // Maintain a secondary list based on #title only, to make sorting possible. @@ -266,7 +276,7 @@ function _coder_review_settings_form($se '#collapsed' => FALSE, ); $form['coder_what']['coder_patch_help'] = array( - '#markup' => '

' . t('All patches must be in unified format. It\'s also preferable for the patch to be created with the "-p" option, which shows the function closest to the code change. Without this, some function dependent tests may not be triggered. Coder offers no guarantee that the patch will apply cleanly or will function correctly.') . '

', + '#markup' => '

' . t('All patches must be in unified format. It\'s also preferable for the patch to be created with the "-p" option, which shows the function closest to the code change. Without this, some function dependent tests may not be triggered. Coder offers no guarantee that the patch will apply cleanly or will function correctly.') . '

', '#weight' => -4, ); $form['coder_what']['coder_patch_link'] = array( @@ -413,7 +423,7 @@ function _coder_review_settings_form($se '#rows' => 3, '#type' => 'textarea', '#default_value' => isset($settings['coder_includes_exclusions']) ? $settings['coder_includes_exclusions'] : '', - '#description' => t('List file names or paths, one per line, which should be excluded (only valid if "include files" is checked above). For example, modules/system/*.php will exclude all php files in the modules/system directory.'), + '#description' => t('List file names or paths, one per line, which should be excluded (only valid if "include files" is checked above). For example, modules/system/*.php will exclude all php files in the modules/system directory.'), ); // Display the modules in a fieldset. @@ -520,7 +530,8 @@ function _coder_review_settings_form($se * Implement theme_cols to theme the radiobuttons and checkboxes form * elements in a table column. */ -function theme_coder_review_table_cols($form) { +function theme_coder_review_table_cols($variables) { + $form = $variables['form']; $total = 0; $cols = isset($form['#cols']) ? $form['#cols'] : 3; foreach ($form as $element_id => $element) { @@ -531,6 +542,7 @@ function theme_coder_review_table_cols($ $total = (int) (($total % $cols) ? (($total + $cols - 1) / $cols) : ($total / $cols)); $pos = 0; $rows = array(); + foreach ($form as $element_id => $element) { if ($element_id[0] != '#') { $pos ++; @@ -542,11 +554,13 @@ function theme_coder_review_table_cols($ $rows[$row][$col] = drupal_render($element); } } - return theme('table', array(), $rows); + + $output = theme('table', array('rows' => $rows, 'attributes' => array('id' => 'filter-order'))); + return $output; } /** - * Implementation of settings page. + * Configuration page. */ function coder_review_admin_settings($form, &$form_state) { $settings = _coder_review_get_default_settings(); @@ -598,10 +612,10 @@ function _coder_review_settings_array(&$ } /** - * Implementation of code review page. + * Code review page. */ function coder_review_page($type = '') { - $output = '
' . coder_review_help('coder#disclaimer', array()) . '
'; + $output = '
' . coder_review_help('coder#disclaimer', array()) . '
'; $output .= drupal_render(drupal_get_form('coder_review_page_form', $type)); return $output; } @@ -609,9 +623,8 @@ function coder_review_page($type = '') { /** * Returns a active settings array for coder_review. * - * @note - * The name is a misnomer, but is a largely correct characterization - * for most of Coder's settings as the variables usually do not exist. + * The name is a misnomer, but is a largely correct characterization + * for most of Coder's settings as the variables usually do not exist. * * @param $args * String settings argument, can be 'settings', 'active', 'core', 'all' @@ -673,7 +686,7 @@ function _coder_review_get_default_setti } /** - * Implementation of hook_submit(). + * Implements hook_submit(). */ function coder_review_page_form_submit($form, &$form_state) { $form_state['storage'] = $form_state['values']; @@ -699,7 +712,7 @@ function _coder_review_get_reviews_exten } /** - * Implementation of hook_form(). + * Implements hook_form(). * * Implements coder_review's main form, in which a user can select reviews and * modules/themes to run them on. @@ -729,9 +742,6 @@ function coder_review_page_form($form, & } if ($coder_form = _coder_review_settings_form($settings, $system, $files)) { - // Add style sheet. - $path = drupal_get_path('module', 'coder_review'); - drupal_add_css($path . '/coder_review.css', 'module'); // Get the includes_exclusions settings once, it is used multiple times. $coder_includes_exclusions = isset($settings['coder_includes_exclusions']) ? $settings['coder_includes_exclusions'] : ''; @@ -783,7 +793,7 @@ function coder_review_page_form($form, & foreach ($system as $name => $checked) { if ($checked) { // Process this one file. - $filename = $files[$name]; + $filename = isset($files[$name]) ? $files[$name] : FALSE; if (!$filename) { drupal_set_message(t('Code Review file for %module not found', array('%module' => $name))); continue; @@ -819,7 +829,10 @@ function coder_review_page_form($form, & $form[$name]['#collapsed'] = FALSE; } $form[$name]['output'] = array( - '#markup' => theme('coder_review', $name, $filename, $results), + '#theme' => 'coder_review', + '#name' => $name, + '#filename' => $filename, + '#results' => $results, '#weight' => -1, ); @@ -884,17 +897,20 @@ function coder_review_page_form($form, & '#type' => 'fieldset', '#title' => t('Selection form'), '#collapsible' => TRUE, - '#collapsed' => isset($form), + '#collapsed' => !empty($form), '#weight' => -1, ); if ($form['settings']['#collapsed']) { - $form['settings']['#prefix'] = t('
Use the Selection form to select options for this code review, or change the Default Settings and use the Default tab above.
', array('@settings' => url('admin/settings/coder_review'), '@default' => url('coder_review/default'))); + $form['settings']['#prefix'] = t('
Use the Selection form to select options for this code review, or change the Default Settings and use the Default tab above.
', array('@settings' => url('admin/config/development/coder/configure/review'), '@default' => url('admin/config/development/coder/review/default'))); } $form['settings'][] = $coder_form; $form['settings']['submit'] = array( '#type' => 'submit', '#value' => t('Submit'), ); + $form['#attached']['css'] = array( + drupal_get_path('module', 'coder_review') . '/coder_review.css', + ); } return $form; } @@ -952,7 +968,10 @@ function _coder_review_page_form_include $form[$name]['#collapsed'] = FALSE; } $form[$name][$filename]['output'] = array( - '#markup' => theme('coder_review', $name, $filename, $results), + '#theme' => 'coder_review', + '#name' => $name, + '#filename' => $filename, + '#results' => $results, ); } return $stats; @@ -996,7 +1015,7 @@ function _coder_review_modified() { function do_coder_reviews($coder_args) { // Load the cached results if they exist, but not for patches. if (empty($coder_args['#patch']) && empty($coder_args['#test'])) { - $cache_key = 'coder:' . implode(':', array_keys($coder_args['#reviews'])) . $coder_args['#severity'] . ':' . $coder_args['#filename']; + $cache_key = 'coder:' . implode(':', array_keys($coder_args['#reviews'])) . $coder_args['#severity'] . ':' . $coder_args['#filename']; if (file_exists($filepath = realpath($coder_args['#filename']))) { $cache_mtime = filemtime($filepath); if ($cache_results = cache_get($cache_key, 'cache_coder')) { @@ -1034,7 +1053,8 @@ function do_coder_reviews($coder_args) { // Theme the error messages. foreach ($errors as $key => $error) { if (is_numeric($key)) { - $results[$key] = theme('coder_review_warning_msg', $error); + $error['warning'] = _coder_review_warning($error['rule']); + $results[$key] = theme('coder_review_warning_msg', array('error' => $error)); } } @@ -1042,7 +1062,7 @@ function do_coder_reviews($coder_args) { ksort($results, SORT_NUMERIC); } else { - $results[] = theme('coder_review_warning', t('Could not read the file'), 'critical'); + $results[] = theme('coder_review_warning', array('warning' => t('Could not read the file'), 'severity_name' => 'critical')); } // Save the results in the cache if we're not reviewing a patch. @@ -1560,7 +1580,7 @@ function do_coder_review($coder_args, $r $not = isset($rule['#filename-not']) ? $rule['#filename-not'] : (isset($rule['#filename']) ? NULL : $coder_args['#include_extensions']); if ($not) { $regex = '/(' . implode('|', $not) . ')$/i'; - // Check filename. If a patch, also check the .patch extension. + // Check filename. If a patch, also check the .patch extension. if (preg_match($regex, $filename, $matches) || ($is_patch && preg_match($regex, 'coder_review.patch', $matches))) { continue; } @@ -1623,8 +1643,8 @@ function do_coder_review_regex(&$coder_a if (isset($rule['#value']) && !empty($lines)) { $regexflags = isset($rule['#case-sensitive']) ? '' : 'i'; $regex = '/' . $rule['#value'] . '/' . $regexflags; - $class_regex = isset($rule['#class']) ? '/'. $rule['#class'] .'/' : ''; - $class_not_regex = isset($rule['#class-not']) ? '/'. $rule['#class-not'] .'/' : ''; + $class_regex = isset($rule['#class']) ? '/' . $rule['#class'] . '/' : ''; + $class_not_regex = isset($rule['#class-not']) ? '/' . $rule['#class-not'] . '/' : ''; $class_current = ''; $class_paren = 0; $function_regex = isset($rule['#function']) ? '/' . $rule['#function'] . '/' : ''; @@ -1719,8 +1739,7 @@ function _coder_review_error(&$results, /** * Search for a string. * - * @note - * See do_coder_review_regex() for arguments. + * @see do_coder_review_regex() */ function do_coder_review_grep(&$coder_args, $review, $rule, $lines, &$results) { if (isset($rule['#value'])) { @@ -1739,8 +1758,7 @@ function do_coder_review_grep(&$coder_ar /** * Search for potentially missing string. * - * @note - * See do_coder_review_regex() for arguments. + * @see do_coder_review_regex() */ function do_coder_review_grep_invert(&$coder_args, $review, $rule, $lines, &$results) { if (isset($rule['#value'])) { @@ -1759,8 +1777,7 @@ function do_coder_review_grep_invert(&$c /** * Allow for an arbitrary callback function to perform a review. * - * @note - * See do_coder_review_regex() for arguments. + * @see do_coder_review_regex() */ function do_coder_review_callback(&$coder_args, $review, $rule, $lines, &$results) { if ($function = $rule['#value']) { @@ -1867,7 +1884,7 @@ function _coder_review_is_drupal_core($m } /** - * Implementation of hook_simpletest(). + * Implements hook_simpletest(). */ function coder_review_simpletest() { return array_keys(file_scan_directory(drupal_get_path('module', 'coder_review') . '/tests', '/\.test/')); @@ -1876,15 +1893,46 @@ function coder_review_simpletest() { // Theming functions /** - * Implementation of hook_theme(). + * Implements hook_theme(). */ function coder_review_theme() { return array( - 'coder_review' => array('arguments' => array('name', 'filename', 'results')), - 'coder_review_warning' => array('arguments' => array('warning', 'severity_name', 'lineno', 'line')), - 'coder_review_warning_msg' => array('arguments' => array('error')), - 'coder_review_table_cols' => array('arguments' => array('form')), - 'drupalapi' => array('arguments' => array('function', 'version')), + 'coder_review' => array( + 'arguments' => array( + 'name' => NULL, + 'filename' => NULL, + 'results' => NULL, + ), + ), + 'coder_review_warning' => array( + 'arguments' => array( + 'warning' => NULL, + 'severity_name' => NULL, + 'lineno' => NULL, + 'line' => NULL, + ), + ), + 'coder_review_warning_msg' => array( + 'arguments' => array( + 'error' => NULL, + ), + ), + 'coder_review_table_cols' => array( + 'arguments' => array( + 'form' => NULL, + ), + ), + 'drupalapi' => array( + 'arguments' => array( + 'function' => NULL, + 'version' => substr(VERSION, 0, 1), + ), + ), + 'phpapi' => array( + 'arguments' => array( + 'function' => NULL, + ), + ), ); } @@ -1898,15 +1946,19 @@ function coder_review_theme() { * @param $results * Array list of results HTML to display. See do_coder_reviews() for format. */ -function theme_coder_review($name, $filename, $results) { +function theme_coder_review($variables) { + $name = $variables['name']; + $filename = $variables['filename']; + $results = $variables['results']; + // theme the output for the Drupal shell if (function_exists('_coder_review_drush_is_option') && _coder_review_drush_is_option('drush')) { - return theme_drush_coder_review($name, $filename, $results); + return theme_drush_coder_review(array('name' => $name, 'filename' => $filename, 'results' => $results)); } $output = '

' . basename($filename) . '

'; if (!empty($results)) { - $output .= theme('item_list', $results); + $output .= theme('item_list', array('items' => $results)); } $output .= '
'; return $output; @@ -1920,10 +1972,17 @@ function theme_coder_review($name, $file * @param $error * Error array from _coder_review_error(). */ -function theme_coder_review_warning_msg($error) { +function theme_coder_review_warning_msg($variables) { + $error = $variables['error']; // @TODO: we can combine theme_coder_review_warning() and theme_coder_review_warning_msg(), // But let's do this on the 7.x upgrade in case anyone's actually using it. - return theme('coder_review_warning', _coder_review_warning($error['rule']), $error['severity_name'], $error['lineno'], $error['line']); + + return theme('coder_review_warning', array( + 'warning' => _coder_review_warning($error['rule']), + 'severity_name' => $error['severity_name'], + 'lineno' => $error['lineno'], + 'line' => $error['line'], + )); } /** @@ -1959,10 +2018,20 @@ function _coder_review_warning($rule) { * @param $line * String contents of line. */ -function theme_coder_review_warning($warning, $severity_name, $lineno = 0, $line = '') { +function theme_coder_review_warning($variables) { + $warning = $variables['warning']; + $severity_name = $variables['severity_name']; + $lineno = $variables['lineno']; + $line = $variables['line']; + // theme the output for the Drupal shell if (function_exists('_coder_review_drush_is_option') && _coder_review_drush_is_option('drush')) { - return theme_drush_coder_review_warning($warning, $severity_name, $lineno, $line); + return theme_drush_coder_review_warning(array( + 'warning' => $warning, + 'severity_name' => $severity_name, + 'lineno' => $lineno, + 'line' => $line, + )); } // Extract description from warning. @@ -1970,7 +2039,7 @@ function theme_coder_review_warning($war $description = isset($warning['#description']) ? $warning['#description'] : ''; $warning_msg = $warning['#warning']; if (isset($warning['#link'])) { - $warning_msg .= ' (' . l(t('Drupal Docs'), $warning['#link']) . ')'; + $warning_msg .= ' (' . l(t('Drupal Docs'), $warning['#link']) . ')'; } $warning = $warning_msg; } @@ -1986,9 +2055,14 @@ function theme_coder_review_warning($war } $path = drupal_get_path('module', 'coder'); $title = t('severity: @severity', array('@severity' => $severity_name)); - $img = theme('image', $path . "/images/$severity_name.png", $title, $title, array('align' => 'right', 'class' => 'coder'), FALSE); + $img = theme('image', array( + 'path' => $path . "/images/$severity_name.png", + 'alt' => $title, 'title' => $title, + 'attributes' => array('align' => 'right', 'class' => 'coder'), + 'getsize' => FALSE, + )); if (!empty($description)) { - $img .= theme('image', $path . '/images/more.png', t('click to read more'), '', array('align' => 'right', 'class' => 'coder-more'), FALSE); + $img .= theme('image', array('path' => $path . '/images/more.png', 'alt' => t('click to read more'), 'atributes' => array('align' => 'right', 'class' => 'coder-more'), 'getsize' => FALSE)); $warning .= '
Explanation: ' . $description . '
'; } return '
' . $img . $warning . '
'; @@ -2002,7 +2076,10 @@ function theme_coder_review_warning($war * @param $version * Version to link to. */ -function theme_drupalapi($function, $version = '') { +function theme_drupalapi($variables) { + $version = $variables['version']; + $function = $variables['function']; + return l($function, "http://api.drupal.org/api/function/$function/$version"); } @@ -2012,6 +2089,7 @@ function theme_drupalapi($function, $ver * @param $function * Function to link to. */ -function theme_phpapi($function) { +function theme_phpapi($variables) { + $function = $variables['function']; return l($function, "http://us.php.net/$function"); } Index: coder_review/includes/coder_review_47.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_47.inc,v retrieving revision 1.1 diff -u -p -r1.1 coder_review_47.inc --- coder_review/includes/coder_review_47.inc 6 Mar 2009 17:05:40 -0000 1.1 +++ coder_review/includes/coder_review_47.inc 18 Oct 2009 12:41:31 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_47_reviews() { $rules = array( @@ -116,7 +116,7 @@ function coder_review_47_reviews() { function _coder_review_47_hook_node_info_warning() { return t('implement !hook_node_info() to create a module which defines node type(s)', array( - '!hook_node_info' => theme('drupalapi', 'hook_node_info'), + '!hook_node_info' => theme('drupalapi', array('function' => 'hook_node_info', 'version' => '4.7')), ) ); } @@ -124,7 +124,7 @@ function _coder_review_47_hook_node_info function _coder_review_47_node_load_warning() { return t('use !node_load($nid) instead of !node_load(array(\'nid\' => $nid))', array( - '!node_load' => theme('drupalapi', 'node_load'), + '!node_load' => theme('drupalapi', array('function' => 'node_load', 'version' => '4.7')), ) ); } @@ -132,7 +132,7 @@ function _coder_review_47_node_load_warn function _coder_review_47_node_list_warning() { return t('!node_list() became node_get_types and now returns an associative array about node types', array( - '!node_list' => theme('drupalapi', 'node_list'), + '!node_list' => theme('drupalapi', array('function' => 'node_list', 'version' => '4.7')), ) ); } @@ -140,8 +140,8 @@ function _coder_review_47_node_list_warn function _coder_review_47_module_get_name_warning() { return t('!module_get_node_name() deprecated and now handled by !node_get_base().', array( - '!module_get_node_name' => theme('drupalapi', 'module_get_node_name', '4.6'), - '!node_get_base' => theme('drupalapi', 'node_get_base'), + '!module_get_node_name' => theme('drupalapi', array('function' => 'module_get_node_name', 'version' => '4.6')), + '!node_get_base' => theme('drupalapi', array('function' => 'node_get_base', 'version' => '4.7')), ) ); } @@ -149,8 +149,8 @@ function _coder_review_47_module_get_nam function _coder_review_47_format_name_warning() { return t('!format_name() was renamed to !theme_username()', array( - '!format_name' => theme('drupalapi', 'format_name', '4.6'), - '!theme_username' => theme('drupalapi', 'theme_username'), + '!format_name' => theme('drupalapi', array('function' => 'format_name', 'version' => '4.6')), + '!theme_username' => theme('drupalapi', array('function' => 'theme_username', 'version' => '4.7')), ) ); } @@ -158,7 +158,7 @@ function _coder_review_47_format_name_wa function _coder_review_47_message_access_warning() { return t('!message_access() was removed, replace with a nice case error message', array( - '!message_access' => theme('drupalapi', 'message_access', '4.6'), + '!message_access' => theme('drupalapi', array('function' => 'message_access', 'version' => '4.6')), ) ); } @@ -166,8 +166,8 @@ function _coder_review_47_message_access function _coder_review_47_conf_url_rewrite_warning() { return t('!conf_url_rewrite() became !custom_url_rewrite()', array( - '!conf_url_rewrite' => theme('drupalapi', 'conf_url_rewrite', '4.6'), - '!custom_url_rewrite' => theme('drupalapi', 'custom_url_rewrite'), + '!conf_url_rewrite' => theme('drupalapi', array('function' => 'conf_url_rewrite', 'version' => '4.6')), + '!custom_url_rewrite' => theme('drupalapi', array('function' => 'custom_url_rewrite', 'version' => '4.7')), ) ); } @@ -175,7 +175,7 @@ function _coder_review_47_conf_url_rewri function _coder_review_47_node_delete_warning() { return t('use !node_delete($nid) instead of !node_delete(array(\'nid\' => $nid))', array( - '!node_delete' => theme('drupalapi', 'node_delete'), + '!node_delete' => theme('drupalapi', array('function' => 'node_delete', 'version' => '4.7')), ) ); } @@ -183,7 +183,7 @@ function _coder_review_47_node_delete_wa function _coder_review_47_file_directory_temp_warning() { return t('use !file_directory_temp() function instead of variable', array( - '!file_directory_temp' => theme('drupalapi', 'file_directory_temp'), + '!file_directory_temp' => theme('drupalapi', array('function' => 'file_directory_temp', 'version' => '4.7')), ) ); } @@ -191,7 +191,7 @@ function _coder_review_47_file_directory function _coder_review_47_file_directory_path_warning() { return t('use !file_directory_path() function instead of variable', array( - '!file_directory_path' => theme('drupalapi', 'file_directory_path'), + '!file_directory_path' => theme('drupalapi', array('function' => 'file_directory_path', 'version' => '4.7')), ) ); } @@ -199,7 +199,7 @@ function _coder_review_47_file_directory function _coder_review_47_array2object_warning() { return t('!array2object() replaced by native PHP type conversion (typecase to (object)', array( - '!array2object' => theme('drupalapi', 'array2object', '4.6'), + '!array2object' => theme('drupalapi', array('function' => 'array2object', 'version' => '4.6')), ) ); } @@ -207,7 +207,7 @@ function _coder_review_47_array2object_w function _coder_review_47_hook_onload_warning() { return t('!hook_onload() replaced by javascript addLoadEvent()', array( - '!hook_onload' => theme('drupalapi', 'hook_onload', '4.6'), + '!hook_onload' => theme('drupalapi', array('function' => 'hook_onload', 'version' => '4.6')), ) ); } @@ -215,7 +215,7 @@ function _coder_review_47_hook_onload_wa function _coder_review_47_node_validate_title_warning() { return t('!node_validate_title() was removed', array( - '!node_validate_title' => theme('drupalapi', 'node_validate_title', '4.6'), + '!node_validate_title' => theme('drupalapi', array('function' => 'node_validate_title', 'version' => '4.6')), ) ); } @@ -223,7 +223,7 @@ function _coder_review_47_node_validate_ function _coder_review_47_node_tablesort_pager_warning() { return t('!tablesort_pager() was removed', array( - '!tablesort_pager' => theme('drupalapi', 'tablesort_pager', '4.6'), + '!tablesort_pager' => theme('drupalapi', array('function' => 'tablesort_pager', 'version' => '4.6')), ) ); } Index: coder_review/includes/coder_review_5x.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_5x.inc,v retrieving revision 1.1 diff -u -p -r1.1 coder_review_5x.inc --- coder_review/includes/coder_review_5x.inc 6 Mar 2009 17:05:40 -0000 1.1 +++ coder_review/includes/coder_review_5x.inc 18 Oct 2009 12:41:32 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_5x_reviews() { $rules = array( @@ -107,8 +107,8 @@ function _coder_review_5x_callback_warni function _coder_review_5x_user_mail_warning() { return t('!user_mail() is replaced by !drupal_mail()', array( - '!user_mail' => theme('drupalapi', 'user_mail', '4.7'), - '!drupal_mail' => theme('drupalapi', 'drupal_mail', '5'), + '!user_mail' => theme('drupalapi', array('function' => 'user_mail', 'version' => '4.7')), + '!drupal_mail' => theme('drupalapi', array('function' => 'drupal_mail', 'version' => '5')), ) ); } @@ -116,8 +116,8 @@ function _coder_review_5x_user_mail_warn function _coder_review_5x_user_mail_wrapper_warning() { return t('!user_mail_wrapper() changed to !drupal_mail_wrapper()', array( - '!user_mail_wrapper' => theme('drupalapi', 'user_mail_wrapper', '4.7'), - '!drupal_mail_wrapper' => theme('drupalapi', 'drupal_mail_wrapper', '5'), + '!user_mail_wrapper' => theme('drupalapi', array('function' => 'user_mail_wrapper', 'version' => '4.7')), + '!drupal_mail_wrapper' => theme('drupalapi', array('function' => 'drupal_mail_wrapper', 'version' => '5')), ) ); } @@ -125,8 +125,8 @@ function _coder_review_5x_user_mail_wrap function _coder_review_5x_message_na_warning() { return t('The function !message_na() was removed, remove it from your modules as well and replace it with !t(\'n/a\')', array( - '!message_na' => theme('drupalapi', 'message_na', '4.7'), - '!t' => theme('drupalapi', 't', '5'), + '!message_na' => theme('drupalapi', array('function' => 'message_na', 'version' => '4.7')), + '!t' => theme('drupalapi', array('function' => 't', 'version' => '5')), ) ); } @@ -134,8 +134,8 @@ function _coder_review_5x_message_na_war function _coder_review_5x_module_exist_warning() { return t('!module_exist() is now !module_exists()', array( - '!module_exist' => theme('drupalapi', 'module_exist', '4.7'), - '!module_exists' => theme('drupalapi', 'module_exists', '5'), + '!module_exist' => theme('drupalapi', array('function' => 'module_exist', 'version' => '4.7')), + '!module_exists' => theme('drupalapi', array('function' => 'module_exists', 'version' => '5')), ) ); } @@ -143,8 +143,8 @@ function _coder_review_5x_module_exist_w function _coder_review_5x_drupal_call_js_warning() { return t('Remove !drupal_call_js(), use "!drupal_add_js(\'myCustomFunction(your, parameters, here)\', \'inline\');" instead', array( - '!drupal_call_js' => theme('drupalapi', 'drupal_call_js', '4.7'), - '!drupal_add_js' => theme('drupalapi', 'drupal_add_js', '5'), + '!drupal_call_js' => theme('drupalapi', array('function' => 'drupal_call_js', 'version' => '4.7')), + '!drupal_add_js' => theme('drupalapi', array('function' => 'drupal_add_js', 'version' => '5')), ) ); } @@ -152,8 +152,8 @@ function _coder_review_5x_drupal_call_js function _coder_review_5x_system_listing_warning() { return t('!system_listing() is now !drupal_system_listing()', array( - '!system_listing' => theme('drupalapi', 'system_listing', '4.7'), - '!drupal_system_listing' => theme('drupalapi', 'drupal_system_listing', '5'), + '!system_listing' => theme('drupalapi', array('function' => 'system_listing', 'version' => '4.7')), + '!drupal_system_listing' => theme('drupalapi', array('function' => 'drupal_system_listing', 'version' => '5')), ) ); } @@ -161,8 +161,8 @@ function _coder_review_5x_system_listing function _coder_review_5x_theme_add_style_warning() { return t('Replace !theme_add_style() with !drupal_add_css()', array( - '!theme_add_style' => theme('drupalapi', 'theme_add_style', '4.7'), - '!drupal_add_css' => theme('drupalapi', 'drupal_add_css', '5'), + '!theme_add_style' => theme('drupalapi', array('function' => 'theme_add_style', 'version' => '4.7')), + '!drupal_add_css' => theme('drupalapi', array('function' => 'drupal_add_css', 'version' => '5')), ) ); } @@ -170,8 +170,8 @@ function _coder_review_5x_theme_add_styl function _coder_review_5x_form_render_warning() { return t('Replace !form_render() with !drupal_render()', array( - '!form_render' => theme('drupalapi', 'form_render', '4.7'), - '!drupal_render' => theme('drupalapi', 'drupal_render', '5'), + '!form_render' => theme('drupalapi', array('function' => 'form_render', 'version' => '4.7')), + '!drupal_render' => theme('drupalapi', array('function' => 'drupal_render', 'version' => '5')), ) ); } @@ -179,8 +179,8 @@ function _coder_review_5x_form_render_wa function _coder_review_5x_node_get_name_warning() { return t('Replace !node_get_name($node) with !node_get_types(\'name\', $node)', array( - '!node_get_name' => theme('drupalapi', 'node_get_name', '4.7'), - '!node_get_types' => theme('drupalapi', 'node_get_types', '5'), + '!node_get_name' => theme('drupalapi', array('function' => 'node_get_name', 'version' => '4.7')), + '!node_get_types' => theme('drupalapi', array('function' => 'node_get_types', 'version' => '5')), ) ); } Index: coder_review/includes/coder_review_6x.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_6x.inc,v retrieving revision 1.2 diff -u -p -r1.2 coder_review_6x.inc --- coder_review/includes/coder_review_6x.inc 7 Mar 2009 20:47:01 -0000 1.2 +++ coder_review/includes/coder_review_6x.inc 18 Oct 2009 12:41:33 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_6x_reviews() { $argex = '(((\$?)[a-zA-Z_]+((\([^)]*\))|\[[^\]]*\])?)|[0-9]+(\.[0-9]*)?|\'\'|"")'; @@ -594,7 +594,7 @@ function _coder_review_6x_form_alter_war return array( '#warning' => t('!hook_form_alter() parameters have changed', array( - '!hook_form_alter' => theme('drupalapi', 'hook_form_alter', '6'), + '!hook_form_alter' => theme('drupalapi', array('function' => 'hook_form_alter', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/144132#form-alter', @@ -605,7 +605,7 @@ function _coder_review_6x_link_alter_war return array( '#warning' => t('!hook_link_alter() parameters have changed', array( - '!hook_link_alter' => theme('drupalapi', 'hook_link_alter', '6'), + '!hook_link_alter' => theme('drupalapi', array('function' => 'hook_link_alter', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#link-alter', @@ -616,7 +616,7 @@ function _coder_review_6x_profile_alter_ return array( '#warning' => t('!hook_profile_alter() parameters have changed', array( - '!hook_profile_alter' => theme('drupalapi', 'hook_profile_alter', '6'), + '!hook_profile_alter' => theme('drupalapi', array('function' => 'hook_profile_alter', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#profile-alter', @@ -627,7 +627,7 @@ function _coder_review_6x_mail_alter_war return array( '#warning' => t('!hook_mail_alter() parameters have changed', array( - '!hook_mail_alter' => theme('drupalapi', 'hook_mail_alter', '6'), + '!hook_mail_alter' => theme('drupalapi', array('function' => 'hook_mail_alter', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#mail-alter', @@ -638,7 +638,7 @@ function _coder_review_6x_hook_theme_war return array( '#warning' => t('new !hook_theme() function is required to register theme_ functions', array( - '!hook_theme' => theme('drupalapi', 'hook_theme', '6'), + '!hook_theme' => theme('drupalapi', array('function' => 'hook_theme', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#theme_registry', @@ -649,8 +649,8 @@ function _coder_review_6x_url_l_warning( return array( '#warning' => t('!url() and !l() arguments changed, if you have a lot of these use this conversion script', array( - '!url' => theme('drupalapi', 'url', '6'), - '!l' => theme('drupalapi', 'l', '6'), + '!url' => theme('drupalapi', array('function' => 'url', 'version' => '6')), + '!l' => theme('drupalapi', array('function' => 'l', 'version' => '6')), '@script' => 'http://drupal.org/files/issues/replace.php_.txt', ) ), @@ -662,10 +662,10 @@ function _coder_review_6x_taxonomy_node_ return array( '#warning' => t('!taxonomy_node_get_terms(), !taxonomy_node_get_terms_by_vocabulary(), !taxonomy_node_save and !taxonomy_node_delete() now take a full $node object, not just a nid (node id).', array( - '!taxonomy_node_get_terms' => theme('drupalapi', 'taxonomy_node_get_terms', '6'), - '!taxonomy_node_get_terms_by_vocabulary' => theme('drupalapi', 'taxonomy_node_get_terms_by_vocabulary', '6'), - '!taxonomy_node_save' => theme('drupalapi', 'taxonomy_node_save', '6'), - '!taxonomy_node_delete' => theme('drupalapi', 'taxonomy_node_delete', '6'), + '!taxonomy_node_get_terms' => theme('drupalapi', array('function' => 'taxonomy_node_get_terms', 'version' => '6')), + '!taxonomy_node_get_terms_by_vocabulary' => theme('drupalapi', array('function' => 'taxonomy_node_get_terms_by_vocabulary', 'version' => '6')), + '!taxonomy_node_save' => theme('drupalapi', array('function' => 'taxonomy_node_save', 'version' => '6')), + '!taxonomy_node_delete' => theme('drupalapi', array('function' => 'taxonomy_node_delete', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#taxonomy-revisions', @@ -676,7 +676,7 @@ function _coder_review_6x_format_plural_ return array( '#warning' => t('!format_plural() accepts replacements, you no longer need to use !strtr()', array( - '!format_plural' => theme('drupalapi', 'format_plural', '6'), + '!format_plural' => theme('drupalapi', array('function' => 'format_plural', 'version' => '6')), '!strtr' => theme('phpapi', 'strtr'), ) ), @@ -688,8 +688,8 @@ function _coder_review_6x_watchdog_warni return array( '#warning' => t('Parameters of !watchdog() changed, you must remove calls to !t()', array( - '!watchdog' => theme('drupalapi', 'watchdog', '6'), - '!t' => theme('drupalapi', 't', '6'), + '!watchdog' => theme('drupalapi', array('function' => 'watchdog', 'version' => '6')), + '!t' => theme('drupalapi', array('function' => 't', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#watchdog_parameters', @@ -700,7 +700,7 @@ function _coder_review_6x_cache_set_warn return array( '#warning' => t('Changes to !cache_set() parameter order', array( - '!cache_set' => theme('drupalapi', 'cache_set', '6'), + '!cache_set' => theme('drupalapi', array('function' => 'cache_set', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#cache-set-parameter-order', @@ -711,8 +711,8 @@ function _coder_review_6x_cache_serializ return array( '#warning' => t('!cache_set() and !cache_get() automatically (un)serialize complex data types', array( - '!cache_set' => theme('drupalapi', 'cache_set', '6'), - '!cache_get' => theme('drupalapi', 'cache_get', '6'), + '!cache_set' => theme('drupalapi', array('function' => 'cache_set', 'version' => '6')), + '!cache_get' => theme('drupalapi', array('function' => 'cache_get', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#cache-data-parameter', @@ -723,7 +723,7 @@ function _coder_review_6x_remote_addr_wa return array( '#warning' => t('Use new !ip_address() function instead of $_SERVER[\'REMOTE_ADDR\']', array( - '!ip_address' => theme('drupalapi', 'ip_address', '6'), + '!ip_address' => theme('drupalapi', array('function' => 'ip_address', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#ip-address', @@ -734,8 +734,8 @@ function _coder_review_6x_file_check_upl return array( '#warning' => t('!file_check_upload() merged into !file_save_upload()', array( - '!file_check_upload' => theme('drupalapi', 'file_check_upload', '5'), - '!file_save_upload' => theme('drupalapi', 'file_save_upload', '6'), + '!file_check_upload' => theme('drupalapi', array('function' => 'file_check_upload', 'version' => '5')), + '!file_save_upload' => theme('drupalapi', array('function' => 'file_save_upload', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#file-check-upload', @@ -746,7 +746,7 @@ function _coder_review_6x_file_save_uplo return array( '#warning' => t('Parameters for !file_save_upload() have changed', array( - '!file_save_upload' => theme('drupalapi', 'file_save_upload', '6'), + '!file_save_upload' => theme('drupalapi', array('function' => 'file_save_upload', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#file-check-upload', @@ -792,7 +792,7 @@ function _coder_review_6x_form_set_value return array( '#warning' => t('!form_set_value() parameters have changed', array( - '!form_set_value' => theme('drupalapi', 'form_set_value', '6'), + '!form_set_value' => theme('drupalapi', array('function' => 'form_set_value', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/144132#set-value', @@ -803,7 +803,7 @@ function _coder_review_6x_confirm_form_w return array( '#warning' => t('The arguments to !confirm_form() have changed', array( - '!confirm_form' => theme('drupalapi', 'confirm_form', '6'), + '!confirm_form' => theme('drupalapi', array('function' => 'confirm_form', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#confirm-form-args', @@ -814,9 +814,9 @@ function _coder_review_6x_custom_url_rew return array( '#warning' => t('In place of !custom_url_rewrite(), use !custom_url_rewrite_inbound() or !custom_url_rewrite_outbound()', array( - '!custom_url_rewrite' => theme('drupalapi', 'custom_url_rewrite', '5'), - '!custom_url_rewrite_inbound' => theme('drupalapi', 'custom_url_rewrite_inbound', '6'), - '!custom_url_rewrite_outbound' => theme('drupalapi', 'custom_url_rewrite_outbound', '6'), + '!custom_url_rewrite' => theme('drupalapi', array('function' => 'custom_url_rewrite', 'version' => '5')), + '!custom_url_rewrite_inbound' => theme('drupalapi', array('function' => 'custom_url_rewrite_inbound', 'version' => '6')), + '!custom_url_rewrite_outbound' => theme('drupalapi', array('function' => 'custom_url_rewrite_outbound', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#custom-url-rewrite', @@ -827,7 +827,7 @@ function _coder_review_6x_hook_info_auth return array( '#warning' => t('hook no longer exists, use !hook_form_alter() to swap your own validation handler', array( - '!hook_form_alter' => theme('drupalapi', 'hook_form_alter', '6'), + '!hook_form_alter' => theme('drupalapi', array('function' => 'hook_form_alter', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#dist-auth', @@ -838,7 +838,7 @@ function _coder_review_6x_hook_help_warn return array( '#warning' => t('The arguments to !hook_help() have changed', array( - '!hook_help' => theme('drupalapi', 'hook_help', '6'), + '!hook_help' => theme('drupalapi', array('function' => 'hook_help', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#hook-help', @@ -857,8 +857,8 @@ function _coder_review_6x_schema_api_war function _coder_review_6x_theme_get_function_warning() { return t('!theme_get_function() has been deprecated because of template theming; see !theme_get_registry()', array( - '!theme_get_function' => theme('drupalapi', 'theme_get_function', '5'), - '!theme_get_registry' => theme('drupalapi', 'theme_get_registry', '6'), + '!theme_get_function' => theme('drupalapi', array('function' => 'theme_get_function', 'version' => '5')), + '!theme_get_registry' => theme('drupalapi', array('function' => 'theme_get_registry', 'version' => '6')), ) ); } @@ -867,7 +867,7 @@ function _coder_review_6x_db_num_rows_wa return array( '#warning' => t('!db_num_rows() has been deprecated', array( - '!db_num_rows' => theme('drupalapi', 'db_num_rows', '5'), + '!db_num_rows' => theme('drupalapi', array('function' => 'db_num_rows', 'version' => '5')), ) ), '#link' => 'http://drupal.org/node/114774#db-num-rows', @@ -879,7 +879,7 @@ function _coder_review_6x_drupal_retriev return array( '#warning' => t('Parameters for !drupal_retrieve_form() have changed, add $form_state as a second argument', array( - '!drupal_retrieve_form' => theme('drupalapi', 'drupal_retrieve_form', '6'), + '!drupal_retrieve_form' => theme('drupalapi', array('function' => 'drupal_retrieve_form', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/144132#retrieve-form', @@ -908,9 +908,9 @@ function _coder_review_6x_node_access_re return array( '#warning' => t('!node_access_rebuild() should not be called from !hook_enable() or !hook_disable() functions any more.', array( - '!node_access_rebuild' => theme('drupalapi', 'node_access_rebuild', '6'), - '!hook_enable' => theme('drupalapi', 'hook_enable', '6'), - '!hook_disable' => theme('drupalapi', 'hook_disable', '6'), + '!node_access_rebuild' => theme('drupalapi', array('function' => 'node_access_rebuild', 'version' => '6')), + '!hook_enable' => theme('drupalapi', array('function' => 'hook_enable', 'version' => '6')), + '!hook_disable' => theme('drupalapi', array('function' => 'hook_disable', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#node_access_rebuild_batch', @@ -942,8 +942,8 @@ function _coder_review_6x_locale_refresh return array( '#warning' => t('!locale_refresh_cache() is deprecated. Use !cache_clear_all() instead.', array( - '!locale_refresh_cache' => theme('drupalapi', 'locale_refresh_cache', '5'), - '!cache_clear_all' => theme('drupalapi', 'cache_clear_all', '6'), + '!locale_refresh_cache' => theme('drupalapi', array('function' => 'locale_refresh_cache', 'version' => '5')), + '!cache_clear_all' => theme('drupalapi', array('function' => 'cache_clear_all', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#locale', @@ -954,8 +954,8 @@ function _coder_review_6x_db_next_id_war return array( '#warning' => t('!db_next_id() is deprecated. Use !db_last_insert_id() instead.', array( - '!db_next_id' => theme('drupalapi', 'db_next_id', '5'), - '!db_last_insert_id' => theme('drupalapi', 'db_last_insert_id', '6'), + '!db_next_id' => theme('drupalapi', array('function' => 'db_next_id', 'version' => '5')), + '!db_last_insert_id' => theme('drupalapi', array('function' => 'db_last_insert_id', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#db_last_insert_id', @@ -966,9 +966,9 @@ function _coder_review_6x_menu_set_locat return array( '#warning' => t('!menu_set_location() is deprecated. Use !drupal_set_breadcrumb() to set a custom breadcrumb or !menu_set_item() to set the current location in the menu tree.', array( - '!menu_set_location' => theme('drupalapi', 'menu_set_location', '5'), - '!drupal_set_breadcrumb' => theme('drupalapi', 'drupal_set_breadcrumb', '6'), - '!menu_set_item' => theme('drupalapi', 'menu_set_item', '6'), + '!menu_set_location' => theme('drupalapi', array('function' => 'menu_set_location', 'version' => '5')), + '!drupal_set_breadcrumb' => theme('drupalapi', array('function' => 'drupal_set_breadcrumb', 'version' => '6')), + '!menu_set_item' => theme('drupalapi', array('function' => 'menu_set_item', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#menu_set_location', @@ -979,8 +979,8 @@ function _coder_review_6x_taxonomy_get_v return array( '#warning' => t('!taxonomy_get_vocabulary() is deprecated. Use !taxonomy_vocabulary_load() instead.', array( - '!taxonomy_get_vocabulary' => theme('drupalapi', 'taxonomy_get_vocabulary', '5'), - '!taxonomy_vocabulary_load' => theme('drupalapi', 'taxonomy_vocabulary_load', '6'), + '!taxonomy_get_vocabulary' => theme('drupalapi', array('function' => 'taxonomy_get_vocabulary', 'version' => '5')), + '!taxonomy_vocabulary_load' => theme('drupalapi', array('function' => 'taxonomy_vocabulary_load', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/114774#taxonomy-load', @@ -991,7 +991,7 @@ function _coder_review_6x_watchdog_debug return array( '#warning' => t('Parameters of !watchdog() changed, you use $severity WATCHDOG_DEBUG instead of $type \'debug\'', array( - '!watchdog' => theme('drupalapi', 'watchdog', '6') + '!watchdog' => theme('drupalapi', array('function' => 'watchdog', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#watchdog_logging', @@ -1002,7 +1002,7 @@ function _coder_review_6x_book_admin_orp return array( '#warning' => t('!book_admin_orphan() is deprecated', array( - '!book_admin_orphan' => theme('drupalapi', 'book_admin_orphan', '5') + '!book_admin_orphan' => theme('drupalapi', array('function' => 'book_admin_orphan', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1013,7 +1013,7 @@ function _coder_review_6x_book_content_w return array( '#warning' => t('!book_content() is deprecated', array( - '!book_content' => theme('drupalapi', 'book_content', '5') + '!book_content' => theme('drupalapi', array('function' => 'book_content', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1024,7 +1024,7 @@ function _coder_review_6x_book_form_warn return array( '#warning' => t('!book_form() is deprecated', array( - '!book_form' => theme('drupalapi', 'book_form', '5') + '!book_form' => theme('drupalapi', array('function' => 'book_form', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1035,7 +1035,7 @@ function _coder_review_6x_book_insert_wa return array( '#warning' => t('!book_insert() is deprecated', array( - '!book_insert' => theme('drupalapi', 'book_insert', '5') + '!book_insert' => theme('drupalapi', array('function' => 'book_insert', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1046,7 +1046,7 @@ function _coder_review_6x_book_location_ return array( '#warning' => t('!book_location() is deprecated', array( - '!book_location' => theme('drupalapi', 'book_location', '5') + '!book_location' => theme('drupalapi', array('function' => 'book_location', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1057,7 +1057,7 @@ function _coder_review_6x_book_location_ return array( '#warning' => t('!book_location_down() is deprecated', array( - '!book_location_down' => theme('drupalapi', 'book_location_down', '5') + '!book_location_down' => theme('drupalapi', array('function' => 'book_location_down', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1068,7 +1068,7 @@ function _coder_review_6x_book_node_visi return array( '#warning' => t('!book_node_visitor_html_post() is deprecated', array( - '!book_node_visitor_html_post' => theme('drupalapi', 'book_node_visitor_html_post', '5') + '!book_node_visitor_html_post' => theme('drupalapi', array('function' => 'book_node_visitor_html_post', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1079,7 +1079,7 @@ function _coder_review_6x_book_node_visi return array( '#warning' => t('!book_node_visitor_html_pre() is deprecated', array( - '!book_node_visitor_html_pre' => theme('drupalapi', 'book_node_visitor_html_pre', '5') + '!book_node_visitor_html_pre' => theme('drupalapi', array('function' => 'book_node_visitor_html_pre', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1090,7 +1090,7 @@ function _coder_review_6x_book_recurse_w return array( '#warning' => t('!book_recurse() is deprecated', array( - '!book_recurse' => theme('drupalapi', 'book_recurse', '5') + '!book_recurse' => theme('drupalapi', array('function' => 'book_recurse', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1101,7 +1101,7 @@ function _coder_review_6x_book_toc_recur return array( '#warning' => t('!book_toc_recurse() is deprecated', array( - '!book_toc_recurse' => theme('drupalapi', 'book_toc_recurse', '5') + '!book_toc_recurse' => theme('drupalapi', array('function' => 'book_toc_recurse', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1112,7 +1112,7 @@ function _coder_review_6x_book_tree_warn return array( '#warning' => t('!book_tree() is deprecated', array( - '!book_tree' => theme('drupalapi', 'book_tree', '5') + '!book_tree' => theme('drupalapi', array('function' => 'book_tree', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1123,7 +1123,7 @@ function _coder_review_6x_book_tree_recu return array( '#warning' => t('!book_tree_recurse() is deprecated', array( - '!book_tree_recurse' => theme('drupalapi', 'book_tree_recurse', '5') + '!book_tree_recurse' => theme('drupalapi', array('function' => 'book_tree_recurse', 'version' => '5')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1134,7 +1134,7 @@ function _coder_review_6x_book_admin_edi return array( '#warning' => t('Parameters to !book_admin_edit() have changed', array( - '!book_admin_edit' => theme('drupalapi', 'book_admin_edit', '6') + '!book_admin_edit' => theme('drupalapi', array('function' => 'book_admin_edit', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1145,7 +1145,7 @@ function _coder_review_6x_book_toc_warni return array( '#warning' => t('Parameters to !book_toc() have changed', array( - '!book_toc' => theme('drupalapi', 'book_toc', '6') + '!book_toc' => theme('drupalapi', array('function' => 'book_toc', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1156,7 +1156,7 @@ function _coder_review_6x_book_export_ht return array( '#warning' => t('Parameters to !book_export_html() have changed', array( - '!book_export_html' => theme('drupalapi', 'book_export_html', '6') + '!book_export_html' => theme('drupalapi', array('function' => 'book_export_html', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1167,7 +1167,7 @@ function _coder_review_6x_book_export_wa return array( '#warning' => t('Parameters to !book_export() have changed', array( - '!book_export' => theme('drupalapi', 'book_export', '6') + '!book_export' => theme('drupalapi', array('function' => 'book_export', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1178,7 +1178,7 @@ function _coder_review_6x_book_outline_w return array( '#warning' => t('Parameters to !book_outline() have changed', array( - '!book_outline' => theme('drupalapi', 'book_outline', '6') + '!book_outline' => theme('drupalapi', array('function' => 'book_outline', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1189,7 +1189,7 @@ function _coder_review_6x_book_prev_warn return array( '#warning' => t('Parameters to !book_prev() have changed', array( - '!book_prev' => theme('drupalapi', 'book_prev', '6') + '!book_prev' => theme('drupalapi', array('function' => 'book_prev', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1200,7 +1200,7 @@ function _coder_review_6x_book_next_warn return array( '#warning' => t('Parameters to !book_next() have changed', array( - '!book_next' => theme('drupalapi', 'book_next', '6') + '!book_next' => theme('drupalapi', array('function' => 'book_next', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#book_module', @@ -1211,7 +1211,7 @@ function _coder_review_6x_nodeapi_submit return array( '#warning' => t('!hook_nodeapi(\'submit\') has been replaced by op=\'presave\'', array( - '!hook_nodeapi' => theme('drupalapi', 'hook_nodeapi', '6') + '!hook_nodeapi' => theme('drupalapi', array('function' => 'hook_nodeapi', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#nodeapi_presave', @@ -1222,7 +1222,7 @@ function _coder_review_6x_db_result_warn return array( '#warning' => t('Remove $row argument from !db_result() method', array( - '!db_result' => theme('drupalapi', 'db_result', '6') + '!db_result' => theme('drupalapi', array('function' => 'db_result', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#db-result', @@ -1233,7 +1233,7 @@ function _coder_review_6x_drupal_mail_wa return array( '#warning' => t('Parameters to !drupal_mail() have changed', array( - '!drupal_mail' => theme('drupalapi', 'drupal_mail', '6') + '!drupal_mail' => theme('drupalapi', array('function' => 'drupal_mail', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/189367', @@ -1251,7 +1251,7 @@ function _coder_review_6x_user_authentic return array( '#warning' => t('Parameters to !user_authenticate have changed', array( - '!user_authenticate' => theme('drupalapi', 'user_authenticate', '6') + '!user_authenticate' => theme('drupalapi', array('function' => 'user_authenticate', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#user_authenticate', @@ -1262,7 +1262,7 @@ function _coder_review_6x_hook_access_wa return array( '#warning' => t('Parameters to !hook_access() have changed', array( - '!hook_access' => theme('drupalapi', 'hook_access', '6') + '!hook_access' => theme('drupalapi', array('function' => 'hook_access', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#hook_access', @@ -1273,7 +1273,7 @@ function _coder_review_6x_menu_get_objec return array( '#warning' => t('Use !menu_get_object() to get an object based on your path', array( - '!menu_get_object' => theme('drupalapi', 'menu_get_object', '6') + '!menu_get_object' => theme('drupalapi', array('function' => 'menu_get_object', 'version' => '6')) ) ), '#link' => 'http://drupal.org/node/114774#menu_get_object', @@ -1299,7 +1299,7 @@ function _coder_review_6x_hook_forms_war return array( '#warning' => t('The arguments to !hook_forms() have changed', array( - '!hook_forms' => theme('drupalapi', 'hook_forms', '6'), + '!hook_forms' => theme('drupalapi', array('function' => 'hook_forms', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/144132#hook-forms', Index: coder_review/includes/coder_review_7x.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_7x.inc,v retrieving revision 1.40 diff -u -p -r1.40 coder_review_7x.inc --- coder_review/includes/coder_review_7x.inc 26 Sep 2009 23:28:00 -0000 1.40 +++ coder_review/includes/coder_review_7x.inc 18 Oct 2009 12:41:35 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_7x_reviews() { $argex = '(((&?\$?)[a-zA-Z_]+((\([^)]*\))|\[[^\]]*\])?)|[0-9]+(\.[0-9]*)?|\'\'|"")'; @@ -940,12 +940,11 @@ function _coder_review_7x_drupal_behavio /** * Define the warning callbacks. */ - function _coder_review_7x_referer_uri_warning() { return array( '#warning' => t('!referer_uri() has been removed and replaced with the PHP global $_SERVER[\'HTTP_REFERER\']', array( - '!referer_uri' => theme('drupalapi', 'referer_uri', '6'), + '!referer_uri' => theme('drupalapi', array('function' => 'referer_uri', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/224333#referer_uri', @@ -956,7 +955,7 @@ function _coder_review_7x_drupal_clone_w return array( '#warning' => t('!drupal_clone() has been removed and the PHP 5 !clone should be used instead.', array( - '!drupal_clone' => theme('drupalapi', 'drupal_clone', '6'), + '!drupal_clone' => theme('drupalapi', array('function' => 'drupal_clone', 'version' => '6')), '!clone' => l(t('!clone', array('!clone' => 'clone')), 'http://us.php.net/language.oop5.cloning'), ) ), @@ -968,8 +967,8 @@ function _coder_review_7x_node_invoke_no return array( '#warning' => t('!node_invoke_nodeapi() has been removed and !module_invoke_all(\'node_\' . $hook, $node); should be used instead.', array( - '!node_invoke_nodeapi' => theme('drupalapi', 'node_invoke_nodeapi', '6'), - '!module_invoke_all' => theme('drupalapi', 'module_invoke_all', '6'), + '!node_invoke_nodeapi' => theme('drupalapi', array('function' => 'node_invoke_nodeapi', 'version' => '6')), + '!module_invoke_all' => theme('drupalapi', array('function' => 'module_invoke_all', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/224333#node_invoke_nodeapi', @@ -980,7 +979,7 @@ function _coder_review_7x_session_warnin return array( '#warning' => t('Use !drupal_set_session() instead of $_SESSION', array( - '!drupal_set_session()' => theme('drupalapi', 'drupal_set_session', '7'), + '!drupal_set_session()' => theme('drupalapi', array('function' => 'drupal_set_session', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#drupal_set_session', @@ -991,8 +990,8 @@ function _coder_review_7x_db_rewrite_sql return array( '#warning' => t('!db_rewrite_sql() replaced with !hook_query_alter()', array( - '!db_rewrite_sql()' => theme('drupalapi', 'db_rewrite_sql', '6'), - '!hook_query_alter()' => theme('drupalapi', 'hook_query_alter', '7'), + '!db_rewrite_sql()' => theme('drupalapi', array('function' => 'db_rewrite_sql', 'version' => '6')), + '!hook_query_alter()' => theme('drupalapi', array('function' => 'hook_query_alter', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#db_rewrite_sql', @@ -1003,7 +1002,7 @@ function _coder_review_7x_schema_transla return array( '#warning' => t('Schema descriptions are no longer translated in !hook_schema()', array( - '!hook_schema()' => theme('drupalapi', 'hook_schema', '6'), + '!hook_schema()' => theme('drupalapi', array('function' => 'hook_schema', 'version' => '6')), ) ), '#link' => 'http://drupal.org/node/224333#schema_translation', @@ -1014,8 +1013,8 @@ function _coder_review_7x_comment_load_w return array( '#warning' => t('!_comment_load() has been renamed to !comment_load()', array( - '!_comment_load()' => theme('drupalapi', '_comment_load', '6'), - '!comment_load()' => theme('drupalapi', 'comment_load', '7'), + '!_comment_load()' => theme('drupalapi', array('function' => '_comment_load', 'version' => '6')), + '!comment_load()' => theme('drupalapi', array('function' => 'comment_load', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#comment_load', @@ -1040,8 +1039,8 @@ function _coder_review_7x_file_set_statu return array( '#warning' => t('!file_set_status() has been removed and !file_save() should be used in its place.', array( - '!file_set_status()' => theme('drupalapi', 'file_set_status', '6'), - '!file_save()' => theme('drupalapi', 'file_save', '7'), + '!file_set_status()' => theme('drupalapi', array('function' => 'file_set_status', 'version' => '6')), + '!file_save()' => theme('drupalapi', array('function' => 'file_save', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#file_set_status', @@ -1052,8 +1051,8 @@ function _coder_review_7x_user_delete_wa return array( '#warning' => t('!user_delete() replaced by !user_cancel()', array( - '!user_delete()' => theme('drupalapi', 'user_delete', '6'), - '!user_cancel()' => theme('drupalapi', 'user_cancel', '7'), + '!user_delete()' => theme('drupalapi', array('function' => 'user_delete', 'version' => '6')), + '!user_cancel()' => theme('drupalapi', array('function' => 'user_cancel', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#user_cancel', @@ -1064,8 +1063,8 @@ function _coder_review_7x_hook_user_op_w return array( '#warning' => t('!hook_user() has been removed in favour of hook_user_$op functions, for example !hook_user_validate().', array( - '!hook_user()' => theme('drupalapi', 'hook_user', '6'), - '!hook_user_validate()' => theme('drupalapi', 'hook_user_validate', '7'), + '!hook_user()' => theme('drupalapi', array('function' => 'hook_user', 'version' => '6')), + '!hook_user_validate()' => theme('drupalapi', array('function' => 'hook_user_validate', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#remove_op', @@ -1076,7 +1075,7 @@ function _coder_review_7x_hook_nodeapi_o return array( '#warning' => t('!hook_nodeapi() has been split into a number of smaller hooks.', array( - '!hook_nodeapi()' => theme('drupalapi', 'hook_nodeapi', '7'), + '!hook_nodeapi()' => theme('drupalapi', array('function' => 'hook_nodeapi', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#remove_op', @@ -1087,7 +1086,7 @@ function _coder_review_7x_hook_node_info return array( '#warning' => t('For content types managed by the node module, change "node" to "node_content" in !hook_node_info()', array( - '!hook_node_info()' => theme('drupalapi', 'hook_node_info', '7'), + '!hook_node_info()' => theme('drupalapi', array('function' => 'hook_node_info', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#node_type_base', @@ -1098,7 +1097,7 @@ function _coder_review_7x_hook_node_info return array( '#warning' => t('Change "module" to "base" in !hook_node_info()', array( - '!hook_node_info()' => theme('drupalapi', 'hook_node_info', '7'), + '!hook_node_info()' => theme('drupalapi', array('function' => 'hook_node_info', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#node_type_base', @@ -1109,7 +1108,7 @@ function _coder_review_7x_hook_block_op_ return array( '#warning' => t('!hook_block() has been split into a number of smaller hooks.', array( - '!hook_block()' => theme('drupalapi', 'hook_block', '7'), + '!hook_block()' => theme('drupalapi', array('function' => 'hook_block', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#remove_op', @@ -1138,7 +1137,7 @@ function _coder_review_7x_actions_synchr return array( '#warning' => t('Parameters for !actions_synchronize() have changed', array( - '!actions_synchronize()' => theme('drupalapi', 'actions_synchronize', 7), + '!actions_synchronize()' => theme('drupalapi', array('function' => 'actions_synchronize', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#actions_synchronize', @@ -1149,7 +1148,7 @@ function _coder_review_7x_check_markup_w return array( '#warning' => t('Parameters for !check_markup() have changed', array( - '!check_markup()' => theme('drupalapi', 'check_markup', 7), + '!check_markup()' => theme('drupalapi', array('function' => 'check_markup', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#check_markup_params', @@ -1160,8 +1159,8 @@ function _coder_review_7x_drupal_set_tit return array( '#warning' => t('!drupal_set_title() now uses !check_plain() by default', array( - '!drupal_set_title()' => theme('drupalapi', 'drupal_set_title', 7), - '!check_plain()' => theme('drupalapi', 'check_plain', 7), + '!drupal_set_title()' => theme('drupalapi', array('function' => 'drupal_set_title', 'version' => 7)), + '!check_plain()' => theme('drupalapi', array('function' => 'check_plain', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_set_title', @@ -1172,8 +1171,8 @@ function _coder_review_7x_hook_filter_wa return array( '#warning' => t('!hook_filter() has been removed in favour of !hook_filter_info().', array( - '!hook_filter_info()' => theme('drupalapi', 'hook_filter_info', 7), - '!hook_filter()' => theme('drupalapi', 'hook_filter', 6), + '!hook_filter_info()' => theme('drupalapi', array('function' => 'hook_filter_info', 'version' => 7)), + '!hook_filter()' => theme('drupalapi', array('function' => 'hook_filter', 'version' => 6)), ) ), '#link' => 'http://drupal.org/node/224333#hook_filter_info', @@ -1184,8 +1183,8 @@ function _coder_review_7x_hook_filter_ti return array( '#warning' => t('!hook_filter_tips() has been removed in favour of !hook_filter_info().', array( - '!hook_filter_info()' => theme('drupalapi', 'hook_filter_info', 7), - '!hook_filter_tips()' => theme('drupalapi', 'hook_filter_tips', 6), + '!hook_filter_info()' => theme('drupalapi', array('function' => 'hook_filter_info', 'version' => 7)), + '!hook_filter_tips()' => theme('drupalapi', array('function' => 'hook_filter_tips', 'version' => 6)), ) ), '#link' => 'http://drupal.org/node/224333#hook_filter_info', @@ -1217,8 +1216,8 @@ function _coder_review_7x_theme_rebuild_ return array( '#warning' => t('!drupal_rebuild_theme_registry() function has been renamed to !drupal_theme_rebuild()', array( - '!drupal_rebuild_theme_registry()' => theme('drupalapi', 'drupal_rebuild_theme_registry', 6), - '!drupal_theme_rebuild()' => theme('drupalapi', 'drupal_theme_rebuild', 7), + '!drupal_rebuild_theme_registry()' => theme('drupalapi', array('function' => 'drupal_rebuild_theme_registry', 'version' => 6)), + '!drupal_theme_rebuild()' => theme('drupalapi', array('function' => 'drupal_theme_rebuild', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#rebuild_functions', @@ -1229,8 +1228,8 @@ function _coder_review_7x_code_registry_ return array( '#warning' => t('!drupal_rebuild_code_registry() function has been renamed to !registry_rebuild()', array( - '!drupal_rebuild_code_registry()' => theme('drupalapi', 'drupal_rebuild_code_registry', 6), - '!registry_rebuild()' => theme('drupalapi', 'registry_rebuild', 7), + '!drupal_rebuild_code_registry()' => theme('drupalapi', array('function' => 'drupal_rebuild_code_registry', 'version' => 6)), + '!registry_rebuild()' => theme('drupalapi', array('function' => 'registry_rebuild', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#rebuild_functions', @@ -1241,8 +1240,8 @@ function _coder_review_7x_taxonomy_get_t return array( '#warning' => t('!taxonomy_get_term() function has been renamed to !taxonomy_term_load()', array( - '!taxonomy_get_term()' => theme('drupalapi', 'taxonomy_get_term', 6), - '!taxonomy_term_load()' => theme('drupalapi', 'taxonomy_term_load', 7), + '!taxonomy_get_term()' => theme('drupalapi', array('function' => 'taxonomy_get_term', 'version' => 6)), + '!taxonomy_term_load()' => theme('drupalapi', array('function' => 'taxonomy_term_load', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#taxonomy_crud', @@ -1253,8 +1252,8 @@ function _coder_review_7x_taxonomy_save_ return array( '#warning' => t('!taxonomy_save_term() function has been renamed to !taxonomy_term_save() and takes a term object as a parameter instead of any array.', array( - '!taxonomy_save_term()' => theme('drupalapi', 'taxonomy_save_term', 6), - '!taxonomy_term_save()' => theme('drupalapi', 'taxonomy_term_save', 7), + '!taxonomy_save_term()' => theme('drupalapi', array('function' => 'taxonomy_save_term', 'version' => 6)), + '!taxonomy_term_save()' => theme('drupalapi', array('function' => 'taxonomy_term_save', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#taxonomy_crud', @@ -1265,8 +1264,8 @@ function _coder_review_7x_taxonomy_del_t return array( '#warning' => t('!taxonomy_del_term() function has been renamed to !taxonomy_term_delete()', array( - '!taxonomy_del_term()' => theme('drupalapi', 'taxonomy_del_term', 6), - '!taxonomy_term_delete()' => theme('drupalapi', 'taxonomy_term_delete', 7), + '!taxonomy_del_term()' => theme('drupalapi', array('function' => 'taxonomy_del_term', 'version' => 6)), + '!taxonomy_term_delete()' => theme('drupalapi', array('function' => 'taxonomy_term_delete', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#taxonomy_crud', @@ -1277,8 +1276,8 @@ function _coder_review_7x_taxonomy_save_ return array( '#warning' => t('!taxonomy_save_vocabulary() function has been renamed to !taxonomy_vocabulary_save() and takes a vocabulary object as a parameter instead of any array.', array( - '!taxonomy_save_vocabulary()' => theme('drupalapi', 'taxonomy_save_vocabulary', 6), - '!taxonomy_vocabulary_save()' => theme('drupalapi', 'taxonomy_vocabulary_save', 7), + '!taxonomy_save_vocabulary()' => theme('drupalapi', array('function' => 'taxonomy_save_vocabulary', 'version' => 6)), + '!taxonomy_vocabulary_save()' => theme('drupalapi', array('function' => 'taxonomy_vocabulary_save', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#taxonomy_crud', @@ -1289,8 +1288,8 @@ function _coder_review_7x_taxonomy_del_v return array( '#warning' => t('!taxonomy_del_vocabulary() function has been renamed to !taxonomy_vocabulary_delete()', array( - '!taxonomy_del_vocabulary()' => theme('drupalapi', 'taxonomy_del_vocabulary', 6), - '!taxonomy_vocabulary_delete()' => theme('drupalapi', 'taxonomy_vocabulary_delete', 7), + '!taxonomy_del_vocabulary()' => theme('drupalapi', array('function' => 'taxonomy_del_vocabulary', 'version' => 6)), + '!taxonomy_vocabulary_delete()' => theme('drupalapi', array('function' => 'taxonomy_vocabulary_delete', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#taxonomy_crud', @@ -1308,8 +1307,8 @@ function _coder_review_7x_drupal_execute return array( '#warning' => t('!drupal_execute() has been renamed to !drupal_submit_form()', array( - '!drupal_execute()' => theme('drupalapi', 'drupal_execute'), - '!drupal_submit_form()' => theme('drupalapi', 'drupal_submit_form', 7), + '!drupal_execute()' => theme('drupalapi', array('function' => 'drupal_execute', 'version' => 6)), + '!drupal_submit_form()' => theme('drupalapi', array('function' => 'drupal_submit_form', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_execute_drupal_form_submit', @@ -1320,8 +1319,8 @@ function _coder_review_7x_node_view_warn return array( '#warning' => t('!node_view() has been removed and !node_build() should be used instead.', array( - '!node_view' => theme('drupalapi', 'node_view', 6), - '!node_build()' => theme('drupalapi', 'node_build', 7), + '!node_view' => theme('drupalapi', array('function' => 'node_view', 'version' => 6)), + '!node_build()' => theme('drupalapi', array('function' => 'node_build', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#node_view', @@ -1332,8 +1331,8 @@ function _coder_review_7x_comment_valida return array( '#warning' => t('!comment_validate() has been removed and !comment_form_validate() should be used instead.', array( - '!comment_validate' => theme('drupalapi', 'comment_validate', 6), - '!comment_form_validate()' => theme('drupalapi', 'comment_form_validate', 7), + '!comment_validate' => theme('drupalapi', array('function' => 'comment_validate', 'version' => 6)), + '!comment_form_validate()' => theme('drupalapi', array('function' => 'comment_form_validate', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#comment_validate_removed', @@ -1344,7 +1343,7 @@ function _coder_review_7x_comment_node_u return array( '#warning' => t('!comment_node_url() has been removed. Use "node/" . $comment->nid to build URLs instead.', array( - '!comment_node_url' => theme('drupalapi', 'comment_node_url', 6), + '!comment_node_url' => theme('drupalapi', array('function' => 'comment_node_url', 'version' => 6)), ) ), '#link' => 'http://drupal.org/node/224333#comment_node_url', @@ -1355,7 +1354,7 @@ function _coder_review_7x_node_load_warn return array( '#warning' => t('!node_load() now only takes nid and vid as parameters.', array( - '!node_load' => theme('drupalapi', 'node_load', 7), + '!node_load' => theme('drupalapi', array('function' => 'node_load', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#node_load_multiple', @@ -1366,8 +1365,8 @@ function _coder_review_7x_hook_perm_warn return array( '#warning' => t('!hook_perm() has been renamed to !hook_permission().', array( - '!hook_perm' => theme('drupalapi', 'hook_perm', 6), - '!hook_permission' => theme('drupalapi', 'hook_permission', 7), + '!hook_perm' => theme('drupalapi', array('function' => 'hook_perm', 'version' => 6)), + '!hook_permission' => theme('drupalapi', array('function' => 'hook_permission', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#hook_permission', @@ -1392,7 +1391,7 @@ function _coder_review_7x_taxonomy_get_t return array( '#warning' => t('!taxonomy_get_tree()\'s $depth and $max_depth parameters have changed positions.', array( - '!taxonomy_get_tree' => theme('drupalapi', 'taxonomy_get_tree', 7), + '!taxonomy_get_tree' => theme('drupalapi', array('function' => 'taxonomy_get_tree', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#taxonomy_get_tree', @@ -1410,7 +1409,7 @@ function _coder_review_7x_book_toc_warni return array( '#warning' => t('!book_toc()\'s $depth_limit and $exclude parameters have changed positions.', array( - '!book_toc' => theme('drupalapi', 'book_toc', 7), + '!book_toc' => theme('drupalapi', array('function' => 'book_toc', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#book_toc_parameters', @@ -1421,7 +1420,7 @@ function _coder_review_7x_node_type_get_ return array( '#warning' => t('!node_get_types() function has been replaced by node_type_get_$op() functions.', array( - '!node_get_types' => theme('drupalapi', 'node_get_types', 6), + '!node_get_types' => theme('drupalapi', array('function' => 'node_get_types', 'version' => 6)), ) ), '#link' => 'http://drupal.org/node/224333#node_type_get_functions', @@ -1432,7 +1431,7 @@ function _coder_review_7x_node_build_rss return array( '#warning' => t('Removed $op "rss item" from !hook_nodeapi() in favor of NODE_BUILD_RSS.', array( - '!hook_nodeapi()' => theme('drupalapi', 'hook_nodeapi', '7'), + '!hook_nodeapi()' => theme('drupalapi', array('function' => 'hook_nodeapi', 'version' => '7')), ) ), '#link' => 'http://drupal.org/node/224333#node_build_rss', @@ -1457,8 +1456,8 @@ function _coder_review_7x_node_links_war return array( '#warning' => t('Node and taxonomy links are no longer emitted by !hook_link() and !hook_link_alter().', array( - '!hook_link()' => theme('drupalapi', 'hook_link', 7), - '!hook_link_alter()' => theme('drupalapi', 'hook_link_alter', 7), + '!hook_link()' => theme('drupalapi', array('function' => 'hook_link', 'version' => 7)), + '!hook_link_alter()' => theme('drupalapi', array('function' => 'hook_link_alter', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#node_links', @@ -1469,8 +1468,8 @@ function _coder_review_7x_drupal_uninsta return array( '#warning' => t('!drupal_uninstall_module() has been renamed to !drupal_uninstall_modules() and now takes an array of module names.', array( - '!drupal_uninstall_module()' => theme('drupalapi', 'drupal_uninstall_module', 6), - '!drupal_uninstall_modules()' => theme('drupalapi', 'drupal_uninstall_modules', 7), + '!drupal_uninstall_module()' => theme('drupalapi', array('function' => 'drupal_uninstall_module', 'version' => 6)), + '!drupal_uninstall_modules()' => theme('drupalapi', array('function' => 'drupal_uninstall_modules', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_uninstall_modules', @@ -1481,7 +1480,7 @@ function _coder_review_7x_drupal_http_re return array( '#warning' => t('Parameters to !drupal_http_request() have changed.', array( - '!drupal_http_request()' => theme('drupalapi', 'drupal_http_request', 7), + '!drupal_http_request()' => theme('drupalapi', array('function' => 'drupal_http_request', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_http_request_parameters', @@ -1499,8 +1498,8 @@ function _coder_review_7x_drupal_set_htm return array( '#warning' => t('!drupal_set_html_head() has been renamed to !drupal_add_html_head().', array( - '!drupal_set_html_head()' => theme('drupalapi', 'drupal_set_html_head', 6), - '!drupal_add_html_head()' => theme('drupalapi', 'drupal_add_html_head', 7), + '!drupal_set_html_head()' => theme('drupalapi', array('function' => 'drupal_set_html_head', 'version' => 6)), + '!drupal_add_html_head()' => theme('drupalapi', array('function' => 'drupal_add_html_head', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_set_html_head', @@ -1511,8 +1510,8 @@ function _coder_review_7x_php_eval_warni return array( '#warning' => t("!drupal_eval() has been renamed to !php_eval() and should be wrapped in a module_exists('php') check.", array( - '!drupal_eval()' => theme('drupalapi', 'drupal_eval', 6), - '!php_eval()' => theme('drupalapi', 'php_eval', 7), + '!drupal_eval()' => theme('drupalapi', array('function' => 'drupal_eval', 'version' => 6)), + '!php_eval()' => theme('drupalapi', array('function' => 'php_eval', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#php_eval', @@ -1523,8 +1522,8 @@ function _coder_review_7x_module_rebuild return array( '#warning' => t('!module_rebuild_cache() has been renamed to !system_get_module_data().', array( - '!module_rebuild_cache()' => theme('drupalapi', 'module_rebuild_cache', 6), - '!system_get_module_data()' => theme('drupalapi', 'system_get_module_data', 7), + '!module_rebuild_cache()' => theme('drupalapi', array('function' => 'module_rebuild_cache', 'version' => 6)), + '!system_get_module_data()' => theme('drupalapi', array('function' => 'system_get_module_data', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#system_get_module_data', @@ -1535,8 +1534,8 @@ function _coder_review_7x_system_theme_d return array( '#warning' => t('!system_theme_data() has been renamed to !system_get_theme_data().', array( - '!system_theme_data()' => theme('drupalapi', 'system_theme_data', 6), - '!system_get_theme_data()' => theme('drupalapi', 'system_get_theme_data', 7), + '!system_theme_data()' => theme('drupalapi', array('function' => 'system_theme_data', 'version' => 6)), + '!system_get_theme_data()' => theme('drupalapi', array('function' => 'system_get_theme_data', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#system_get_module_data', @@ -1547,8 +1546,8 @@ function _coder_review_7x_drupal_set_con return array( '#warning' => t('!drupal_set_content() has been renamed to !drupal_add_region_content().', array( - '!drupal_set_content()' => theme('drupalapi', 'drupal_set_content', 6), - '!drupal_add_region_content()' => theme('drupalapi', 'drupal_add_region_content', 7), + '!drupal_set_content()' => theme('drupalapi', array('function' => 'drupal_set_content', 'version' => 6)), + '!drupal_add_region_content()' => theme('drupalapi', array('function' => 'drupal_add_region_content', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_set_content', @@ -1559,8 +1558,8 @@ function _coder_review_7x_drupal_get_con return array( '#warning' => t('!drupal_get_content() has been renamed to !drupal_get_region_content().', array( - '!drupal_get_content()' => theme('drupalapi', 'drupal_get_content', 6), - '!drupal_get_region_content()' => theme('drupalapi', 'drupal_get_region_content', 7), + '!drupal_get_content()' => theme('drupalapi', array('function' => 'drupal_get_content', 'version' => 6)), + '!drupal_get_region_content()' => theme('drupalapi', array('function' => 'drupal_get_region_content', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_set_content', @@ -1571,7 +1570,7 @@ function _coder_review_7x_http_header_fu return array( '#warning' => t('Parameters to !drupal_set_header() have changed.', array( - '!drupal_set_header()' => theme('drupalapi', 'drupal_set_header', 7), + '!drupal_set_header()' => theme('drupalapi', array('function' => 'drupal_set_header', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#http_header_functions', @@ -1597,7 +1596,7 @@ function _coder_review_7x_user_load_warn return array( '#warning' => t('!user_load() now only takes a user ID as its argument.', array( - '!user_load()' => theme('drupalapi', 'user_load', 7), + '!user_load()' => theme('drupalapi', array('function' => 'user_load', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#user_load_multiple', @@ -1608,8 +1607,8 @@ function _coder_review_7x_hook_footer_wa return array( '#warning' => t('!hook_footer() and !theme_closure() were removed.', array( - '!hook_footer()' => theme('drupalapi', 'hook_footer', 6), - '!theme_closure()' => theme('drupalapi', 'theme_closure', 6), + '!hook_footer()' => theme('drupalapi', array('function' => 'hook_footer', 'version' => 6)), + '!theme_closure()' => theme('drupalapi', array('function' => 'theme_closure', 'version' => 6)), ) ), '#link' => 'http://drupal.org/node/224333#hook_footer', @@ -1627,7 +1626,7 @@ function _coder_review_7x_theme_page_war return array( '#warning' => t('Instead of "theme(\'page\')" use !drupal_set_page_content()', array( - '!drupal_set_page_content()' => theme('drupalapi', 'drupal_set_page_content()', 7), + '!drupal_set_page_content()' => theme('drupalapi', array('function' => 'drupal_set_page_content', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#theme_page', @@ -1638,7 +1637,7 @@ function _coder_review_7x_drupal_add_js_ return array( '#warning' => t('Parameters to !drupal_add_js() have changed.', array( - '!drupal_add_js()' => theme('drupalapi', 'drupal_add_js()', 7), + '!drupal_add_js()' => theme('drupalapi', array('function' => 'drupal_add_js', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_add_js_options', @@ -1649,7 +1648,7 @@ function _coder_review_7x_drupal_add_css return array( '#warning' => t('Parameters to !drupal_add_css() have changed.', array( - '!drupal_add_css()' => theme('drupalapi', 'drupal_add_css()', 7), + '!drupal_add_css()' => theme('drupalapi', array('function' => 'drupal_add_css', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_add_js_options', @@ -1667,7 +1666,7 @@ function _coder_review_7x_hook_js_alter_ return array( '#warning' => t('There is a new !hook_js_alter() to alter JavaScript.', array( - '!hook_js_alter()' => theme('drupalapi', 'hook_js_alter()', 7), + '!hook_js_alter()' => theme('drupalapi', array('function' => 'hook_js_alter', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#hook_js_alter', @@ -1678,7 +1677,7 @@ function _coder_review_7x_drupal_add_js_ return array( '#warning' => t("Replace 'core', 'module' and 'theme' with 'file' in !drupal_add_js()", array( - '!drupal_add_js()' => theme('drupalapi', 'drupal_add_js()', 7), + '!drupal_add_js()' => theme('drupalapi', array('function' => 'drupal_add_js', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_add_js_weight', @@ -1696,7 +1695,7 @@ function _coder_review_7x_drupal_add_js_ return array( '#warning' => t('External JavaScript can now be referenced through !drupal_add_js().', array( - '!drupal_add_js()' => theme('drupalapi', 'drupal_add_js()', 7), + '!drupal_add_js()' => theme('drupalapi', array('function' => 'drupal_add_js', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#drupal_add_js_external', @@ -1714,7 +1713,7 @@ function _coder_review_7x_file_scan_dire return array( '#warning' => t('Parameters to !file_scan_directory() have changed.', array( - '!file_scan_directory()' => theme('drupalapi', 'file_scan_directory()', 7), + '!file_scan_directory()' => theme('drupalapi', array('function' => 'file_scan_directory', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#file_scan_directory_array_itize', @@ -1725,7 +1724,7 @@ function _coder_review_7x_file_scan_dire return array( '#warning' => t('!file_scan_directory() now uses a preg regular expression for the nomask parameter.', array( - '!file_scan_directory()' => theme('drupalapi', 'file_scan_directory()', 7), + '!file_scan_directory()' => theme('drupalapi', array('function' => 'file_scan_directory', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#file_scan_directory_nomask', @@ -1736,7 +1735,7 @@ function _coder_review_7x_drupal_system_ return array( '#warning' => t('!drupal_system_listing() now uses preg regular expressions.', array( - '!drupal_system_listing()' => theme('drupalapi', 'drupal_system_listing()', 7), + '!drupal_system_listing()' => theme('drupalapi', array('function' => 'drupal_system_listing', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#preg_match', @@ -1747,7 +1746,7 @@ function _coder_review_7x_file_scan_dire return array( '#warning' => t('!file_scan_directory() now uses preg regular expressions.', array( - '!file_scan_directory()' => theme('drupalapi', 'file_scan_directory()', 7), + '!file_scan_directory()' => theme('drupalapi', array('function' => 'file_scan_directory', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#preg_match', @@ -1765,7 +1764,7 @@ function _coder_review_7x_descriptions_p return array( '#warning' => t('Permissions are required to have titles and descriptions in !hook_permission().', array( - '!hook_permission()' => theme('drupalapi', 'hook_permission()', 7), + '!hook_permission()' => theme('drupalapi', array('function' => 'hook_permission', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#descriptions_permissions', @@ -1783,7 +1782,7 @@ function _coder_review_7x_hook_menu_link return array( '#warning' => t('The parameters to !hook_menu_link_alter() have changed.', array( - '!hook_menu_link_alter()' => theme('drupalapi', 'hook_menu_link_alter()', 7), + '!hook_menu_link_alter()' => theme('drupalapi', array('function' => 'hook_menu_link_alter', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#hook_menu_link_alter', @@ -1794,7 +1793,7 @@ function _coder_review_7x_time_limit_war return array( '#warning' => t('Use !drupal_set_time_limit() instead of !set_time_limit().', array( - '!drupal_set_time_limit()' => theme('drupalapi', 'drupal_set_time_limit()', 7), + '!drupal_set_time_limit()' => theme('drupalapi', array('function' => 'drupal_set_time_limit', 'version' => 7)), '!set_time_limit()' => theme('phpapi', 'set_time_limit()'), ) ), @@ -1806,7 +1805,7 @@ function _coder_review_7x_user_authentic return array( '#warning' => t('Parameters to !user_authenticate() have changed.', array( - '!user_authenticate()' => theme('drupalapi', 'user_authenticate()', 7), + '!user_authenticate()' => theme('drupalapi', array('function' => 'user_authenticate', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#user_authenticate', @@ -1838,7 +1837,7 @@ function _coder_review_7x_node_form_warn return array( '#warning' => t('Easier check for node form during !hook_form_alter().', array( - '!hook_form_alter()' => theme('drupalapi', 'hook_form_alter()', 7), + '!hook_form_alter()' => theme('drupalapi', array('function' => 'hook_form_alter', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#node_form', @@ -1849,7 +1848,7 @@ function _coder_review_7x_hook_form_alte return array( '#warning' => t('Parameters to !hook_form_alter() have changed.', array( - '!hook_form_alter()' => theme('drupalapi', 'hook_form_alter()', 7), + '!hook_form_alter()' => theme('drupalapi', array('function' => 'hook_form_alter', 'version' => 7)), ) ), // '#link' => 'http://drupal.org/node/224333#node_form', @@ -1860,12 +1859,12 @@ function _coder_review_7x_process_functi return array( '#warning' => t('!expand_password_confirm(), !expand_date(), !expand_radios(), !form_expand_ahah(), !expand_checkboxes(), !process_weight() have been renamed.', array( - '!expand_password_confirm()' => theme('drupalapi', 'expand_password_confirm()', 6), - '!expand_date()' => theme('drupalapi', 'expand_date()', 6), - '!expand_radios()' => theme('drupalapi', 'expand_radios()', 6), - '!form_expand_ahah()' => theme('drupalapi', 'form_expand_ahah()', 6), - '!expand_checkboxes()' => theme('drupalapi', 'expand_checkboxes()', 6), - '!process_weight()' => theme('drupalapi', 'process_weight()', 6), + '!expand_password_confirm()' => theme('drupalapi', array('function' => 'expand_password_confirm', 'version' => 6)), + '!expand_date()' => theme('drupalapi', array('function' => 'expand_date', 'version' => 6)), + '!expand_radios()' => theme('drupalapi', array('function' => 'expand_radios', 'version' => 6)), + '!form_expand_ahah()' => theme('drupalapi', array('function' => 'form_expand_ahah', 'version' => 6)), + '!expand_checkboxes()' => theme('drupalapi', array('function' => 'expand_checkboxes', 'version' => 6)), + '!process_weight()' => theme('drupalapi', array('function' => 'process_weight', 'version' => 6)), ) ), '#link' => 'http://drupal.org/node/224333#process_functions', @@ -1904,10 +1903,11 @@ function _coder_review_7x_hook_access_wa return array( '#warning' => t('!hook_access() removed in favor of !hook_node_access().', array( - '!hook_access()' => theme('drupalapi', 'hook_access', 6), - '!hook_node_access()' => theme('drupalapi', 'hook_node_access', 7), + '!hook_access()' => theme('drupalapi', array('function' => 'hook_access', 'version' => 6)), + '!hook_node_access()' => theme('drupalapi', array('function' => 'hook_node_access', 'version' => 7)), ) ), '#link' => 'http://drupal.org/node/224333#hook_node_access', ); } + Index: coder_review/includes/coder_review_comment.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_comment.inc,v retrieving revision 1.11 diff -u -p -r1.11 coder_review_comment.inc --- coder_review/includes/coder_review_comment.inc 14 Aug 2009 00:15:47 -0000 1.11 +++ coder_review/includes/coder_review_comment.inc 18 Oct 2009 12:41:35 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_comment_reviews() { $rules = array( Index: coder_review/includes/coder_review_i18n.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_i18n.inc,v retrieving revision 1.5 diff -u -p -r1.5 coder_review_i18n.inc --- coder_review/includes/coder_review_i18n.inc 14 Aug 2009 00:15:47 -0000 1.5 +++ coder_review/includes/coder_review_i18n.inc 18 Oct 2009 12:41:35 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_i18n_reviews() { $argex = '(((\$?)[a-zA-Z_]+((\([^)]*\))|\[[^\]]*\])?)|[0-9]+(\.[0-9]*)?|\'\'|"")'; @@ -99,8 +99,8 @@ function _coder_review_i18n_l_without_t( return array( '#warning' => t('The $text argument to !l() should be enclosed within !t() so that it is translatable.', array( - '!l' => theme('drupalapi', 'l'), - '!t' => theme('drupalapi', 't'), + '!l' => theme('drupalapi', array('function' => 'l')), + '!t' => theme('drupalapi', array('function' => 't')), ) ), ); @@ -110,8 +110,8 @@ function _coder_review_i18n_in_install_l return array( '#warning' => t('The $text argument to !l() should be enclosed within !st() so that it is translatable from within the install.', array( - '!l' => theme('drupalapi', 'l'), - '!st' => theme('drupalapi', 'st'), + '!l' => theme('drupalapi', array('function' => 'l')), + '!st' => theme('drupalapi', array('function' => 'st')), ) ), ); @@ -121,11 +121,11 @@ function _coder_review_i18n_in_install_t return array( '#warning' => t('Use !st() instead of !t() in !hook_install(), !hook_uninstall() and !hook_update_N()', array( - '!st' => theme('drupalapi', 'st'), - '!t' => theme('drupalapi', 't'), - '!hook_install' => theme('drupalapi', 'hook_install'), - '!hook_uninstall' => theme('drupalapi', 'hook_uninstall'), - '!hook_update_N' => theme('drupalapi', 'hook_update_N'), + '!st' => theme('drupalapi', array('function' => 'st')), + '!t' => theme('drupalapi', array('function' => 't')), + '!hook_install' => theme('drupalapi', array('function' => 'hook_install')), + '!hook_uninstall' => theme('drupalapi', array('function' => 'hook_uninstall')), + '!hook_update_N' => theme('drupalapi', array('function' => 'hook_update_N')), ) ), ); @@ -135,8 +135,8 @@ function _coder_review_i18n_fapi_title_w return array( '#warning' => t('The FAPI #title should be enclosed within !t() so that it is translatable.', array( - '!l' => theme('drupalapi', 'l'), - '!t' => theme('drupalapi', 't'), + '!l' => theme('drupalapi', array('function' => 'l')), + '!t' => theme('drupalapi', array('function' => 't')), ) ), ); @@ -146,8 +146,8 @@ function _coder_review_i18n_form_error_w return array( '#warning' => t('The $message argument to !form_error() should be enclosed within !t() so that it is translatable.', array( - '!form_error' => theme('drupalapi', 'form_error'), - '!t' => theme('drupalapi', 't'), + '!form_error' => theme('drupalapi', array('function' => 'form_error')), + '!t' => theme('drupalapi', array('function' => 't')), ) ), ); @@ -157,7 +157,7 @@ function _coder_review_i18n_in_hook_link return array( '#warning' => t("The 'title' option should be enclosed within !t() so that it is translatable.", array( - '!t' => theme('drupalapi', 't'), + '!t' => theme('drupalapi', array('function' => 't')), ) ), ); @@ -167,8 +167,8 @@ function _coder_review_i18n_drupal_set_m return array( '#warning' => t('The $message argument to !drupal_set_message() should be enclosed within !t() so that it is translatable.', array( - '!drupal_set_message' => theme('drupalapi', 'drupal_set_message'), - '!t' => theme('drupalapi', 't'), + '!drupal_set_message' => theme('drupalapi', array('function' => 'drupal_set_message')), + '!t' => theme('drupalapi', array('function' => 't')), ) ), ); @@ -178,8 +178,8 @@ function _coder_review_i18n_drupal_set_t return array( '#warning' => t('The $title argument to !drupal_set_title() should be enclosed within !t() so that it is translatable.', array( - '!drupal_set_title' => theme('drupalapi', 'drupal_set_title'), - '!t' => theme('drupalapi', 't'), + '!drupal_set_title' => theme('drupalapi', array('function' => 'drupal_set_title')), + '!t' => theme('drupalapi', array('function' => 't')), ) ), ); @@ -189,8 +189,8 @@ function _coder_review_i18n_watchdog_wit return array( '#warning' => t('The $message argument to !watchdog() should NOT be enclosed within !t(), so that it can be properly translated at display time.', array( - '!watchdog' => theme('drupalapi', 'watchdog'), - '!t' => theme('drupalapi', 't'), + '!watchdog' => theme('drupalapi', array('function' => 'watchdog')), + '!t' => theme('drupalapi', array('function' => 't')), ) ), ); @@ -200,7 +200,7 @@ function _coder_review_i18n_menu_with_t( return array( '#warning' => t('Menu item titles and descriptions should NOT be enclosed within !t().', array( - '!t' => theme('drupalapi', 't'), + '!t' => theme('drupalapi', array('function' => 't')), ) ), '#link' => 'http://drupal.org/node/140311', @@ -211,7 +211,7 @@ function _coder_review_i18n_space_starts return array( '#warning' => t('The $string argument to !t() should not begin or end with a space.', array( - '!t' => theme('drupalapi', 't'), + '!t' => theme('drupalapi', array('function' => 't')), ) ), '#link' => 'http://drupal.org/node/304150', Index: coder_review/includes/coder_review_i18n_po.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_i18n_po.inc,v retrieving revision 1.3 diff -u -p -r1.3 coder_review_i18n_po.inc --- coder_review/includes/coder_review_i18n_po.inc 14 Aug 2009 00:15:47 -0000 1.3 +++ coder_review/includes/coder_review_i18n_po.inc 18 Oct 2009 12:41:36 -0000 @@ -8,7 +8,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_i18n_po_reviews() { $argex = '(((\$?)[a-zA-Z_]+((\([^)]*\))|\[[^\]]*\])?)|[0-9]+(\.[0-9]*)?|\'\'|"")'; Index: coder_review/includes/coder_review_security.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_security.inc,v retrieving revision 1.2 diff -u -p -r1.2 coder_review_security.inc --- coder_review/includes/coder_review_security.inc 11 Mar 2009 03:05:04 -0000 1.2 +++ coder_review/includes/coder_review_security.inc 18 Oct 2009 12:41:36 -0000 @@ -9,7 +9,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_security_reviews() { $table = '\{[A-Za-z_]+\}'; // table-regex @@ -80,8 +80,8 @@ function coder_review_security_reviews() function _coder_review_security_l_check_plain_warning() { return t('!l() already contains a !check_plain() call by default', array( - '!l' => theme('drupalapi', 'l'), - '!check_plain' => theme('drupalapi', 'check_plain'), + '!l' => theme('drupalapi', array('function' => 'l')), + '!check_plain' => theme('drupalapi', array('function' => 'check_plain')), ) ); } @@ -89,7 +89,7 @@ function _coder_review_security_l_check_ function _coder_review_security_request_uri_warning() { return t('the use of REQUEST_URI is prone to XSS exploits and does not work on IIS; use !request_uri() instead', array( - '!request_uri' => theme('drupalapi', 'request_uri'), + '!request_uri' => theme('drupalapi', array('function' => 'request_uri')), ) ); } @@ -98,7 +98,7 @@ function _coder_review_security_sql_var_ return array( '#warning' => t('In SQL strings, Use !db_query() placeholders in place of variables. This is a potential source of SQL injection attacks when the variable can come from user data.', array( - '!db_query' => theme('drupalapi', 'db_query'), + '!db_query' => theme('drupalapi', array('function' => 'db_query')), ) ), '#link' => 'http://drupal.org/writing-secure-code', Index: coder_review/includes/coder_review_sql.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_sql.inc,v retrieving revision 1.5 diff -u -p -r1.5 coder_review_sql.inc --- coder_review/includes/coder_review_sql.inc 1 Sep 2009 14:34:02 -0000 1.5 +++ coder_review/includes/coder_review_sql.inc 18 Oct 2009 12:41:36 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_sql_reviews() { $table = '\{[A-Za-z_]+\}'; // table-regex @@ -79,7 +79,7 @@ function _coder_review_sql_db_query_rang return array( '#warning' => t('Use !db_query_range() instead of the SQL LIMIT clause', array( - '!db_query_range' => theme('drupalapi', 'db_query_range'), + '!db_query_range' => theme('drupalapi', array('function' => 'db_query_range')), ) ), '#link' => 'http://drupal.org/node/1395', @@ -90,9 +90,9 @@ function _coder_review_sql_db_query_in_i return array( '#warning' => t('Use !update_sql() instead of !db_query() in !hook_update_N()', array( - '!update_sql' => theme('drupalapi', 'update_sql'), - '!db_query' => theme('drupalapi', 'db_query'), - '!hook_update_N' => theme('drupalapi', 'hook_update_N'), + '!update_sql' => theme('drupalapi', array('function' => 'update_sql')), + '!db_query' => theme('drupalapi', array('function' => 'db_query')), + '!hook_update_N' => theme('drupalapi', array('function' => 'hook_update_N')), ) ), ); Index: coder_review/includes/coder_review_style.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/includes/coder_review_style.inc,v retrieving revision 1.7 diff -u -p -r1.7 coder_review_style.inc --- coder_review/includes/coder_review_style.inc 14 Aug 2009 00:15:47 -0000 1.7 +++ coder_review/includes/coder_review_style.inc 18 Oct 2009 12:41:36 -0000 @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_reviews(). + * Implements hook_reviews(). */ function coder_review_style_reviews() { $br = 'br'; Index: coder_review/tests/coder_review_test_case.tinc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_review/tests/coder_review_test_case.tinc,v retrieving revision 1.4 diff -u -p -r1.4 coder_review_test_case.tinc --- coder_review/tests/coder_review_test_case.tinc 26 Sep 2009 23:18:15 -0000 1.4 +++ coder_review/tests/coder_review_test_case.tinc 18 Oct 2009 12:41:36 -0000 @@ -18,7 +18,7 @@ class CoderReviewTestCase extends Drupal // Only do the setUp once per test case, not once per function call. static $run_once; if (!isset($run_once)) { - parent::setUp(); + parent::setUp('coder_review'); $run_once = TRUE; } } Index: coder_upgrade/CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_upgrade/CHANGELOG.txt,v retrieving revision 1.8 diff -u -p -r1.8 CHANGELOG.txt --- coder_upgrade/CHANGELOG.txt 24 Aug 2009 16:25:21 -0000 1.8 +++ coder_upgrade/CHANGELOG.txt 18 Oct 2009 12:41:36 -0000 @@ -2,6 +2,10 @@ coder_upgrade 7.x-1.x, 2009-xx-xx (development version) --------------------------------- +- Changes (2009-10-18): + * Changed menu path to 'admin/config/development/coder/upgrade'. + * Changed menu path to 'admin/config/development/coder/configure/upgrade'. + - Changes (2009-08-24): * Change calls to file_check_directory to file_prepare_directory in light of core function rename. @@ -44,3 +48,4 @@ coder_upgrade 7.x-1.x, 2009-xx-xx (devel * Restructure process to always run all conversions. * Revise help text. * Add grammar parser (pgp) module as a dependency. + Index: coder_upgrade/coder_upgrade.help.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_upgrade/coder_upgrade.help.inc,v retrieving revision 1.4 diff -u -p -r1.4 coder_upgrade.help.inc --- coder_upgrade/coder_upgrade.help.inc 3 Aug 2009 00:11:11 -0000 1.4 +++ coder_upgrade/coder_upgrade.help.inc 18 Oct 2009 12:41:36 -0000 @@ -15,9 +15,9 @@ function coder_upgrade_help($path) { $input = file_directory_path() . '/' . variable_get('coder_upgrade_dir_old', DEADWOOD_OLD); $output = file_directory_path() . '/' . variable_get('coder_upgrade_dir_new', DEADWOOD_NEW); switch ($path) { - case 'admin/settings/coder/upgrade': + case 'admin/config/development/coder/configure/upgrade': return tp('This is a list of the variables used by the automated module conversion suite.'); - case 'admin/development/coder/upgrade': + case 'admin/config/development/coder/upgrade': return tp('The purpose of this module is to automate as much as possible the task of updating a contributed module for Drupal API changes.' . ' This particular module helps update the 6.x version of a contributed module to the 7.x version API.' . ' Relative to the Drupal core APIs, the list of automated conversions to be applied is indicated !list.' . @@ -42,11 +42,11 @@ function coder_upgrade_help($path) { ' You may also upload your module to a modules directory beneath the sites directory (e.g. sites/all/modules).', array('!input' => $input, '!output' => $output, - '!link' => l(t('here'), 'admin/settings/coder/upgrade'))) . + '!link' => l(t('here'), 'admin/config/development/coder/configure/upgrade'))) . tp('To apply the conversions, go to the !link page, select the appropriate runtime parameters based on the instructions below, and click the Convert files button.' . ' In the instructions below, references to checkboxes and other interface items apply to the development page.', array('!input' => $input, - '!link' => l(t('Conversions Development'), 'admin/development/coder/upgrade'))) . + '!link' => l(t('Conversions Development'), 'admin/config/development/coder/upgrade'))) . tp('To convert 6.x files to 7.x files do the following:') . t('
  1. On the Upgrades tab, select the conversion (or upgrade) categories to apply by checking the appropriate boxes in the list.
    2. @@ -71,11 +71,11 @@ function coder_upgrade_help($path) {
', array('!input' => $input, '!output' => $output, - '!coder' => l(t('Coder Review'), 'admin/development/coder/review'), + '!coder' => l(t('Coder Review'), 'admin/config/development/coder/review'), '!install' => l(t('Drupal interface'), 'admin/structure/modules'))) . tp('Manual Changes') . tp('After applying the automated conversions to your module, rerun the !coder to highlight the areas in your module\'s code needing manual review.', - array('!coder' => l(t('Coder Review'), 'admin/development/coder/review'))) . + array('!coder' => l(t('Coder Review'), 'admin/config/development/coder/review'))) . tp('Feedback') . tp('If any of the automated conversions are not successful with your module and you believe the conversion code could be changed to handle your module\'s code, please submit a project issue to the !issue specifying "Coder Upgrade" as the Component.' . ' If you can also supply a patch for the change, that would be greatly appreciated too.', Index: coder_upgrade/coder_upgrade.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/coder_upgrade/coder_upgrade.module,v retrieving revision 1.6 diff -u -p -r1.6 coder_upgrade.module --- coder_upgrade/coder_upgrade.module 26 Sep 2009 23:00:51 -0000 1.6 +++ coder_upgrade/coder_upgrade.module 18 Oct 2009 12:41:37 -0000 @@ -37,7 +37,7 @@ function coder_upgrade_permission() { */ function coder_upgrade_menu() { // Settings related items. - $items['admin/settings/coder/upgrade'] = array( + $items['admin/config/development/coder/configure/upgrade'] = array( 'title' => 'Upgrade', 'description' => 'Configure the module conversion suite.', 'page callback' => 'drupal_get_form', @@ -48,7 +48,7 @@ function coder_upgrade_menu() { ); // Conversion items. - $items['admin/development/coder/upgrade'] = array( + $items['admin/config/development/coder/upgrade'] = array( 'title' => 'Upgrade', 'description' => 'Convert module code from version 6.x to 7.x.', 'page callback' => 'drupal_get_form',