',
'#type' => 'link',
'#title' => '
' . $link_text . '',
@@ -720,7 +721,7 @@ function shortcut_page_alter(&$page) {
*/
function shortcut_toolbar_pre_render($toolbar) {
$links = shortcut_renderable_links();
- $links['#attached'] = array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css'));
+ $links['#attached'] = array('css' => array(get_path('module', 'shortcut') . '/shortcut.css'));
$links['#prefix'] = '
';
$links['#suffix'] = '
';
$shortcut_set = shortcut_current_displayed_set();
diff --git a/core/modules/shortcut/shortcut.test b/core/modules/shortcut/shortcut.test
index 322c63f..4136041 100644
--- a/core/modules/shortcut/shortcut.test
+++ b/core/modules/shortcut/shortcut.test
@@ -1,4 +1,6 @@
assertResponse(200);
$saved_set = shortcut_set_load($set->set_name);
$paths = $this->getShortcutInformation($saved_set, 'link_path');
- $this->assertTrue(in_array(drupal_get_normal_path($test['path']), $paths), 'Shortcut created: '. $test['path']);
+ $this->assertTrue(in_array(get_normal_path($test['path']), $paths), 'Shortcut created: '. $test['path']);
$this->assertLink($title, 0, 'Shortcut link found on the page.');
}
}
diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php
index 6adaf93..70ef675 100644
--- a/core/modules/simpletest/drupal_web_test_case.php
+++ b/core/modules/simpletest/drupal_web_test_case.php
@@ -1,4 +1,6 @@
originalFileDirectory . '/simpletest/verbose/' . get_class($this) . '-' . $id . '.html');
+ $url = file_create_url($this->originalFileDirectory . '/simpletest/verbose/' . str_replace('\\', '-', get_class($this)) . '-' . $id . '.html');
$this->error(l(t('Verbose message'), $url, array('attributes' => array('target' => '_blank'))), 'User notice');
}
}
@@ -498,7 +500,7 @@ abstract class DrupalTestCase {
'file' => $missing_requirements_object->getFileName(),
);
foreach ($missing_requirements as $missing_requirement) {
- DrupalTestCase::insertAssert($this->testId, $class, FALSE, $missing_requirement, 'Requirements check.', $caller);
+ TestCase::insertAssert($this->testId, $class, FALSE, $missing_requirement, 'Requirements check.', $caller);
}
}
else {
@@ -513,7 +515,7 @@ abstract class DrupalTestCase {
'line' => $method_info->getStartLine(),
'function' => $class . '->' . $method . '()',
);
- $completion_check_id = DrupalTestCase::insertAssert($this->testId, $class, FALSE, t('The test did not complete due to a fatal error.'), 'Completion check', $caller);
+ $completion_check_id = TestCase::insertAssert($this->testId, $class, FALSE, t('The test did not complete due to a fatal error.'), 'Completion check', $caller);
$this->setUp();
if ($this->setup) {
try {
@@ -529,12 +531,12 @@ abstract class DrupalTestCase {
$this->fail(t("The test cannot be executed because it has not been set up properly."));
}
// Remove the completion check record.
- DrupalTestCase::deleteAssert($completion_check_id);
+ TestCase::deleteAssert($completion_check_id);
}
}
}
// Clear out the error messages and restore error handler.
- drupal_get_messages();
+ get_messages();
restore_error_handler();
}
@@ -559,7 +561,7 @@ abstract class DrupalTestCase {
);
$backtrace = debug_backtrace();
- $this->error($message, $error_map[$severity], _drupal_get_last_caller($backtrace));
+ $this->error($message, $error_map[$severity], _get_last_caller($backtrace));
}
return TRUE;
}
@@ -576,9 +578,9 @@ abstract class DrupalTestCase {
'line' => $exception->getLine(),
'file' => $exception->getFile(),
));
- require_once DRUPAL_ROOT . '/core/includes/errors.inc';
- // The exception message is run through check_plain() by _drupal_decode_exception().
- $this->error(t('%type: !message in %function (line %line of %file).', _drupal_decode_exception($exception)), 'Uncaught exception', _drupal_get_last_caller($backtrace));
+ require_once ROOT . '/core/includes/errors.inc';
+ // The exception message is run through check_plain() by _decode_exception().
+ $this->error(t('%type: !message in %function (line %line of %file).', _decode_exception($exception)), 'Uncaught exception', _get_last_caller($backtrace));
}
/**
@@ -682,10 +684,10 @@ abstract class DrupalTestCase {
* function that needs the database will throw exceptions. These include
* watchdog(), module_implements(), module_invoke_all() etc.
*/
-class DrupalUnitTestCase extends DrupalTestCase {
+class UnitTestCase extends TestCase {
/**
- * Constructor for DrupalUnitTestCase.
+ * Constructor for UnitTestCase.
*/
function __construct($test_id = NULL) {
parent::__construct($test_id);
@@ -695,7 +697,7 @@ class DrupalUnitTestCase extends DrupalTestCase {
/**
* Sets up unit test environment.
*
- * Unlike DrupalWebTestCase::setUp(), DrupalUnitTestCase::setUp() does not
+ * Unlike WebTestCase::setUp(), UnitTestCase::setUp() does not
* install modules because tests are performed without accessing the database.
* Any required files must be explicitly included by the child class setUp()
* method.
@@ -759,7 +761,7 @@ class DrupalUnitTestCase extends DrupalTestCase {
/**
* Test case for typical Drupal tests.
*/
-class DrupalWebTestCase extends DrupalTestCase {
+class WebTestCase extends TestCase {
/**
* The profile to install as a basis for testing.
*
@@ -834,7 +836,7 @@ class DrupalWebTestCase extends DrupalTestCase {
/**
* Additional cURL options.
*
- * DrupalWebTestCase itself never sets this but always obeys what is set.
+ * WebTestCase itself never sets this but always obeys what is set.
*/
protected $additionalCurlOptions = array();
@@ -883,7 +885,7 @@ class DrupalWebTestCase extends DrupalTestCase {
protected $redirect_count;
/**
- * Constructor for DrupalWebTestCase.
+ * Constructor for WebTestCase.
*/
function __construct($test_id = NULL) {
parent::__construct($test_id);
@@ -1049,7 +1051,7 @@ class DrupalWebTestCase extends DrupalTestCase {
}
// Copy other test files from simpletest.
- $original = drupal_get_path('module', 'simpletest') . '/files';
+ $original = get_path('module', 'simpletest') . '/files';
$files = file_scan_directory($original, '/(html|image|javascript|php|sql)-.*/');
foreach ($files as $file) {
file_unmanaged_copy($file->uri, variable_get('file_public_path', conf_path() . '/files'));
@@ -1123,7 +1125,7 @@ class DrupalWebTestCase extends DrupalTestCase {
$edit['roles'] = array($rid => $rid);
}
- $account = user_save(drupal_anonymous_user(), $edit);
+ $account = user_save(anonymous_user(), $edit);
$this->assertTrue(!empty($account->uid), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
if (empty($account->uid)) {
@@ -1251,8 +1253,8 @@ class DrupalWebTestCase extends DrupalTestCase {
* Generate a token for the currently logged in user.
*/
protected function drupalGetToken($value = '') {
- $private_key = drupal_get_private_key();
- return drupal_hmac_base64($value, $this->session_id . $private_key);
+ $private_key = get_private_key();
+ return hmac_base64($value, $this->session_id . $private_key);
}
/*
@@ -1311,7 +1313,7 @@ class DrupalWebTestCase extends DrupalTestCase {
$this->originalLanguage = $language;
$this->originalLanguageDefault = variable_get('language_default');
$this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files');
- $this->originalProfile = drupal_get_profile();
+ $this->originalProfile = get_profile();
$clean_url_original = variable_get('clean_url', 0);
// Set to English to prevent exceptions from utf8_truncate() from t()
@@ -1351,19 +1353,19 @@ class DrupalWebTestCase extends DrupalTestCase {
ini_set('error_log', $public_files_directory . '/error.log');
// Set the test information for use in other parts of Drupal.
- $test_info = &$GLOBALS['drupal_test_info'];
+ $test_info = &$GLOBALS['test_info'];
$test_info['test_run_id'] = $this->databasePrefix;
$test_info['in_child_site'] = FALSE;
// Preset the 'install_profile' system variable, so the first call into
- // system_rebuild_module_data() (in drupal_install_system()) will register
+ // system_rebuild_module_data() (in install_system()) will register
// the test's profile as a module. Without this, the installation profile of
// the parent site (executing the test) is registered, and the test
// profile's hook_install() and other hook implementations are never invoked.
$conf['install_profile'] = $this->profile;
- include_once DRUPAL_ROOT . '/core/includes/install.inc';
- drupal_install_system();
+ include_once ROOT . '/core/includes/install.inc';
+ install_system();
$this->preloadRegistry();
@@ -1405,11 +1407,11 @@ class DrupalWebTestCase extends DrupalTestCase {
// Run cron once in that environment, as install.php does at the end of
// the installation process.
- drupal_cron_run();
+ cron_run();
// Log in with a clean $user.
$this->originalUser = $user;
- drupal_save_session(FALSE);
+ save_session(FALSE);
$user = user_load(1);
// Restore necessary variables.
@@ -1431,7 +1433,7 @@ class DrupalWebTestCase extends DrupalTestCase {
/**
* Preload the registry from the testing site.
*
- * This method is called by DrupalWebTestCase::setUp(), and preloads the
+ * This method is called by WebTestCase::setUp(), and preloads the
* registry from the testing site to cut down on the time it takes to
* set up a clean environment for the current test run.
*/
@@ -1467,7 +1469,7 @@ class DrupalWebTestCase extends DrupalTestCase {
/**
* Reset all data structures after having enabled new modules.
*
- * This method is called by DrupalWebTestCase::setUp() after enabling
+ * This method is called by WebTestCase::setUp() after enabling
* the requested modules. It must be called again when additional modules
* are enabled later.
*/
@@ -1478,12 +1480,12 @@ class DrupalWebTestCase extends DrupalTestCase {
module_list(TRUE);
// Reset cached schema for new database prefix. This must be done before
- // drupal_flush_all_caches() so rebuilds can make use of the schema of
+ // flush_all_caches() so rebuilds can make use of the schema of
// modules enabled on the cURL side.
- drupal_get_schema(NULL, TRUE);
+ get_schema(NULL, TRUE);
// Perform rebuilds and flush remaining caches.
- drupal_flush_all_caches();
+ flush_all_caches();
// Reload global $conf array and permissions.
$this->refreshVariables();
@@ -1529,7 +1531,7 @@ class DrupalWebTestCase extends DrupalTestCase {
file_unmanaged_delete_recursive($this->originalFileDirectory . '/simpletest/' . substr($this->databasePrefix, 10));
// Remove all prefixed tables (all the tables in the schema).
- $schema = drupal_get_schema(NULL, TRUE);
+ $schema = get_schema(NULL, TRUE);
foreach ($schema as $name => $table) {
db_drop_table($name);
}
@@ -1545,7 +1547,7 @@ class DrupalWebTestCase extends DrupalTestCase {
// Return the user to the original one.
$user = $this->originalUser;
- drupal_save_session(TRUE);
+ save_session(TRUE);
// Ensure that internal logged in variable and cURL options are reset.
$this->loggedInUser = FALSE;
@@ -1607,7 +1609,7 @@ class DrupalWebTestCase extends DrupalTestCase {
// We set the user agent header on each request so as to use the current
// time and a new uniqid.
if (preg_match('/simpletest\d+/', $this->databasePrefix, $matches)) {
- curl_setopt($this->curlHandle, CURLOPT_USERAGENT, drupal_generate_test_ua($matches[0]));
+ curl_setopt($this->curlHandle, CURLOPT_USERAGENT, generate_test_ua($matches[0]));
}
}
@@ -1692,7 +1694,7 @@ class DrupalWebTestCase extends DrupalTestCase {
/**
* Reads headers and registers errors received from the tested site.
*
- * @see _drupal_log_error().
+ * @see _log_error().
*
* @param $curlHandler
* The cURL handler.
@@ -1712,10 +1714,10 @@ class DrupalWebTestCase extends DrupalTestCase {
}
// Errors are being sent via X-Drupal-Assertion-* headers,
- // generated by _drupal_log_error() in the exact form required
- // by DrupalWebTestCase::error().
+ // generated by _log_error() in the exact form required
+ // by WebTestCase::error().
if (preg_match('/^X-Drupal-Assertion-[0-9]+: (.*)$/', $header, $matches)) {
- // Call DrupalWebTestCase::error() with the parameters from the header.
+ // Call WebTestCase::error() with the parameters from the header.
call_user_func_array(array(&$this, 'error'), unserialize(urldecode($matches[1])));
}
@@ -2080,7 +2082,7 @@ class DrupalWebTestCase extends DrupalTestCase {
foreach ($return as $command) {
switch ($command['command']) {
case 'settings':
- $drupal_settings = drupal_array_merge_deep($drupal_settings, $command['settings']);
+ $drupal_settings = array_merge_deep($drupal_settings, $command['settings']);
break;
case 'insert':
@@ -2723,7 +2725,7 @@ class DrupalWebTestCase extends DrupalTestCase {
* outside of the internal browser and assertions need to be made on the
* returned page.
*
- * A good example would be when testing drupal_http_request(). After fetching
+ * A good example would be when testing http_request(). After fetching
* the page the content can be set and page elements can be checked to ensure
* that the function worked properly.
*/
@@ -3498,8 +3500,8 @@ class DrupalWebTestCase extends DrupalTestCase {
* @return
* The ID of the message to be placed in related assertion messages.
*
- * @see DrupalTestCase->originalFileDirectory
- * @see DrupalWebTestCase->verbose()
+ * @see TestCase->originalFileDirectory
+ * @see WebTestCase->verbose()
*/
function simpletest_verbose($message, $original_file_directory = NULL, $test_class = NULL) {
static $file_directory = NULL, $class = NULL, $id = 1, $verbose = NULL;
@@ -3517,7 +3519,7 @@ function simpletest_verbose($message, $original_file_directory = NULL, $test_cla
if ($original_file_directory) {
$file_directory = $original_file_directory;
- $class = $test_class;
+ $class = str_replace('\\', '-', $test_class);
$verbose = variable_get('simpletest_verbose', TRUE);
$directory = $file_directory . '/simpletest/verbose';
$writable = file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
diff --git a/core/modules/simpletest/simpletest.api.php b/core/modules/simpletest/simpletest.api.php
index 04c080b..7c0232c 100644
--- a/core/modules/simpletest/simpletest.api.php
+++ b/core/modules/simpletest/simpletest.api.php
@@ -1,4 +1,5 @@
results
+ * @see WebTestCase->results
*/
function hook_test_finished($results) {
}
diff --git a/core/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install
index 96cc011..c2d4660 100644
--- a/core/modules/simpletest/simpletest.install
+++ b/core/modules/simpletest/simpletest.install
@@ -1,4 +1,6 @@
'Testing',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('simpletest_test_form'),
'description' => 'Run tests against Drupal core and your modules. These tests help assure that your site code is working as designed.',
'access arguments' => array('administer unit tests'),
@@ -43,7 +44,7 @@ function simpletest_menu() {
);
$items['admin/config/development/testing/settings'] = array(
'title' => 'Settings',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('simpletest_settings_form'),
'access arguments' => array('administer unit tests'),
'type' => MENU_LOCAL_TASK,
@@ -51,7 +52,7 @@ function simpletest_menu() {
);
$items['admin/config/development/testing/results/%'] = array(
'title' => 'Test result',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('simpletest_result_form', 5),
'description' => 'View result of tests.',
'access arguments' => array('administer unit tests'),
@@ -94,7 +95,7 @@ function simpletest_theme() {
function simpletest_js_alter(&$javascript) {
// Since SimpleTest is a special use case for the table select, stick the
// SimpleTest JavaScript above the table select.
- $simpletest = drupal_get_path('module', 'simpletest') . '/simpletest.js';
+ $simpletest = get_path('module', 'simpletest') . '/simpletest.js';
if (array_key_exists($simpletest, $javascript) && array_key_exists('core/misc/tableselect.js', $javascript)) {
$javascript[$simpletest]['weight'] = $javascript['core/misc/tableselect.js']['weight'] - 1;
}
@@ -132,7 +133,8 @@ function simpletest_run_tests($test_list, $reporter = 'drupal') {
// Get the info for the first test being run.
$first_test = array_shift($test_list);
- $first_instance = new $first_test();
+ $class = 'Drupal\\' . $first_test;
+ $first_instance = new $class();
array_unshift($test_list, $first_test);
$info = $first_instance->getInfo();
@@ -143,7 +145,7 @@ function simpletest_run_tests($test_list, $reporter = 'drupal') {
),
'finished' => '_simpletest_batch_finished',
'progress_message' => '',
- 'css' => array(drupal_get_path('module', 'simpletest') . '/simpletest.css'),
+ 'css' => array(get_path('module', 'simpletest') . '/simpletest.css'),
'init_message' => t('Processing test @num of @max - %test.', array('%test' => $info['name'], '@num' => '1', '@max' => count($test_list))),
);
batch_set($batch);
@@ -172,7 +174,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
$max = $context['sandbox']['max'];
// Perform the next test.
- $test_class = array_shift($test_list);
+ $test_class = 'Drupal\\' . array_shift($test_list);
$test = new $test_class($test_id);
$test->run();
$size = count($test_list);
@@ -206,7 +208,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
if ($success) {
- drupal_set_message(t('The test run finished in @elapsed.', array('@elapsed' => $elapsed)));
+ set_message(t('The test run finished in @elapsed.', array('@elapsed' => $elapsed)));
}
else {
// Use the test_id passed as a parameter to _simpletest_batch_operation().
@@ -218,8 +220,8 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
list($last_prefix, $last_test_class) = simpletest_last_test_get($test_id);
simpletest_log_read($test_id, $last_prefix, $last_test_class);
- drupal_set_message(t('The test run did not successfully finish.'), 'error');
- drupal_set_message(t('Use the
Clean environment button to clean-up temporary files and tables.'), 'warning');
+ set_message(t('The test run did not successfully finish.'), 'error');
+ set_message(t('Use the
Clean environment button to clean-up temporary files and tables.'), 'warning');
}
module_invoke_all('test_group_finished');
}
@@ -269,11 +271,11 @@ function simpletest_log_read($test_id, $prefix, $test_class, $during_test = FALS
'line' => $match[4],
'file' => $match[3],
);
- DrupalTestCase::insertAssert($test_id, $test_class, FALSE, $match[2], $match[1], $caller);
+ TestCase::insertAssert($test_id, $test_class, FALSE, $match[2], $match[1], $caller);
}
else {
// Unknown format, place the entire message in the log.
- DrupalTestCase::insertAssert($test_id, $test_class, FALSE, $line, 'Fatal error');
+ TestCase::insertAssert($test_id, $test_class, FALSE, $line, 'Fatal error');
}
$found = TRUE;
}
@@ -323,13 +325,13 @@ function simpletest_test_get_all() {
$groups = array();
foreach ($classes as $class) {
// Test classes need to implement getInfo() to be valid.
- if (class_exists($class) && method_exists($class, 'getInfo')) {
- $info = call_user_func(array($class, 'getInfo'));
+ if (class_exists('Drupal\\' . $class) && method_exists('Drupal\\' . $class, 'getInfo')) {
+ $info = call_user_func(array('Drupal\\' . $class, 'getInfo'));
// If this test class requires a non-existing module, skip it.
if (!empty($info['dependencies'])) {
foreach ($info['dependencies'] as $module) {
- if (!drupal_get_filename('module', $module)) {
+ if (!get_filename('module', $module)) {
continue 2;
}
}
@@ -346,7 +348,7 @@ function simpletest_test_get_all() {
}
// Allow modules extending core tests to disable originals.
- drupal_alter('simpletest', $groups);
+ alter('simpletest', $groups);
cache()->set('simpletest', $groups);
}
}
@@ -413,10 +415,10 @@ function simpletest_clean_environment() {
simpletest_clean_temporary_directories();
if (variable_get('simpletest_clear_results', TRUE)) {
$count = simpletest_clean_results_table();
- drupal_set_message(format_plural($count, 'Removed 1 test result.', 'Removed @count test results.'));
+ set_message(format_plural($count, 'Removed 1 test result.', 'Removed @count test results.'));
}
else {
- drupal_set_message(t('Clear results is disabled and the test results table will not be cleared.'), 'warning');
+ set_message(t('Clear results is disabled and the test results table will not be cleared.'), 'warning');
}
// Detect test classes that have been added, renamed or deleted.
@@ -429,7 +431,7 @@ function simpletest_clean_environment() {
*/
function simpletest_clean_database() {
$tables = db_find_tables(Database::getConnection()->prefixTables('{simpletest}') . '%');
- $schema = drupal_get_schema_unprocessed('simpletest');
+ $schema = get_schema_unprocessed('simpletest');
$count = 0;
foreach (array_diff_key($tables, $schema) as $table) {
// Strip the prefix and skip tables without digits following "simpletest",
@@ -441,10 +443,10 @@ function simpletest_clean_database() {
}
if ($count > 0) {
- drupal_set_message(format_plural($count, 'Removed 1 leftover table.', 'Removed @count leftover tables.'));
+ set_message(format_plural($count, 'Removed 1 leftover table.', 'Removed @count leftover tables.'));
}
else {
- drupal_set_message(t('No leftover tables to remove.'));
+ set_message(t('No leftover tables to remove.'));
}
}
@@ -465,10 +467,10 @@ function simpletest_clean_temporary_directories() {
}
if ($count > 0) {
- drupal_set_message(format_plural($count, 'Removed 1 temporary directory.', 'Removed @count temporary directories.'));
+ set_message(format_plural($count, 'Removed 1 temporary directory.', 'Removed @count temporary directories.'));
}
else {
- drupal_set_message(t('No temporary directories to remove.'));
+ set_message(t('No temporary directories to remove.'));
}
}
diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc
index 8ac1ee2..e754212 100644
--- a/core/modules/simpletest/simpletest.pages.inc
+++ b/core/modules/simpletest/simpletest.pages.inc
@@ -1,4 +1,6 @@
$js), 'setting');
+ add_js(array('simpleTest' => $js), 'setting');
if (empty($rows)) {
return '
' . t('No tests to display.') . '';
@@ -186,7 +188,7 @@ function simpletest_test_form_submit($form, &$form_state) {
foreach ($form_state['values'] as $class_name => $value) {
// Since class_exists() will likely trigger an autoload lookup,
// we do the fast check first.
- if ($value === 1 && class_exists($class_name)) {
+ if ($value === 1 && class_exists('Drupal\\' . $class_name)) {
$tests_list[] = $class_name;
}
}
@@ -195,7 +197,7 @@ function simpletest_test_form_submit($form, &$form_state) {
$form_state['redirect'] = 'admin/config/development/testing/results/' . $test_id;
}
else {
- drupal_set_message(t('No test(s) selected.'), 'error');
+ set_message(t('No test(s) selected.'), 'error');
}
}
@@ -206,13 +208,13 @@ function simpletest_result_form($form, &$form_state, $test_id) {
// Make sure there are test results to display and a re-run is not being performed.
$results = array();
if (is_numeric($test_id) && !$results = simpletest_result_get($test_id)) {
- drupal_set_message(t('No test results to display.'), 'error');
- drupal_goto('admin/config/development/testing');
+ set_message(t('No test results to display.'), 'error');
+ redirect('admin/config/development/testing');
return $form;
}
// Load all classes and include CSS.
- drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css');
+ add_css(get_path('module', 'simpletest') . '/simpletest.css');
// Keep track of which test cases passed or failed.
$filter = array(
@@ -254,9 +256,9 @@ function simpletest_result_form($form, &$form_state, $test_id) {
$row = array();
$row[] = $assertion->message;
$row[] = $assertion->message_group;
- $row[] = drupal_basename($assertion->file);
+ $row[] = basename($assertion->file);
$row[] = $assertion->line;
- $row[] = $assertion->function;
+ $row[] = substr($assertion->function, 7);
$row[] = simpletest_result_status_image($assertion->status);
$class = 'simpletest-' . $assertion->status;
@@ -357,7 +359,7 @@ function simpletest_result_form_submit($form, &$form_state) {
$form_state_execute = array('values' => array());
foreach ($classes as $class) {
- $form_state_execute['values'][$class] = 1;
+ $form_state_execute['values'][substr($class, 7)] = 1;
}
simpletest_test_form_submit(array(), $form_state_execute);
diff --git a/core/modules/simpletest/simpletest.test b/core/modules/simpletest/simpletest.test
index bd4427c..9bf78d6 100644
--- a/core/modules/simpletest/simpletest.test
+++ b/core/modules/simpletest/simpletest.test
@@ -1,11 +1,13 @@
inCURL()) {
global $base_url;
- $simpletest_path = $base_url . '/' . drupal_get_path('module', 'simpletest');
+ $simpletest_path = $base_url . '/' . get_path('module', 'simpletest');
$HTTP_path = $simpletest_path .'/tests/http.php?q=node';
$https_path = $simpletest_path .'/tests/https.php?q=node';
// Generate a valid simpletest User-Agent to pass validation.
$this->assertTrue(preg_match('/simpletest\d+/', $this->databasePrefix, $matches), t('Database prefix contains simpletest prefix.'));
- $test_ua = drupal_generate_test_ua($matches[0]);
+ $test_ua = generate_test_ua($matches[0]);
$this->additionalCurlOptions = array(CURLOPT_USERAGENT => $test_ua);
// Test pages only available for testing.
@@ -314,14 +316,14 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase {
* Check if the test is being run from inside a CURL request.
*/
function inCURL() {
- return (bool) drupal_valid_test_ua();
+ return (bool) valid_test_ua();
}
}
/**
* Test internal testing framework browser.
*/
-class SimpleTestBrowserTestCase extends DrupalWebTestCase {
+class SimpleTestBrowserTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'SimpleTest browser',
@@ -336,7 +338,7 @@ class SimpleTestBrowserTestCase extends DrupalWebTestCase {
}
/**
- * Test DrupalWebTestCase::getAbsoluteUrl().
+ * Test WebTestCase::getAbsoluteUrl().
*/
function testGetAbsoluteUrl() {
// Testbed runs with Clean URLs disabled, so disable it here.
@@ -382,7 +384,7 @@ EOF;
}
}
-class SimpleTestMailCaptureTestCase extends DrupalWebTestCase {
+class SimpleTestMailCaptureTestCase extends WebTestCase {
/**
* Implement getInfo().
*/
@@ -402,7 +404,7 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase {
$subject = $this->randomString(64);
$body = $this->randomString(128);
$message = array(
- 'id' => 'drupal_mail_test',
+ 'id' => 'mail_test',
'headers' => array('Content-type'=> 'text/html'),
'subject' => $subject,
'to' => 'foobar@example.com',
@@ -414,7 +416,7 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase {
$this->assertEqual(count($captured_emails), 0, t('The captured e-mails queue is empty.'), t('E-mail'));
// Send the e-mail.
- $response = drupal_mail_system('simpletest', 'drupal_mail_test')->mail($message);
+ $response = mail_system('simpletest', 'mail_test')->mail($message);
// Ensure that there is one e-mail in the captured e-mails array.
$captured_emails = $this->drupalGetMails();
@@ -429,13 +431,13 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase {
// Send additional e-mails so more than one e-mail is captured.
for ($index = 0; $index < 5; $index++) {
$message = array(
- 'id' => 'drupal_mail_test_' . $index,
+ 'id' => 'mail_test_' . $index,
'headers' => array('Content-type'=> 'text/html'),
'subject' => $this->randomString(64),
'to' => $this->randomName(32) . '@example.com',
'body' => $this->randomString(512),
);
- drupal_mail_system('drupal_mail_test', $index)->mail($message);
+ mail_system('mail_test', $index)->mail($message);
}
// There should now be 6 e-mails captured.
@@ -443,17 +445,17 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase {
$this->assertEqual(count($captured_emails), 6, t('All e-mails were captured.'), t('E-mail'));
// Test different ways of getting filtered e-mails via drupalGetMails().
- $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test'));
+ $captured_emails = $this->drupalGetMails(array('id' => 'mail_test'));
$this->assertEqual(count($captured_emails), 1, t('Only one e-mail is returned when filtering by id.'), t('E-mail'));
- $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test', 'subject' => $subject));
+ $captured_emails = $this->drupalGetMails(array('id' => 'mail_test', 'subject' => $subject));
$this->assertEqual(count($captured_emails), 1, t('Only one e-mail is returned when filtering by id and subject.'), t('E-mail'));
- $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test', 'subject' => $subject, 'from' => 'this_was_not_used@example.com'));
+ $captured_emails = $this->drupalGetMails(array('id' => 'mail_test', 'subject' => $subject, 'from' => 'this_was_not_used@example.com'));
$this->assertEqual(count($captured_emails), 0, t('No e-mails are returned when querying with an unused from address.'), t('E-mail'));
// Send the last e-mail again, so we can confirm that the drupalGetMails-filter
// correctly returns all e-mails with a given property/value.
- drupal_mail_system('drupal_mail_test', $index)->mail($message);
- $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test_4'));
+ mail_system('mail_test', $index)->mail($message);
+ $captured_emails = $this->drupalGetMails(array('id' => 'mail_test_4'));
$this->assertEqual(count($captured_emails), 2, t('All e-mails with the same id are returned when filtering by id.'), t('E-mail'));
}
}
@@ -461,7 +463,7 @@ class SimpleTestMailCaptureTestCase extends DrupalWebTestCase {
/**
* Test Folder creation
*/
-class SimpleTestFolderTestCase extends DrupalWebTestCase {
+class SimpleTestFolderTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Testing SimpleTest setUp',
@@ -483,7 +485,7 @@ class SimpleTestFolderTestCase extends DrupalWebTestCase {
/**
* Test required modules for tests.
*/
-class SimpleTestMissingDependentModuleUnitTest extends DrupalUnitTestCase {
+class SimpleTestMissingDependentModuleUnitTest extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'Testing dependent module test',
@@ -505,12 +507,12 @@ class SimpleTestMissingDependentModuleUnitTest extends DrupalUnitTestCase {
* Tests a test case that does not run parent::setUp() in its setUp() method.
*
* If a test case does not call parent::setUp(), running
- * DrupalTestCase::tearDown() would destroy the main site's database tables.
+ * TestCase::tearDown() would destroy the main site's database tables.
* Therefore, we ensure that tests which are not set up properly are skipped.
*
- * @see DrupalTestCase
+ * @see TestCase
*/
-class SimpleTestBrokenSetUp extends DrupalWebTestCase {
+class SimpleTestBrokenSetUp extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Broken SimpleTest method',
@@ -521,7 +523,7 @@ class SimpleTestBrokenSetUp extends DrupalWebTestCase {
function setUp() {
// If the test is being run from the main site, set up normally.
- if (!drupal_valid_test_ua()) {
+ if (!valid_test_ua()) {
parent::setUp('simpletest');
// Create and log in user.
$admin_user = $this->drupalCreateUser(array('administer unit tests'));
@@ -536,7 +538,7 @@ class SimpleTestBrokenSetUp extends DrupalWebTestCase {
function tearDown() {
// If the test is being run from the main site, tear down normally.
- if (!drupal_valid_test_ua()) {
+ if (!valid_test_ua()) {
parent::tearDown();
}
else {
@@ -551,7 +553,7 @@ class SimpleTestBrokenSetUp extends DrupalWebTestCase {
function testBreakSetUp() {
// If the test is being run from the main site, run it again from the web
// interface within the simpletest child site.
- if (!drupal_valid_test_ua()) {
+ if (!valid_test_ua()) {
$edit['SimpleTestBrokenSetUp'] = TRUE;
$this->drupalPost('admin/config/development/testing', $edit, t('Run tests'));
@@ -571,7 +573,7 @@ class SimpleTestBrokenSetUp extends DrupalWebTestCase {
/**
* Tests missing requirements to run test.
*/
-class SimpleTestMissingCheckedRequirements extends DrupalWebTestCase {
+class SimpleTestMissingCheckedRequirements extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Broken requirements test',
@@ -590,7 +592,7 @@ class SimpleTestMissingCheckedRequirements extends DrupalWebTestCase {
* Overrides checkRequirements().
*/
protected function checkRequirements() {
- if (drupal_valid_test_ua()) {
+ if (valid_test_ua()) {
return array(
'Test is not allowed to run.'
);
@@ -604,7 +606,7 @@ class SimpleTestMissingCheckedRequirements extends DrupalWebTestCase {
protected function testCheckRequirements() {
// If this is the main request, run the web test script and then assert
// that the child tests did not run.
- if (!drupal_valid_test_ua()) {
+ if (!valid_test_ua()) {
// Run this test from web interface.
$edit['SimpleTestMissingCheckedRequirements'] = TRUE;
$this->drupalPost('admin/config/development/testing', $edit, t('Run tests'));
diff --git a/core/modules/simpletest/tests/actions.test b/core/modules/simpletest/tests/actions.test
index afcb686..c080699 100644
--- a/core/modules/simpletest/tests/actions.test
+++ b/core/modules/simpletest/tests/actions.test
@@ -1,6 +1,7 @@
'Actions configuration',
@@ -20,7 +21,7 @@ class ActionsConfigurationTestCase extends DrupalWebTestCase {
// Make a POST request to admin/config/system/actions/manage.
$edit = array();
- $edit['action'] = drupal_hash_base64('system_goto_action');
+ $edit['action'] = hash_base64('system_redirect_action');
$this->drupalPost('admin/config/system/actions/manage', $edit, t('Create'));
// Make a POST request to the individual action configuration page.
@@ -28,7 +29,7 @@ class ActionsConfigurationTestCase extends DrupalWebTestCase {
$action_label = $this->randomName();
$edit['actions_label'] = $action_label;
$edit['url'] = 'admin';
- $this->drupalPost('admin/config/system/actions/configure/' . drupal_hash_base64('system_goto_action'), $edit, t('Save'));
+ $this->drupalPost('admin/config/system/actions/configure/' . hash_base64('system_redirect_action'), $edit, t('Save'));
// Make sure that the new complex action was saved properly.
$this->assertText(t('The action has been successfully saved.'), t("Make sure we get a confirmation that we've successfully saved the complex action."));
@@ -58,7 +59,7 @@ class ActionsConfigurationTestCase extends DrupalWebTestCase {
$this->assertRaw(t('Action %action was deleted', array('%action' => $new_action_label)), t('Make sure that we get a delete confirmation message.'));
$this->drupalGet('admin/config/system/actions/manage');
$this->assertNoText($new_action_label, t("Make sure the action label does not appear on the overview page after we've deleted the action."));
- $exists = db_query('SELECT aid FROM {actions} WHERE callback = :callback', array(':callback' => 'drupal_goto_action'))->fetchField();
+ $exists = db_query('SELECT aid FROM {actions} WHERE callback = :callback', array(':callback' => 'redirect_action'))->fetchField();
$this->assertFalse($exists, t('Make sure the action is gone from the database after being deleted.'));
}
}
@@ -66,7 +67,7 @@ class ActionsConfigurationTestCase extends DrupalWebTestCase {
/**
* Test actions executing in a potential loop, and make sure they abort properly.
*/
-class ActionLoopTestCase extends DrupalWebTestCase {
+class ActionLoopTestCase extends WebTestCase {
protected $aid;
public static function getInfo() {
diff --git a/core/modules/simpletest/tests/actions_loop_test.install b/core/modules/simpletest/tests/actions_loop_test.install
index b22fd85..a0279c1 100644
--- a/core/modules/simpletest/tests/actions_loop_test.install
+++ b/core/modules/simpletest/tests/actions_loop_test.install
@@ -1,4 +1,5 @@
drupalGetAJAX('ajax-test/render');
// Verify that there is a command to load settings added with
- // drupal_add_js().
+ // add_js().
$expected = array(
'command' => 'settings',
'settings' => array('basePath' => base_path(), 'ajax' => 'test'),
);
- $this->assertCommand($commands, $expected, t('ajax_render() loads settings added with drupal_add_js().'));
+ $this->assertCommand($commands, $expected, t('ajax_render() loads settings added with add_js().'));
// Verify that Ajax settings are loaded for #type 'link'.
$this->drupalGet('ajax-test/link');
@@ -124,11 +125,11 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
$expected = array(
'setting_name' => 'ajax_forms_test_lazy_load_form_submit',
'setting_value' => 'executed',
- 'css' => drupal_get_path('module', 'system') . '/system.admin.css',
- 'js' => drupal_get_path('module', 'system') . '/system.js',
+ 'css' => get_path('module', 'system') . '/system.admin.css',
+ 'js' => get_path('module', 'system') . '/system.js',
);
// @todo D8: Add a drupal_css_defaults() helper function.
- $expected_css_html = drupal_get_css(array($expected['css'] => array(
+ $expected_css_html = get_css(array($expected['css'] => array(
'type' => 'file',
'group' => CSS_DEFAULT,
'weight' => 0,
@@ -138,7 +139,7 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
'data' => $expected['css'],
'browsers' => array('IE' => TRUE, '!IE' => TRUE),
)), TRUE);
- $expected_js_html = drupal_get_js('header', array($expected['js'] => drupal_js_defaults($expected['js'])), TRUE);
+ $expected_js_html = get_js('header', array($expected['js'] => js_defaults($expected['js'])), TRUE);
// Get the base page.
$this->drupalGet('ajax_forms_test_lazy_load_form');
diff --git a/core/modules/simpletest/tests/ajax_forms_test.module b/core/modules/simpletest/tests/ajax_forms_test.module
index 6a95710..c474941 100644
--- a/core/modules/simpletest/tests/ajax_forms_test.module
+++ b/core/modules/simpletest/tests/ajax_forms_test.module
@@ -1,4 +1,5 @@
'AJAX forms simple form test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('ajax_forms_test_simple_form'),
'access callback' => TRUE,
);
$items['ajax_forms_test_ajax_commands_form'] = array(
'title' => 'AJAX forms AJAX commands test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('ajax_forms_test_ajax_commands_form'),
'access callback' => TRUE,
);
$items['ajax_validation_test'] = array(
'title' => 'AJAX Validation Test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('ajax_forms_test_validation_form'),
'access callback' => TRUE,
);
$items['ajax_forms_test_lazy_load_form'] = array(
'title' => 'AJAX forms lazy load test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('ajax_forms_test_lazy_load_form'),
'access callback' => TRUE,
);
@@ -452,15 +453,15 @@ function ajax_forms_test_validation_form($form, &$form_state) {
* Submit handler for the validation form.
*/
function ajax_forms_test_validation_form_submit($form, $form_state) {
- drupal_set_message(t("Validation form submitted"));
+ set_message(t("Validation form submitted"));
}
/**
* Ajax callback for the 'drivertext' element of the validation form.
*/
function ajax_forms_test_validation_form_callback($form, $form_state) {
- drupal_set_message("ajax_forms_test_validation_form_callback invoked");
- drupal_set_message(t("Callback: drivertext=%drivertext, spare_required_field=%spare_required_field", array('%drivertext' => $form_state['values']['drivertext'], '%spare_required_field' => $form_state['values']['spare_required_field'])));
+ set_message("ajax_forms_test_validation_form_callback invoked");
+ set_message(t("Callback: drivertext=%drivertext, spare_required_field=%spare_required_field", array('%drivertext' => $form_state['values']['drivertext'], '%spare_required_field' => $form_state['values']['spare_required_field'])));
return '
ajax_forms_test_validation_form_callback at ' . date('c') . '
';
}
@@ -487,9 +488,9 @@ function ajax_forms_test_lazy_load_form($form, &$form_state) {
*/
function ajax_forms_test_lazy_load_form_submit($form, &$form_state) {
if ($form_state['values']['add_files']) {
- drupal_add_js(array('ajax_forms_test_lazy_load_form_submit' => 'executed'), 'setting');
- drupal_add_css(drupal_get_path('module', 'system') . '/system.admin.css');
- drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
+ add_js(array('ajax_forms_test_lazy_load_form_submit' => 'executed'), 'setting');
+ add_css(get_path('module', 'system') . '/system.admin.css');
+ add_js(get_path('module', 'system') . '/system.js');
}
$form_state['rebuild'] = TRUE;
}
diff --git a/core/modules/simpletest/tests/ajax_test.module b/core/modules/simpletest/tests/ajax_test.module
index 4148a08..5337edb 100644
--- a/core/modules/simpletest/tests/ajax_test.module
+++ b/core/modules/simpletest/tests/ajax_test.module
@@ -1,4 +1,5 @@
'test'), 'setting');
+ add_js(array('ajax' => 'test'), 'setting');
return array('#type' => 'ajax', '#commands' => array());
}
diff --git a/core/modules/simpletest/tests/batch.test b/core/modules/simpletest/tests/batch.test
index 1e9b31b..34e83ca 100644
--- a/core/modules/simpletest/tests/batch.test
+++ b/core/modules/simpletest/tests/batch.test
@@ -1,4 +1,5 @@
'Batch processing',
@@ -127,14 +128,14 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
}
/**
- * Test that drupal_form_submit() can run within a batch operation.
+ * Test that form_submit() can run within a batch operation.
*/
function testDrupalFormSubmitInBatch() {
// Displaying the page triggers a batch that programmatically submits a
// form.
$value = rand(0, 255);
$this->drupalGet('batch-test/nested-programmatic/' . $value);
- $this->assertEqual(batch_test_stack(), array('mock form submitted with value = ' . $value), t('drupal_form_submit() ran successfully within a batch operation.'));
+ $this->assertEqual(batch_test_stack(), array('mock form submitted with value = ' . $value), t('form_submit() ran successfully within a batch operation.'));
}
/**
@@ -277,7 +278,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
/**
* Tests for the Batch API Progress page.
*/
-class BatchPageTestCase extends DrupalWebTestCase {
+class BatchPageTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Batch progress page',
@@ -316,7 +317,7 @@ class BatchPageTestCase extends DrupalWebTestCase {
* Tests the function _batch_api_percentage() to make sure that the rounding
* works properly in all cases.
*/
-class BatchPercentagesUnitTestCase extends DrupalUnitTestCase {
+class BatchPercentagesUnitTestCase extends UnitTestCase {
protected $testCases = array();
public static function getInfo() {
@@ -379,7 +380,7 @@ class BatchPercentagesUnitTestCase extends DrupalUnitTestCase {
'80' => array('total' => 1, 'current' => 400/501),
'99.8' => array('total' => 1, 'current' => 500/501),
);
- require_once DRUPAL_ROOT . '/core/includes/batch.inc';
+ require_once ROOT . '/core/includes/batch.inc';
parent::setUp();
}
diff --git a/core/modules/simpletest/tests/batch_test.callbacks.inc b/core/modules/simpletest/tests/batch_test.callbacks.inc
index 75e6655..0962422 100644
--- a/core/modules/simpletest/tests/batch_test.callbacks.inc
+++ b/core/modules/simpletest/tests/batch_test.callbacks.inc
@@ -1,4 +1,5 @@
@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE)));
}
- drupal_set_message(implode('
', $messages));
+ set_message(implode('
', $messages));
}
/**
diff --git a/core/modules/simpletest/tests/batch_test.module b/core/modules/simpletest/tests/batch_test.module
index 1200e76..995d8e1 100644
--- a/core/modules/simpletest/tests/batch_test.module
+++ b/core/modules/simpletest/tests/batch_test.module
@@ -1,4 +1,5 @@
'Batch test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('batch_test_simple_form'),
'access callback' => TRUE,
);
@@ -26,7 +27,7 @@ function batch_test_menu() {
// Multistep form: two steps, each setting a batch.
$items['batch-test/multistep'] = array(
'title' => 'Multistep',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('batch_test_multistep_form'),
'access callback' => TRUE,
'type' => MENU_LOCAL_TASK,
@@ -35,14 +36,14 @@ function batch_test_menu() {
// Chained form: four submit handlers, several of which set a batch.
$items['batch-test/chained'] = array(
'title' => 'Chained',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('batch_test_chained_form'),
'access callback' => TRUE,
'type' => MENU_LOCAL_TASK,
'weight' => 2,
);
// Programmatic form: the page submits the 'Chained' form through
- // drupal_form_submit().
+ // form_submit().
$items['batch-test/programmatic'] = array(
'title' => 'Programmatic',
'page callback' => 'batch_test_programmatic',
@@ -69,7 +70,7 @@ function batch_test_menu() {
// Tests programmatic form submission within a batch operation.
$items['batch-test/nested-programmatic'] = array(
'title' => 'Nested programmatic',
- 'page callback' => 'batch_test_nested_drupal_form_submit',
+ 'page callback' => 'batch_test_nested_form_submit',
'access callback' => TRUE,
'type' => MENU_LOCAL_TASK,
'weight' => 6,
@@ -121,7 +122,7 @@ function batch_test_simple_form() {
function batch_test_simple_form_submit($form, &$form_state) {
batch_test_stack(NULL, TRUE);
- $function = '_batch_test_' . $form_state['values']['batch'];
+ $function = 'Drupal\_batch_test_' . $form_state['values']['batch'];
batch_set($function());
$form_state['redirect'] = 'batch-test/redirect';
@@ -260,28 +261,28 @@ function batch_test_programmatic($value = 1) {
$form_state = array(
'values' => array('value' => $value)
);
- drupal_form_submit('batch_test_chained_form', $form_state);
+ form_submit('batch_test_chained_form', $form_state);
return 'Got out of a programmatic batched form.';
}
/**
* Menu callback: programmatically submits a form within a batch.
*/
-function batch_test_nested_drupal_form_submit($value = 1) {
+function batch_test_nested_form_submit($value = 1) {
// Set the batch and process it.
$batch['operations'] = array(
- array('_batch_test_nested_drupal_form_submit_callback', array($value)),
+ array('_batch_test_nested_form_submit_callback', array($value)),
);
batch_set($batch);
batch_process('batch-test/redirect');
}
/**
- * Batch operation: submits form_test_mock_form using drupal_form_submit().
+ * Batch operation: submits form_test_mock_form using form_submit().
*/
-function _batch_test_nested_drupal_form_submit_callback($value) {
+function _batch_test_nested_form_submit_callback($value) {
$state['values']['test_value'] = $value;
- drupal_form_submit('batch_test_mock_form', $state);
+ form_submit('batch_test_mock_form', $state);
}
/**
@@ -340,7 +341,7 @@ function _batch_test_batch_0() {
$batch = array(
'operations' => array(),
'finished' => '_batch_test_finished_0',
- 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc',
+ 'file' => get_path('module', 'batch_test'). '/batch_test.callbacks.inc',
);
return $batch;
}
@@ -362,7 +363,7 @@ function _batch_test_batch_1() {
$batch = array(
'operations' => $operations,
'finished' => '_batch_test_finished_1',
- 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc',
+ 'file' => get_path('module', 'batch_test'). '/batch_test.callbacks.inc',
);
return $batch;
}
@@ -383,7 +384,7 @@ function _batch_test_batch_2() {
$batch = array(
'operations' => $operations,
'finished' => '_batch_test_finished_2',
- 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
+ 'file' => get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
);
return $batch;
}
@@ -414,7 +415,7 @@ function _batch_test_batch_3() {
$batch = array(
'operations' => $operations,
'finished' => '_batch_test_finished_3',
- 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
+ 'file' => get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
);
return $batch;
}
@@ -443,7 +444,7 @@ function _batch_test_batch_4() {
$batch = array(
'operations' => $operations,
'finished' => '_batch_test_finished_4',
- 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
+ 'file' => get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
);
return $batch;
}
@@ -465,7 +466,7 @@ function _batch_test_batch_5() {
$batch = array(
'operations' => $operations,
'finished' => '_batch_test_finished_5',
- 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc',
+ 'file' => get_path('module', 'batch_test'). '/batch_test.callbacks.inc',
);
return $batch;
}
diff --git a/core/modules/simpletest/tests/bootstrap.test b/core/modules/simpletest/tests/bootstrap.test
index 13fdf07..93be16c 100644
--- a/core/modules/simpletest/tests/bootstrap.test
+++ b/core/modules/simpletest/tests/bootstrap.test
@@ -1,6 +1,7 @@
cluster_ip = '127.0.0.5';
$this->untrusted_ip = '0.0.0.0';
- drupal_static_reset('ip_address');
+ drupal_static_reset('Drupal\ip_address');
$_SERVER['REMOTE_ADDR'] = $this->remote_ip;
unset($_SERVER['HTTP_X_FORWARDED_FOR']);
@@ -31,7 +32,7 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
function tearDown() {
$_SERVER = $this->oldserver;
- drupal_static_reset('ip_address');
+ drupal_static_reset('Drupal\ip_address');
parent::tearDown();
}
@@ -54,7 +55,7 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
// Proxy forwarding on and proxy address not trusted.
variable_set('reverse_proxy_addresses', array($this->proxy_ip, $this->proxy2_ip));
- drupal_static_reset('ip_address');
+ drupal_static_reset('Drupal\ip_address');
$_SERVER['REMOTE_ADDR'] = $this->untrusted_ip;
$this->assertTrue(
ip_address() == $this->untrusted_ip,
@@ -64,7 +65,7 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
// Proxy forwarding on and proxy address trusted.
$_SERVER['REMOTE_ADDR'] = $this->proxy_ip;
$_SERVER['HTTP_X_FORWARDED_FOR'] = $this->forwarded_ip;
- drupal_static_reset('ip_address');
+ drupal_static_reset('Drupal\ip_address');
$this->assertTrue(
ip_address() == $this->forwarded_ip,
t('Proxy forwarding with trusted proxy got forwarded IP address.')
@@ -73,7 +74,7 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
// Multi-tier architecture with comma separated values in header.
$_SERVER['REMOTE_ADDR'] = $this->proxy_ip;
$_SERVER['HTTP_X_FORWARDED_FOR'] = implode(', ', array($this->untrusted_ip, $this->forwarded_ip, $this->proxy2_ip));
- drupal_static_reset('ip_address');
+ drupal_static_reset('Drupal\ip_address');
$this->assertTrue(
ip_address() == $this->forwarded_ip,
t('Proxy forwarding with trusted 2-tier proxy got forwarded IP address.')
@@ -82,23 +83,23 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
// Custom client-IP header.
variable_set('reverse_proxy_header', 'HTTP_X_CLUSTER_CLIENT_IP');
$_SERVER['HTTP_X_CLUSTER_CLIENT_IP'] = $this->cluster_ip;
- drupal_static_reset('ip_address');
+ drupal_static_reset('Drupal\ip_address');
$this->assertTrue(
ip_address() == $this->cluster_ip,
t('Cluster environment got cluster client IP.')
);
- // Verifies that drupal_valid_http_host() prevents invalid characters.
- $this->assertFalse(drupal_valid_http_host('security/.drupal.org:80'), t('HTTP_HOST with / is invalid'));
- $this->assertFalse(drupal_valid_http_host('security\\.drupal.org:80'), t('HTTP_HOST with \\ is invalid'));
- $this->assertFalse(drupal_valid_http_host('security<.drupal.org:80'), t('HTTP_HOST with < is invalid'));
- $this->assertFalse(drupal_valid_http_host('security..drupal.org:80'), t('HTTP_HOST with .. is invalid'));
+ // Verifies that valid_http_host() prevents invalid characters.
+ $this->assertFalse(valid_http_host('security/.drupal.org:80'), t('HTTP_HOST with / is invalid'));
+ $this->assertFalse(valid_http_host('security\\.drupal.org:80'), t('HTTP_HOST with \\ is invalid'));
+ $this->assertFalse(valid_http_host('security<.drupal.org:80'), t('HTTP_HOST with < is invalid'));
+ $this->assertFalse(valid_http_host('security..drupal.org:80'), t('HTTP_HOST with .. is invalid'));
// IPv6 loopback address
- $this->assertTrue(drupal_valid_http_host('[::1]:80'), t('HTTP_HOST containing IPv6 loopback is valid'));
+ $this->assertTrue(valid_http_host('[::1]:80'), t('HTTP_HOST containing IPv6 loopback is valid'));
}
}
-class BootstrapPageCacheTestCase extends DrupalWebTestCase {
+class BootstrapPageCacheTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -222,7 +223,7 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
}
}
-class BootstrapVariableTestCase extends DrupalWebTestCase {
+class BootstrapVariableTestCase extends WebTestCase {
function setUp() {
parent::setUp('system_test');
@@ -272,7 +273,7 @@ class BootstrapVariableTestCase extends DrupalWebTestCase {
/**
* Test hook_boot() and hook_exit().
*/
-class HookBootExitTestCase extends DrupalWebTestCase {
+class HookBootExitTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -321,51 +322,51 @@ class HookBootExitTestCase extends DrupalWebTestCase {
}
/**
- * Test drupal_get_filename()'s availability.
+ * Test get_filename()'s availability.
*/
-class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
+class BootstrapGetFilenameTestCase extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'Get filename test',
- 'description' => 'Test that drupal_get_filename() works correctly when the file is not found in the database.',
+ 'description' => 'Test that get_filename() works correctly when the file is not found in the database.',
'group' => 'Bootstrap',
);
}
/**
- * Test that drupal_get_filename() works correctly when the file is not found in the database.
+ * Test that get_filename() works correctly when the file is not found in the database.
*/
function testDrupalGetFilename() {
// Reset the static cache so we can test the "db is not active" code of
- // drupal_get_filename().
- drupal_static_reset('drupal_get_filename');
+ // get_filename().
+ drupal_static_reset('Drupal\get_filename');
// Retrieving the location of a module.
- $this->assertIdentical(drupal_get_filename('module', 'php'), 'core/modules/php/php.module', t('Retrieve module location.'));
+ $this->assertIdentical(get_filename('module', 'php'), 'core/modules/php/php.module', t('Retrieve module location.'));
// Retrieving the location of a theme.
- $this->assertIdentical(drupal_get_filename('theme', 'stark'), 'core/themes/stark/stark.info', t('Retrieve theme location.'));
+ $this->assertIdentical(get_filename('theme', 'stark'), 'core/themes/stark/stark.info', t('Retrieve theme location.'));
// Retrieving the location of a theme engine.
- $this->assertIdentical(drupal_get_filename('theme_engine', 'phptemplate'), 'core/themes/engines/phptemplate/phptemplate.engine', t('Retrieve theme engine location.'));
+ $this->assertIdentical(get_filename('theme_engine', 'phptemplate'), 'core/themes/engines/phptemplate/phptemplate.engine', t('Retrieve theme engine location.'));
// Retrieving the location of a profile. Profiles are a special case with
// a fixed location and naming.
- $this->assertIdentical(drupal_get_filename('profile', 'standard'), 'profiles/standard/standard.profile', t('Retrieve install profile location.'));
+ $this->assertIdentical(get_filename('profile', 'standard'), 'profiles/standard/standard.profile', t('Retrieve install profile location.'));
- // When a file is not found in the database cache, drupal_get_filename()
+ // When a file is not found in the database cache, get_filename()
// searches several locations on the filesystem, including the core/
// directory. We use the '.script' extension below because this is a
// non-existent filetype that will definitely not exist in the database.
- // Since there is already a core/scripts directory, drupal_get_filename()
+ // Since there is already a core/scripts directory, get_filename()
// will automatically check there for 'script' files, just as it does
// for (e.g.) 'module' files in core/modules.
- $this->assertIdentical(drupal_get_filename('script', 'test'), 'core/scripts/test.script', t('Retrieve test script location.'));
+ $this->assertIdentical(get_filename('script', 'test'), 'core/scripts/test.script', t('Retrieve test script location.'));
}
}
-class BootstrapTimerTestCase extends DrupalUnitTestCase {
+class BootstrapTimerTestCase extends UnitTestCase {
public static function getInfo() {
return array(
@@ -400,7 +401,7 @@ class BootstrapTimerTestCase extends DrupalUnitTestCase {
/**
* Test that resetting static variables works.
*/
-class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
+class BootstrapResettableStaticTestCase extends UnitTestCase {
public static function getInfo() {
return array(
@@ -439,7 +440,7 @@ class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
/**
* Test miscellaneous functions in bootstrap.inc.
*/
-class BootstrapMiscTestCase extends DrupalUnitTestCase {
+class BootstrapMiscTestCase extends UnitTestCase {
public static function getInfo() {
return array(
@@ -453,28 +454,28 @@ class BootstrapMiscTestCase extends DrupalUnitTestCase {
* Test miscellaneous functions in bootstrap.inc.
*/
function testMisc() {
- // Test drupal_array_merge_deep().
+ // Test array_merge_deep().
$link_options_1 = array('fragment' => 'x', 'attributes' => array('title' => 'X', 'class' => array('a', 'b')), 'language' => 'en');
$link_options_2 = array('fragment' => 'y', 'attributes' => array('title' => 'Y', 'class' => array('c', 'd')), 'html' => TRUE);
$expected = array('fragment' => 'y', 'attributes' => array('title' => 'Y', 'class' => array('a', 'b', 'c', 'd')), 'language' => 'en', 'html' => TRUE);
- $this->assertIdentical(drupal_array_merge_deep($link_options_1, $link_options_2), $expected, t('drupal_array_merge_deep() returned a properly merged array.'));
+ $this->assertIdentical(array_merge_deep($link_options_1, $link_options_2), $expected, t('array_merge_deep() returned a properly merged array.'));
}
}
/**
* Tests for overriding server variables via the API.
*/
-class BootstrapOverrideServerVariablesTestCase extends DrupalUnitTestCase {
+class BootstrapOverrideServerVariablesTestCase extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'Overriding server variables',
- 'description' => 'Test that drupal_override_server_variables() works correctly.',
+ 'description' => 'Test that override_server_variables() works correctly.',
'group' => 'Bootstrap',
);
}
/**
- * Test providing a direct URL to to drupal_override_server_variables().
+ * Test providing a direct URL to to override_server_variables().
*/
function testDrupalOverrideServerVariablesProvidedURL() {
$tests = array(
@@ -495,9 +496,9 @@ class BootstrapOverrideServerVariablesTestCase extends DrupalUnitTestCase {
// Remember the original value of $_SERVER, since the function call below
// will modify it.
$original_server = $_SERVER;
- // Call drupal_override_server_variables() and ensure that all expected
+ // Call override_server_variables() and ensure that all expected
// $_SERVER variables were modified correctly.
- drupal_override_server_variables(array('url' => $url));
+ override_server_variables(array('url' => $url));
foreach ($expected_server_values as $key => $value) {
$this->assertIdentical($_SERVER[$key], $value);
}
diff --git a/core/modules/simpletest/tests/cache.test b/core/modules/simpletest/tests/cache.test
index bca4e25..4b75f44 100644
--- a/core/modules/simpletest/tests/cache.test
+++ b/core/modules/simpletest/tests/cache.test
@@ -1,6 +1,8 @@
$bin) {
$cid = 'test_cid_clear' . $id;
diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test
index ff80806..35e2984 100644
--- a/core/modules/simpletest/tests/common.test
+++ b/core/modules/simpletest/tests/common.test
@@ -1,4 +1,6 @@
'Alter hook functionality',
- 'description' => 'Tests alteration of arguments passed to drupal_alter().',
+ 'description' => 'Tests alteration of arguments passed to alter().',
'group' => 'Common',
);
}
@@ -35,13 +37,13 @@ class CommonDrupalAlterTestCase extends DrupalWebTestCase {
// Verify alteration of a single argument.
$array_copy = $array;
$array_expected = array('foo' => 'Drupal theme');
- drupal_alter('drupal_alter', $array_copy);
+ alter('alter', $array_copy);
$this->assertEqual($array_copy, $array_expected, t('Single array was altered.'));
$entity_copy = clone $entity;
$entity_expected = clone $entity;
$entity_expected->foo = 'Drupal theme';
- drupal_alter('drupal_alter', $entity_copy);
+ alter('alter', $entity_copy);
$this->assertEqual($entity_copy, $entity_expected, t('Single object was altered.'));
// Verify alteration of multiple arguments.
@@ -52,17 +54,17 @@ class CommonDrupalAlterTestCase extends DrupalWebTestCase {
$entity_expected->foo = 'Drupal theme';
$array2_copy = $array;
$array2_expected = array('foo' => 'Drupal theme');
- drupal_alter('drupal_alter', $array_copy, $entity_copy, $array2_copy);
- $this->assertEqual($array_copy, $array_expected, t('First argument to drupal_alter() was altered.'));
- $this->assertEqual($entity_copy, $entity_expected, t('Second argument to drupal_alter() was altered.'));
- $this->assertEqual($array2_copy, $array2_expected, t('Third argument to drupal_alter() was altered.'));
+ alter('alter', $array_copy, $entity_copy, $array2_copy);
+ $this->assertEqual($array_copy, $array_expected, t('First argument to alter() was altered.'));
+ $this->assertEqual($entity_copy, $entity_expected, t('Second argument to alter() was altered.'));
+ $this->assertEqual($array2_copy, $array2_expected, t('Third argument to alter() was altered.'));
- // Verify alteration order when passing an array of types to drupal_alter().
+ // Verify alteration order when passing an array of types to alter().
// common_test_module_implements_alter() places 'block' implementation after
// other modules.
$array_copy = $array;
$array_expected = array('foo' => 'Drupal block theme');
- drupal_alter(array('drupal_alter', 'drupal_alter_foo'), $array_copy);
+ alter(array('alter', 'alter_foo'), $array_copy);
$this->assertEqual($array_copy, $array_expected, t('hook_TYPE_alter() implementations ran in correct order.'));
}
}
@@ -73,11 +75,11 @@ class CommonDrupalAlterTestCase extends DrupalWebTestCase {
* url() calls module_implements(), which may issue a db query, which requires
* inheriting from a web test case rather than a unit test case.
*/
-class CommonURLUnitTestCase extends DrupalWebTestCase {
+class URLUnitTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'URL generation tests',
- 'description' => 'Confirm that url(), drupal_get_query_parameters(), drupal_http_build_query(), and l() work correctly with various input.',
+ 'description' => 'Confirm that url(), get_query_parameters(), drupal_http_build_query(), and l() work correctly with various input.',
'group' => 'Common',
);
}
@@ -116,7 +118,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
}
/**
- * Test drupal_get_query_parameters().
+ * Test get_query_parameters().
*/
function testDrupalGetQueryParameters() {
$original = array(
@@ -134,32 +136,32 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
// Default arguments.
$result = $_GET;
unset($result['q']);
- $this->assertEqual(drupal_get_query_parameters(), $result, t("\$_GET['q'] was removed."));
+ $this->assertEqual(get_query_parameters(), $result, t("\$_GET['q'] was removed."));
// Default exclusion.
$result = $original;
unset($result['q']);
- $this->assertEqual(drupal_get_query_parameters($original), $result, t("'q' was removed."));
+ $this->assertEqual(get_query_parameters($original), $result, t("'q' was removed."));
// First-level exclusion.
$result = $original;
unset($result['b']);
- $this->assertEqual(drupal_get_query_parameters($original, array('b')), $result, t("'b' was removed."));
+ $this->assertEqual(get_query_parameters($original, array('b')), $result, t("'b' was removed."));
// Second-level exclusion.
$result = $original;
unset($result['b']['d']);
- $this->assertEqual(drupal_get_query_parameters($original, array('b[d]')), $result, t("'b[d]' was removed."));
+ $this->assertEqual(get_query_parameters($original, array('b[d]')), $result, t("'b[d]' was removed."));
// Third-level exclusion.
$result = $original;
unset($result['b']['e']['f']);
- $this->assertEqual(drupal_get_query_parameters($original, array('b[e][f]')), $result, t("'b[e][f]' was removed."));
+ $this->assertEqual(get_query_parameters($original, array('b[e][f]')), $result, t("'b[e][f]' was removed."));
// Multiple exclusions.
$result = $original;
unset($result['a'], $result['b']['e'], $result['c']);
- $this->assertEqual(drupal_get_query_parameters($original, array('a', 'b[e]', 'c')), $result, t("'a', 'b[e]', 'c' were removed."));
+ $this->assertEqual(get_query_parameters($original, array('a', 'b[e]', 'c')), $result, t("'a', 'b[e]', 'c' were removed."));
}
/**
@@ -355,7 +357,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
/**
* Tests for the check_plain(), filter_xss() and format_string() functions.
*/
-class CommonXssUnitTestCase extends DrupalUnitTestCase {
+class CommonXssUnitTestCase extends UnitTestCase {
public static function getInfo() {
return array(
@@ -397,7 +399,7 @@ class CommonXssUnitTestCase extends DrupalUnitTestCase {
* Test t() and format_string() replacement functionality.
*/
function testFormatStringAndT() {
- foreach (array('format_string', 't') as $function) {
+ foreach (array('Drupal\format_string', 'Drupal\t') as $function) {
$text = $function('Simple text');
$this->assertEqual($text, 'Simple text', $function . ' leaves simple text alone.');
$text = $function('Escaped text: @value', array('@value' => '' . "\n";
@@ -1344,9 +1346,9 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
* Test JavaScript versioning.
*/
function testVersionQueryString() {
- drupal_add_js('core/misc/collapse.js', array('version' => 'foo'));
- drupal_add_js('core/misc/ajax.js', array('version' => 'bar'));
- $javascript = drupal_get_js();
+ add_js('core/misc/collapse.js', array('version' => 'foo'));
+ add_js('core/misc/ajax.js', array('version' => 'bar'));
+ $javascript = get_js();
$this->assertTrue(strpos($javascript, 'core/misc/collapse.js?v=foo') > 0 && strpos($javascript, 'core/misc/ajax.js?v=bar') > 0 , t('JavaScript version identifiers correctly appended to URLs'));
}
@@ -1360,11 +1362,11 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
// ahead of ones without. The order of JavaScript execution must be the
// same regardless of whether aggregation is enabled, so ensure this
// expected order, first with aggregation off.
- drupal_add_js('core/misc/ajax.js');
- drupal_add_js('core/misc/authorize.js', array('every_page' => TRUE));
- drupal_add_js('core/misc/autocomplete.js');
- drupal_add_js('core/misc/batch.js', array('every_page' => TRUE));
- $javascript = drupal_get_js();
+ add_js('core/misc/ajax.js');
+ add_js('core/misc/authorize.js', array('every_page' => TRUE));
+ add_js('core/misc/autocomplete.js');
+ add_js('core/misc/batch.js', array('every_page' => TRUE));
+ $javascript = get_js();
$expected = implode("\n", array(
'',
'',
@@ -1375,17 +1377,17 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
// Now ensure that with aggregation on, one file is made for the
// 'every_page' files, and one file is made for the others.
- drupal_static_reset('drupal_add_js');
+ drupal_static_reset('Drupal\add_js');
variable_set('preprocess_js', 1);
- drupal_add_js('core/misc/ajax.js');
- drupal_add_js('core/misc/authorize.js', array('every_page' => TRUE));
- drupal_add_js('core/misc/autocomplete.js');
- drupal_add_js('core/misc/batch.js', array('every_page' => TRUE));
- $js_items = drupal_add_js();
- $javascript = drupal_get_js();
+ add_js('core/misc/ajax.js');
+ add_js('core/misc/authorize.js', array('every_page' => TRUE));
+ add_js('core/misc/autocomplete.js');
+ add_js('core/misc/batch.js', array('every_page' => TRUE));
+ $js_items = add_js();
+ $javascript = get_js();
$expected = implode("\n", array(
- '',
- '',
+ '',
+ '',
));
$this->assertTrue(strpos($javascript, $expected) > 0, t('JavaScript is aggregated in the expected groups and order.'));
}
@@ -1395,16 +1397,16 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
*/
function testRenderOrder() {
// Add a bunch of JavaScript in strange ordering.
- drupal_add_js('(function($){alert("Weight 5 #1");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => 5));
- drupal_add_js('(function($){alert("Weight 0 #1");})(jQuery);', array('type' => 'inline', 'scope' => 'footer'));
- drupal_add_js('(function($){alert("Weight 0 #2");})(jQuery);', array('type' => 'inline', 'scope' => 'footer'));
- drupal_add_js('(function($){alert("Weight -8 #1");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
- drupal_add_js('(function($){alert("Weight -8 #2");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
- drupal_add_js('(function($){alert("Weight -8 #3");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
- drupal_add_js('http://example.com/example.js?Weight -5 #1', array('type' => 'external', 'scope' => 'footer', 'weight' => -5));
- drupal_add_js('(function($){alert("Weight -8 #4");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
- drupal_add_js('(function($){alert("Weight 5 #2");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => 5));
- drupal_add_js('(function($){alert("Weight 0 #3");})(jQuery);', array('type' => 'inline', 'scope' => 'footer'));
+ add_js('(function($){alert("Weight 5 #1");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => 5));
+ add_js('(function($){alert("Weight 0 #1");})(jQuery);', array('type' => 'inline', 'scope' => 'footer'));
+ add_js('(function($){alert("Weight 0 #2");})(jQuery);', array('type' => 'inline', 'scope' => 'footer'));
+ add_js('(function($){alert("Weight -8 #1");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
+ add_js('(function($){alert("Weight -8 #2");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
+ add_js('(function($){alert("Weight -8 #3");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
+ add_js('http://example.com/example.js?Weight -5 #1', array('type' => 'external', 'scope' => 'footer', 'weight' => -5));
+ add_js('(function($){alert("Weight -8 #4");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => -8));
+ add_js('(function($){alert("Weight 5 #2");})(jQuery);', array('type' => 'inline', 'scope' => 'footer', 'weight' => 5));
+ add_js('(function($){alert("Weight 0 #3");})(jQuery);', array('type' => 'inline', 'scope' => 'footer'));
// Construct the expected result from the regex.
$expected = array(
@@ -1421,7 +1423,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
);
// Retrieve the rendered JavaScript and test against the regex.
- $js = drupal_get_js('footer');
+ $js = get_js('footer');
$matches = array();
if (preg_match_all('/Weight\s([-0-9]+\s[#0-9]+)/', $js, $matches)) {
$result = $matches[1];
@@ -1437,10 +1439,10 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
*/
function testRenderDifferentWeight() {
// JavaScript files are sorted first by group, then by the 'every_page'
- // flag, then by weight (see drupal_sort_css_js()), so to test the effect of
+ // flag, then by weight (see sort_css_js()), so to test the effect of
// weight, we need the other two options to be the same.
- drupal_add_js('core/misc/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21));
- $javascript = drupal_get_js();
+ add_js('core/misc/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21));
+ $javascript = get_js();
$this->assertTrue(strpos($javascript, 'core/misc/collapse.js') < strpos($javascript, 'core/misc/jquery.js'), t('Rendering a JavaScript file above jQuery.'));
}
@@ -1451,13 +1453,13 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
*/
function testAlter() {
// Add both tableselect.js and simpletest.js, with a larger weight on SimpleTest.
- drupal_add_js('core/misc/tableselect.js');
- drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js', array('weight' => 9999));
+ add_js('core/misc/tableselect.js');
+ add_js(get_path('module', 'simpletest') . '/simpletest.js', array('weight' => 9999));
// Render the JavaScript, testing if simpletest.js was altered to be before
// tableselect.js. See simpletest_js_alter() to see where this alteration
// takes place.
- $javascript = drupal_get_js();
+ $javascript = get_js();
$this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/misc/tableselect.js'), t('Altering JavaScript weight through the alter hook.'));
}
@@ -1465,10 +1467,10 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
* Adds a library to the page and tests for both its JavaScript and its CSS.
*/
function testLibraryRender() {
- $result = drupal_add_library('system', 'farbtastic');
+ $result = add_library('system', 'farbtastic');
$this->assertTrue($result !== FALSE, t('Library was added without errors.'));
- $scripts = drupal_get_js();
- $styles = drupal_get_css();
+ $scripts = get_js();
+ $styles = get_css();
$this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), t('JavaScript of library was added to the page.'));
$this->assertTrue(strpos($styles, 'core/misc/farbtastic/farbtastic.css'), t('Stylesheet of library was added to the page.'));
}
@@ -1480,12 +1482,12 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
*/
function testLibraryAlter() {
// Verify that common_test altered the title of Farbtastic.
- $library = drupal_get_library('system', 'farbtastic');
+ $library = get_library('system', 'farbtastic');
$this->assertEqual($library['title'], 'Farbtastic: Altered Library', t('Registered libraries were altered.'));
// common_test_library_info_alter() also added a dependency on jQuery Form.
- drupal_add_library('system', 'farbtastic');
- $scripts = drupal_get_js();
+ add_library('system', 'farbtastic');
+ $scripts = get_js();
$this->assertTrue(strpos($scripts, 'core/misc/jquery.form.js'), t('Altered library dependencies are added to the page.'));
}
@@ -1495,7 +1497,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
* @see common_test_library_info()
*/
function testLibraryNameConflicts() {
- $farbtastic = drupal_get_library('common_test', 'farbtastic');
+ $farbtastic = get_library('common_test', 'farbtastic');
$this->assertEqual($farbtastic['title'], 'Custom Farbtastic Library', t('Alternative libraries can be added to the page.'));
}
@@ -1503,13 +1505,13 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
* Tests non-existing libraries.
*/
function testLibraryUnknown() {
- $result = drupal_get_library('unknown', 'unknown');
+ $result = get_library('unknown', 'unknown');
$this->assertFalse($result, t('Unknown library returned FALSE.'));
- drupal_static_reset('drupal_get_library');
+ drupal_static_reset('Drupal\get_library');
- $result = drupal_add_library('unknown', 'unknown');
+ $result = add_library('unknown', 'unknown');
$this->assertFalse($result, t('Unknown library returned FALSE.'));
- $scripts = drupal_get_js();
+ $scripts = get_js();
$this->assertTrue(strpos($scripts, 'unknown') === FALSE, t('Unknown library was not added to the page.'));
}
@@ -1519,27 +1521,27 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
function testAttachedLibrary() {
$element['#attached']['library'][] = array('system', 'farbtastic');
drupal_render($element);
- $scripts = drupal_get_js();
+ $scripts = get_js();
$this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), t('The attached_library property adds the additional libraries.'));
}
/**
- * Tests retrieval of libraries via drupal_get_library().
+ * Tests retrieval of libraries via get_library().
*/
function testGetLibrary() {
// Retrieve all libraries registered by a module.
- $libraries = drupal_get_library('common_test');
+ $libraries = get_library('common_test');
$this->assertTrue(isset($libraries['farbtastic']), t('Retrieved all module libraries.'));
// Retrieve all libraries for a module not implementing hook_library_info().
// Note: This test installs Locale module.
- $libraries = drupal_get_library('locale');
+ $libraries = get_library('locale');
$this->assertEqual($libraries, array(), t('Retrieving libraries from a module not implementing hook_library_info() returns an emtpy array.'));
// Retrieve a specific library by module and name.
- $farbtastic = drupal_get_library('common_test', 'farbtastic');
+ $farbtastic = get_library('common_test', 'farbtastic');
$this->assertEqual($farbtastic['version'], '5.3', t('Retrieved a single library.'));
// Retrieve a non-existing library by module and name.
- $farbtastic = drupal_get_library('common_test', 'foo');
+ $farbtastic = get_library('common_test', 'foo');
$this->assertIdentical($farbtastic, FALSE, t('Retrieving a non-existing library returns FALSE.'));
}
@@ -1550,14 +1552,14 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
function testAddJsFileWithQueryString() {
$this->drupalGet('common-test/query-string');
$query_string = variable_get('css_js_query_string', '0');
- $this->assertRaw(drupal_get_path('module', 'node') . '/node.js?' . $query_string, t('Query string was appended correctly to js.'));
+ $this->assertRaw(get_path('module', 'node') . '/node.js?' . $query_string, t('Query string was appended correctly to js.'));
}
}
/**
* Tests for drupal_render().
*/
-class CommonDrupalRenderTestCase extends DrupalWebTestCase {
+class CommonDrupalRenderTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'drupal_render()',
@@ -1631,9 +1633,9 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
// Create an element with a child and subchild. Each element loads a
// different JavaScript file using #attached.
- $parent_js = drupal_get_path('module', 'user') . '/user.js';
- $child_js = drupal_get_path('module', 'forum') . '/forum.js';
- $subchild_js = drupal_get_path('module', 'book') . '/book.js';
+ $parent_js = get_path('module', 'user') . '/user.js';
+ $child_js = get_path('module', 'forum') . '/forum.js';
+ $subchild_js = get_path('module', 'book') . '/book.js';
$element = array(
'#type' => 'fieldset',
'#cache' => array(
@@ -1654,16 +1656,16 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
// Render the element and verify the presence of #attached JavaScript.
drupal_render($element);
- $scripts = drupal_get_js();
+ $scripts = get_js();
$this->assertTrue(strpos($scripts, $parent_js), t('The element #attached JavaScript was included.'));
$this->assertTrue(strpos($scripts, $child_js), t('The child #attached JavaScript was included.'));
$this->assertTrue(strpos($scripts, $subchild_js), t('The subchild #attached JavaScript was included.'));
// Load the element from cache and verify the presence of the #attached
// JavaScript.
- drupal_static_reset('drupal_add_js');
- $this->assertTrue(drupal_render_cache_get($element), t('The element was retrieved from cache.'));
- $scripts = drupal_get_js();
+ drupal_static_reset('Drupal\add_js');
+ $this->assertTrue(render_cache_get($element), t('The element was retrieved from cache.'));
+ $scripts = get_js();
$this->assertTrue(strpos($scripts, $parent_js), t('The element #attached JavaScript was included when loading from cache.'));
$this->assertTrue(strpos($scripts, $child_js), t('The child #attached JavaScript was included when loading from cache.'));
$this->assertTrue(strpos($scripts, $subchild_js), t('The subchild #attached JavaScript was included when loading from cache.'));
@@ -1806,7 +1808,7 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
$error = array(
'%type' => 'User error',
'!message' => '"child" is an invalid render array key',
- '%function' => 'element_children()',
+ '%function' => 'Drupal\element_children()',
);
$message = t('%type: !message in %function (line ', $error);
@@ -1824,7 +1826,7 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
. '
' . $this->drupalGetContent()
);
- // @see DrupalWebTestCase::xpath()
+ // @see WebTestCase::xpath()
$xpath = $this->buildXPathQuery($xpath, $xpath_args);
$element += array('#value' => NULL);
$this->assertFieldByXPath($xpath, $element['#value'], t('#type @type was properly rendered.', array(
@@ -1867,7 +1869,7 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
/**
* Tests URL validation by valid_url().
*/
-class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
+class CommonValidUrlUnitTestCase extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'URL validation',
@@ -1973,13 +1975,13 @@ class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
}
/**
- * Tests writing of data records with drupal_write_record().
+ * Tests writing of data records with write_record().
*/
-class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
+class CommonDrupalWriteRecordTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Data record write functionality',
- 'description' => 'Tests writing of data records with drupal_write_record().',
+ 'description' => 'Tests writing of data records with write_record().',
'group' => 'Common',
);
}
@@ -1989,21 +1991,21 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
}
/**
- * Test the drupal_write_record() API function.
+ * Test the write_record() API function.
*/
function testDrupalWriteRecord() {
// Insert a record with no columns populated.
$record = array();
- $insert_result = drupal_write_record('test', $record);
- $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when an empty record is inserted with drupal_write_record().'));
+ $insert_result = write_record('test', $record);
+ $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when an empty record is inserted with write_record().'));
// Insert a record - no columns allow NULL values.
$person = new stdClass();
$person->name = 'John';
$person->unknown_column = 123;
- $insert_result = drupal_write_record('test', $person);
- $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with drupal_write_record() for a table with a single-field primary key.'));
- $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().'));
+ $insert_result = write_record('test', $person);
+ $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with write_record() for a table with a single-field primary key.'));
+ $this->assertTrue(isset($person->id), t('Primary key is set on record created with write_record().'));
$this->assertIdentical($person->age, 0, t('Age field set to default value.'));
$this->assertIdentical($person->job, 'Undefined', t('Job field set to default value.'));
@@ -2018,8 +2020,8 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
$person->name = 'Peter';
$person->age = 27;
$person->job = NULL;
- $update_result = drupal_write_record('test', $person, array('id'));
- $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record updated with drupal_write_record() for table with single-field primary key.'));
+ $update_result = write_record('test', $person, array('id'));
+ $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record updated with write_record() for table with single-field primary key.'));
// Verify that the record was updated.
$result = db_query("SELECT * FROM {test} WHERE id = :id", array(':id' => $person->id))->fetchObject();
@@ -2032,8 +2034,8 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
$person->name = 'Ringo';
$person->age = NULL;
$person->job = NULL;
- $insert_result = drupal_write_record('test', $person);
- $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().'));
+ $insert_result = write_record('test', $person);
+ $this->assertTrue(isset($person->id), t('Primary key is set on record created with write_record().'));
$result = db_query("SELECT * FROM {test} WHERE id = :id", array(':id' => $person->id))->fetchObject();
$this->assertIdentical($result->name, 'Ringo', t('Name field set.'));
$this->assertIdentical($result->age, '0', t('Age field set.'));
@@ -2043,8 +2045,8 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
$person = new stdClass();
$person->name = 'Paul';
$person->age = NULL;
- $insert_result = drupal_write_record('test_null', $person);
- $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().'));
+ $insert_result = write_record('test_null', $person);
+ $this->assertTrue(isset($person->id), t('Primary key is set on record created with write_record().'));
$result = db_query("SELECT * FROM {test_null} WHERE id = :id", array(':id' => $person->id))->fetchObject();
$this->assertIdentical($result->name, 'Paul', t('Name field set.'));
$this->assertIdentical($result->age, NULL, t('Age field set.'));
@@ -2052,8 +2054,8 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
// Insert a record - do not specify the value of a column that allows NULL.
$person = new stdClass();
$person->name = 'Meredith';
- $insert_result = drupal_write_record('test_null', $person);
- $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().'));
+ $insert_result = write_record('test_null', $person);
+ $this->assertTrue(isset($person->id), t('Primary key is set on record created with write_record().'));
$this->assertIdentical($person->age, 0, t('Age field set to default value.'));
$result = db_query("SELECT * FROM {test_null} WHERE id = :id", array(':id' => $person->id))->fetchObject();
$this->assertIdentical($result->name, 'Meredith', t('Name field set.'));
@@ -2062,7 +2064,7 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
// Update the newly created record.
$person->name = 'Mary';
$person->age = NULL;
- $update_result = drupal_write_record('test_null', $person, array('id'));
+ $update_result = write_record('test_null', $person, array('id'));
$result = db_query("SELECT * FROM {test_null} WHERE id = :id", array(':id' => $person->id))->fetchObject();
$this->assertIdentical($result->name, 'Mary', t('Name field set.'));
$this->assertIdentical($result->age, NULL, t('Age field set.'));
@@ -2070,27 +2072,27 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
// Insert a record - the "data" column should be serialized.
$person = new stdClass();
$person->name = 'Dave';
- $update_result = drupal_write_record('test_serialized', $person);
+ $update_result = write_record('test_serialized', $person);
$result = db_query("SELECT * FROM {test_serialized} WHERE id = :id", array(':id' => $person->id))->fetchObject();
$this->assertIdentical($result->name, 'Dave', t('Name field set.'));
$this->assertIdentical($result->info, NULL, t('Info field set.'));
$person->info = array();
- $update_result = drupal_write_record('test_serialized', $person, array('id'));
+ $update_result = write_record('test_serialized', $person, array('id'));
$result = db_query("SELECT * FROM {test_serialized} WHERE id = :id", array(':id' => $person->id))->fetchObject();
$this->assertIdentical(unserialize($result->info), array(), t('Info field updated.'));
// Update the serialized record.
$data = array('foo' => 'bar', 1 => 2, 'empty' => '', 'null' => NULL);
$person->info = $data;
- $update_result = drupal_write_record('test_serialized', $person, array('id'));
+ $update_result = write_record('test_serialized', $person, array('id'));
$result = db_query("SELECT * FROM {test_serialized} WHERE id = :id", array(':id' => $person->id))->fetchObject();
$this->assertIdentical(unserialize($result->info), $data, t('Info field updated.'));
// Run an update query where no field values are changed. The database
// layer should return zero for number of affected rows, but
// db_write_record() should still return SAVED_UPDATED.
- $update_result = drupal_write_record('test_null', $person, array('id'));
+ $update_result = write_record('test_null', $person, array('id'));
$this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a valid update is run without changing any values.'));
// Insert an object record for a table with a multi-field primary key.
@@ -2098,12 +2100,12 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
$node_access->nid = mt_rand();
$node_access->gid = mt_rand();
$node_access->realm = $this->randomName();
- $insert_result = drupal_write_record('node_access', $node_access);
- $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with drupal_write_record() for a table with a multi-field primary key.'));
+ $insert_result = write_record('node_access', $node_access);
+ $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with write_record() for a table with a multi-field primary key.'));
// Update the record.
- $update_result = drupal_write_record('node_access', $node_access, array('nid', 'gid', 'realm'));
- $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record is updated with drupal_write_record() for a table with a multi-field primary key.'));
+ $update_result = write_record('node_access', $node_access, array('nid', 'gid', 'realm'));
+ $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record is updated with write_record() for a table with a multi-field primary key.'));
}
}
@@ -2111,13 +2113,13 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
/**
* Tests SimpleTest error and exception collector.
*/
-class CommonSimpleTestErrorCollectorTestCase extends DrupalWebTestCase {
+class CommonSimpleTestErrorCollectorTestCase extends WebTestCase {
/**
* Errors triggered during the test.
*
* Errors are intercepted by the overriden implementation
- * of DrupalWebTestCase::error below.
+ * of WebTestCase::error below.
*
* @var Array
*/
@@ -2144,9 +2146,9 @@ class CommonSimpleTestErrorCollectorTestCase extends DrupalWebTestCase {
$this->assertEqual(count($this->collectedErrors), 3, t('Three errors were collected'));
if (count($this->collectedErrors) == 3) {
- $this->assertError($this->collectedErrors[0], 'Notice', 'error_test_generate_warnings()', 'error_test.module', 'Undefined variable: bananas');
- $this->assertError($this->collectedErrors[1], 'Warning', 'error_test_generate_warnings()', 'error_test.module', 'Division by zero');
- $this->assertError($this->collectedErrors[2], 'User warning', 'error_test_generate_warnings()', 'error_test.module', 'Drupal is awesome');
+ $this->assertError($this->collectedErrors[0], 'Notice', 'Drupal\error_test_generate_warnings()', 'error_test.module', 'Undefined variable: bananas');
+ $this->assertError($this->collectedErrors[1], 'Warning', 'Drupal\error_test_generate_warnings()', 'error_test.module', 'Division by zero');
+ $this->assertError($this->collectedErrors[2], 'User warning', 'Drupal\error_test_generate_warnings()', 'error_test.module', 'Drupal is awesome');
}
else {
// Give back the errors to the log report.
@@ -2192,7 +2194,7 @@ class CommonSimpleTestErrorCollectorTestCase extends DrupalWebTestCase {
function assertError($error, $group, $function, $file, $message = NULL) {
$this->assertEqual($error['group'], $group, t("Group was %group", array('%group' => $group)));
$this->assertEqual($error['caller']['function'], $function, t("Function was %function", array('%function' => $function)));
- $this->assertEqual(drupal_basename($error['caller']['file']), $file, t("File was %file", array('%file' => $file)));
+ $this->assertEqual(basename($error['caller']['file']), $file, t("File was %file", array('%file' => $file)));
if (isset($message)) {
$this->assertEqual($error['message'], $message, t("Message was %message", array('%message' => $message)));
}
@@ -2200,13 +2202,13 @@ class CommonSimpleTestErrorCollectorTestCase extends DrupalWebTestCase {
}
/**
- * Tests the drupal_parse_info_file() API function.
+ * Tests the parse_info_file() API function.
*/
-class CommonDrupalParseInfoFileTestCase extends DrupalWebTestCase {
+class CommonDrupalParseInfoFileTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Parsing .info files',
- 'description' => 'Tests the drupal_parse_info_file() API function.',
+ 'description' => 'Tests the parse_info_file() API function.',
'group' => 'Common',
);
}
@@ -2215,7 +2217,7 @@ class CommonDrupalParseInfoFileTestCase extends DrupalWebTestCase {
* Parse an example .info file an verify the results.
*/
function testParseInfoFile() {
- $info_values = drupal_parse_info_file(drupal_get_path('module', 'simpletest') . '/tests/common_test_info.txt');
+ $info_values = parse_info_file(get_path('module', 'simpletest') . '/tests/common_test_info.txt');
$this->assertEqual($info_values['simple_string'], 'A simple string', t('Simple string value was parsed correctly.'), t('System'));
$this->assertEqual($info_values['simple_constant'], WATCHDOG_INFO, t('Constant value was parsed correctly.'), t('System'));
$this->assertEqual($info_values['double_colon'], 'dummyClassName::', t('Value containing double-colon was parsed correctly.'), t('System'));
@@ -2223,9 +2225,9 @@ class CommonDrupalParseInfoFileTestCase extends DrupalWebTestCase {
}
/**
- * Tests scanning system directories in drupal_system_listing().
+ * Tests scanning system directories in system_listing().
*/
-class CommonDrupalSystemListingTestCase extends DrupalWebTestCase {
+class CommonDrupalSystemListingTestCase extends WebTestCase {
/**
* Use the testing profile; this is needed for testDirectoryPrecedence().
*/
@@ -2234,7 +2236,7 @@ class CommonDrupalSystemListingTestCase extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'Drupal system listing',
- 'description' => 'Tests scanning system directories in drupal_system_listing().',
+ 'description' => 'Tests scanning system directories in system_listing().',
'group' => 'Common',
);
}
@@ -2267,13 +2269,13 @@ class CommonDrupalSystemListingTestCase extends DrupalWebTestCase {
foreach ($expected_directories as $module => $directories) {
foreach ($directories as $directory) {
$filename = "$directory/$module/$module.module";
- $this->assertTrue(file_exists(DRUPAL_ROOT . '/' . $filename), t('@filename exists.', array('@filename' => $filename)));
+ $this->assertTrue(file_exists(ROOT . '/' . $filename), t('@filename exists.', array('@filename' => $filename)));
}
}
// Now scan the directories and check that the files take precedence as
// expected.
- $files = drupal_system_listing('/\.module$/', 'modules', 'name', 1);
+ $files = system_listing('/\.module$/', 'modules', 'name', 1);
foreach ($expected_directories as $module => $directories) {
$expected_directory = array_shift($directories);
$expected_filename = "$expected_directory/$module/$module.module";
@@ -2285,7 +2287,7 @@ class CommonDrupalSystemListingTestCase extends DrupalWebTestCase {
/**
* Tests the format_date() function.
*/
-class CommonFormatDateTestCase extends DrupalWebTestCase {
+class CommonFormatDateTestCase extends WebTestCase {
/**
* Arbitrary langcode for a custom language.
@@ -2375,14 +2377,14 @@ class CommonFormatDateTestCase extends DrupalWebTestCase {
$this->drupalPost('user/' . $test_user->uid . '/edit', $edit, t('Save'));
// Disable session saving as we are about to modify the global $user.
- drupal_save_session(FALSE);
+ save_session(FALSE);
// Save the original user and language and then replace it with the test user and language.
$real_user = $user;
$user = user_load($test_user->uid, TRUE);
$real_language = $language->langcode;
$language->langcode = $user->language;
// Simulate a Drupal bootstrap with the logged-in user.
- date_default_timezone_set(drupal_get_user_timezone());
+ date_default_timezone_set(get_user_timezone());
$this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', t('Test a different language.'));
$this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Monday, 26-Mar-07 01:00:00 BST', t('Test a different time zone.'));
@@ -2396,37 +2398,37 @@ class CommonFormatDateTestCase extends DrupalWebTestCase {
$user = $real_user;
$language->langcode = $real_language;
// Restore default time zone.
- date_default_timezone_set(drupal_get_user_timezone());
- drupal_save_session(TRUE);
+ date_default_timezone_set(get_user_timezone());
+ save_session(TRUE);
}
}
/**
- * Tests the drupal_attributes() functionality.
+ * Tests the attributes() functionality.
*/
-class CommonDrupalAttributesUnitTestCase extends DrupalUnitTestCase {
+class CommonDrupalAttributesUnitTestCase extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'HTML Attributes',
- 'description' => 'Tests the drupal_attributes() functionality.',
+ 'description' => 'Tests the attributes() functionality.',
'group' => 'Common',
);
}
/**
- * Tests that drupal_html_class() cleans the class name properly.
+ * Tests that html_class() cleans the class name properly.
*/
function testDrupalAttributes() {
// Verify that special characters are HTML encoded.
- $this->assertIdentical(drupal_attributes(array('title' => '&"\'<>')), ' title="&"'<>"', t('HTML encode attribute values.'));
+ $this->assertIdentical(attributes(array('title' => '&"\'<>')), ' title="&"'<>"', t('HTML encode attribute values.'));
// Verify multi-value attributes are concatenated with spaces.
$attributes = array('class' => array('first', 'last'));
- $this->assertIdentical(drupal_attributes(array('class' => array('first', 'last'))), ' class="first last"', t('Concatenate multi-value attributes.'));
+ $this->assertIdentical(attributes(array('class' => array('first', 'last'))), ' class="first last"', t('Concatenate multi-value attributes.'));
// Verify empty attribute values are rendered.
- $this->assertIdentical(drupal_attributes(array('alt' => '')), ' alt=""', t('Empty attribute value #1.'));
- $this->assertIdentical(drupal_attributes(array('alt' => NULL)), ' alt=""', t('Empty attribute value #2.'));
+ $this->assertIdentical(attributes(array('alt' => '')), ' alt=""', t('Empty attribute value #1.'));
+ $this->assertIdentical(attributes(array('alt' => NULL)), ' alt=""', t('Empty attribute value #2.'));
// Verify multiple attributes are rendered.
$attributes = array(
@@ -2434,17 +2436,17 @@ class CommonDrupalAttributesUnitTestCase extends DrupalUnitTestCase {
'class' => array('first', 'last'),
'alt' => 'Alternate',
);
- $this->assertIdentical(drupal_attributes($attributes), ' id="id-test" class="first last" alt="Alternate"', t('Multiple attributes.'));
+ $this->assertIdentical(attributes($attributes), ' id="id-test" class="first last" alt="Alternate"', t('Multiple attributes.'));
// Verify empty attributes array is rendered.
- $this->assertIdentical(drupal_attributes(array()), '', t('Empty attributes array.'));
+ $this->assertIdentical(attributes(array()), '', t('Empty attributes array.'));
}
}
/**
* Tests the various drupal_array_* helper functions.
*/
-class CommonDrupalArrayUnitTest extends DrupalUnitTestCase {
+class CommonDrupalArrayUnitTest extends UnitTestCase {
/**
* Form array to check.
@@ -2481,26 +2483,26 @@ class CommonDrupalArrayUnitTest extends DrupalUnitTestCase {
*/
function testGet() {
// Verify getting a value of a nested element.
- $value = drupal_array_get_nested_value($this->form, $this->parents);
+ $value = array_get_nested_value($this->form, $this->parents);
$this->assertEqual($value['#value'], 'Nested element', 'Nested element value found.');
// Verify changing a value of a nested element by reference.
- $value = &drupal_array_get_nested_value($this->form, $this->parents);
+ $value = &array_get_nested_value($this->form, $this->parents);
$value['#value'] = 'New value';
- $value = drupal_array_get_nested_value($this->form, $this->parents);
+ $value = array_get_nested_value($this->form, $this->parents);
$this->assertEqual($value['#value'], 'New value', 'Nested element value was changed by reference.');
$this->assertEqual($this->form['fieldset']['element']['#value'], 'New value', 'Nested element value was changed by reference.');
// Verify that an existing key is reported back.
$key_exists = NULL;
- drupal_array_get_nested_value($this->form, $this->parents, $key_exists);
+ array_get_nested_value($this->form, $this->parents, $key_exists);
$this->assertIdentical($key_exists, TRUE, 'Existing key found.');
// Verify that a non-existing key is reported back and throws no errors.
$key_exists = NULL;
$parents = $this->parents;
$parents[] = 'foo';
- drupal_array_get_nested_value($this->form, $parents, $key_exists);
+ array_get_nested_value($this->form, $parents, $key_exists);
$this->assertIdentical($key_exists, FALSE, 'Non-existing key not found.');
}
@@ -2514,7 +2516,7 @@ class CommonDrupalArrayUnitTest extends DrupalUnitTestCase {
);
// Verify setting the value of a nested element.
- drupal_array_set_nested_value($this->form, $this->parents, $new_value);
+ array_set_nested_value($this->form, $this->parents, $new_value);
$this->assertEqual($this->form['fieldset']['element']['#value'], 'New value', 'Changed nested element value found.');
$this->assertIdentical($this->form['fieldset']['element']['#required'], TRUE, 'New nested element value found.');
}
@@ -2528,13 +2530,13 @@ class CommonDrupalArrayUnitTest extends DrupalUnitTestCase {
$key_existed = NULL;
$parents = $this->parents;
$parents[] = 'foo';
- drupal_array_unset_nested_value($this->form, $parents, $key_existed);
+ array_unset_nested_value($this->form, $parents, $key_existed);
$this->assertTrue(isset($this->form['fieldset']['element']['#value']), 'Outermost nested element key still exists.');
$this->assertIdentical($key_existed, FALSE, 'Non-existing key not found.');
// Verify unsetting a nested element.
$key_existed = NULL;
- drupal_array_unset_nested_value($this->form, $this->parents, $key_existed);
+ array_unset_nested_value($this->form, $this->parents, $key_existed);
$this->assertFalse(isset($this->form['fieldset']['element']), 'Removed nested element not found.');
$this->assertIdentical($key_existed, TRUE, 'Existing key was found.');
}
@@ -2544,19 +2546,19 @@ class CommonDrupalArrayUnitTest extends DrupalUnitTestCase {
*/
function testKeyExists() {
// Verify that existing key is found.
- $this->assertIdentical(drupal_array_nested_key_exists($this->form, $this->parents), TRUE, 'Nested key found.');
+ $this->assertIdentical(array_nested_key_exists($this->form, $this->parents), TRUE, 'Nested key found.');
// Verify that non-existing keys are not found.
$parents = $this->parents;
$parents[] = 'foo';
- $this->assertIdentical(drupal_array_nested_key_exists($this->form, $parents), FALSE, 'Non-existing nested key not found.');
+ $this->assertIdentical(array_nested_key_exists($this->form, $parents), FALSE, 'Non-existing nested key not found.');
}
}
/**
* Tests the drupal_json_encode() and drupal_json_decode() functions.
*/
-class CommonJSONUnitTestCase extends DrupalUnitTestCase {
+class CommonJSONUnitTestCase extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'JSON',
@@ -2618,19 +2620,19 @@ class CommonJSONUnitTestCase extends DrupalUnitTestCase {
}
/**
- * Basic tests for drupal_add_feed().
+ * Basic tests for add_feed().
*/
-class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
+class CommonAddFeedTestCase extends WebTestCase {
public static function getInfo() {
return array(
- 'name' => 'drupal_add_feed() tests',
- 'description' => 'Make sure that drupal_add_feed() works correctly with various constructs.',
+ 'name' => 'add_feed() tests',
+ 'description' => 'Make sure that add_feed() works correctly with various constructs.',
'group' => 'Common',
);
}
/**
- * Test drupal_add_feed() with paths, URLs, and titles.
+ * Test add_feed() with paths, URLs, and titles.
*/
function testBasicFeedAddNoTitle() {
$path = $this->randomName(12);
@@ -2641,10 +2643,10 @@ class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
$external_for_title = 'http://' . $this->randomName(12) . '/' . $this->randomName(12);
$fully_qualified_for_title = url($this->randomName(12), array('absolute' => TRUE));
- // Possible permutations of drupal_add_feed() to test.
- // - 'input_url': the path passed to drupal_add_feed(),
+ // Possible permutations of add_feed() to test.
+ // - 'input_url': the path passed to add_feed(),
// - 'output_url': the expected URL to be found in the header.
- // - 'title' == the title of the feed as passed into drupal_add_feed().
+ // - 'title' == the title of the feed as passed into add_feed().
$urls = array(
'path without title' => array(
'input_url' => $path,
@@ -2679,10 +2681,10 @@ class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
);
foreach ($urls as $description => $feed_info) {
- drupal_add_feed($feed_info['input_url'], $feed_info['title']);
+ add_feed($feed_info['input_url'], $feed_info['title']);
}
- $this->drupalSetContent(drupal_get_html_head());
+ $this->drupalSetContent(get_html_head());
foreach ($urls as $description => $feed_info) {
$this->assertPattern($this->urlToRSSLinkPattern($feed_info['output_url'], $feed_info['title']), t('Found correct feed header for %description', array('%description' => $description)));
}
diff --git a/core/modules/simpletest/tests/common_test.module b/core/modules/simpletest/tests/common_test.module
index e1cfdf2..961b9d5 100644
--- a/core/modules/simpletest/tests/common_test.module
+++ b/core/modules/simpletest/tests/common_test.module
@@ -1,4 +1,6 @@
'Drupal Goto',
- 'page callback' => 'common_test_drupal_goto_land',
+ $items['common-test/redirect'] = array(
+ 'title' => 'Drupal Redirect',
+ 'page callback' => 'common_test_redirect_land',
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
- $items['common-test/drupal_goto/fail'] = array(
- 'title' => 'Drupal Goto',
- 'page callback' => 'common_test_drupal_goto_land_fail',
+ $items['common-test/redirect/fail'] = array(
+ 'title' => 'Drupal Redirect',
+ 'page callback' => 'common_test_redirect_land_fail',
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
- $items['common-test/drupal_goto/redirect'] = array(
- 'title' => 'Drupal Goto',
- 'page callback' => 'common_test_drupal_goto_redirect',
+ $items['common-test/redirect/redirect'] = array(
+ 'title' => 'Drupal Redirect',
+ 'page callback' => 'common_test_redirect_redirect',
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
- $items['common-test/drupal_goto/redirect_advanced'] = array(
- 'title' => 'Drupal Goto',
- 'page callback' => 'common_test_drupal_goto_redirect_advanced',
+ $items['common-test/redirect/redirect_advanced'] = array(
+ 'title' => 'Drupal Redirect',
+ 'page callback' => 'common_test_redirect_redirect_advanced',
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
- $items['common-test/drupal_goto/redirect_fail'] = array(
- 'title' => 'Drupal Goto Failure',
- 'page callback' => 'drupal_goto',
- 'page arguments' => array('common-test/drupal_goto/fail'),
+ $items['common-test/redirect/redirect_fail'] = array(
+ 'title' => 'Drupal Redirect Failure',
+ 'page callback' => 'redirect',
+ 'page arguments' => array('common-test/redirect/fail'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
@@ -62,39 +64,39 @@ function common_test_menu() {
}
/**
- * Redirect using drupal_goto().
+ * Redirect using redirect().
*/
-function common_test_drupal_goto_redirect() {
- drupal_goto('common-test/drupal_goto');
+function common_test_redirect_redirect() {
+ redirect('common-test/redirect');
}
/**
- * Redirect using drupal_goto().
+ * Redirect using redirect().
*/
-function common_test_drupal_goto_redirect_advanced() {
- drupal_goto('common-test/drupal_goto', array('query' => array('foo' => '123')), 301);
+function common_test_redirect_redirect_advanced() {
+ redirect('common-test/redirect', array('query' => array('foo' => '123')), 301);
}
/**
- * Landing page for drupal_goto().
+ * Landing page for redirect().
*/
-function common_test_drupal_goto_land() {
- print "drupal_goto";
+function common_test_redirect_land() {
+ print "redirect";
}
/**
- * Fail landing page for drupal_goto().
+ * Fail landing page for redirect().
*/
-function common_test_drupal_goto_land_fail() {
- print "drupal_goto_fail";
+function common_test_redirect_land_fail() {
+ print "redirect_fail";
}
/**
- * Implements hook_drupal_goto_alter().
+ * Implements hook_redirect_alter().
*/
-function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code) {
- if ($path == 'common-test/drupal_goto/fail') {
- $path = 'common-test/drupal_goto/redirect';
+function common_test_redirect_alter(&$path, &$options, &$http_response_code) {
+ if ($path == 'common-test/redirect/fail') {
+ $path = 'common-test/redirect/redirect';
}
}
@@ -102,7 +104,7 @@ function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code)
* Print destination query parameter.
*/
function common_test_destination() {
- $destination = drupal_get_destination();
+ $destination = get_destination();
print "The destination: " . check_plain($destination['destination']);
}
@@ -125,7 +127,7 @@ function common_test_drupal_render_invalid_keys() {
/**
* Implements hook_TYPE_alter().
*/
-function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
+function common_test_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
// Alter first argument.
if (is_array($data)) {
$data['foo'] = 'Drupal';
@@ -156,10 +158,10 @@ function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
/**
* Implements hook_TYPE_alter() on behalf of Bartik theme.
*
- * Same as common_test_drupal_alter_alter(), but here, we verify that themes
+ * Same as common_test_alter_alter(), but here, we verify that themes
* can also alter and come last.
*/
-function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
+function bartik_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
// Alter first argument.
if (is_array($data)) {
$data['foo'] .= ' theme';
@@ -190,25 +192,25 @@ function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
/**
* Implements hook_TYPE_alter() on behalf of block module.
*
- * This is for verifying that drupal_alter(array(TYPE1, TYPE2), ...) allows
+ * This is for verifying that alter(array(TYPE1, TYPE2), ...) allows
* hook_module_implements_alter() to affect the order in which module
* implementations are executed.
*/
-function block_drupal_alter_foo_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
+function block_alter_foo_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
$data['foo'] .= ' block';
}
/**
* Implements hook_module_implements_alter().
*
- * @see block_drupal_alter_foo_alter()
+ * @see block_alter_foo_alter()
*/
function common_test_module_implements_alter(&$implementations, $hook) {
- // For drupal_alter(array('drupal_alter', 'drupal_alter_foo'), ...), make the
+ // For alter(array('alter', 'alter_foo'), ...), make the
// block module implementations run after all the other modules. Note that
- // when drupal_alter() is called with an array of types, the first type is
+ // when alter() is called with an array of types, the first type is
// considered primary and controls the module order.
- if ($hook == 'drupal_alter_alter' && isset($implementations['block'])) {
+ if ($hook == 'alter_alter' && isset($implementations['block'])) {
$group = $implementations['block'];
unset($implementations['block']);
$implementations['block'] = $group;
@@ -269,10 +271,10 @@ function common_test_library_info() {
* Adds a JavaScript file and a CSS file with a query string appended.
*/
function common_test_js_and_css_querystring() {
- drupal_add_js(drupal_get_path('module', 'node') . '/node.js');
- drupal_add_css(drupal_get_path('module', 'node') . '/node.css');
+ add_js(get_path('module', 'node') . '/node.js');
+ add_css(get_path('module', 'node') . '/node.css');
// A relative URI may have a query string.
- drupal_add_css('/' . drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2');
+ add_css('/' . get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2');
return '';
}
diff --git a/core/modules/simpletest/tests/common_test_cron_helper.module b/core/modules/simpletest/tests/common_test_cron_helper.module
index 94a2b2c..b813ab8 100644
--- a/core/modules/simpletest/tests/common_test_cron_helper.module
+++ b/core/modules/simpletest/tests/common_test_cron_helper.module
@@ -1,4 +1,6 @@
TRUE,
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('database_test_theme_tablesort'),
);
return $items;
@@ -82,7 +83,7 @@ function database_test_menu() {
*/
function database_test_db_query_temporary() {
$table_name = db_query_temporary('SELECT status FROM {system}', array());
- drupal_json_output(array(
+ json_output(array(
'table_name' => $table_name,
'row_count' => db_select($table_name)->countQuery()->execute()->fetchField(),
));
@@ -107,7 +108,7 @@ function database_test_even_pager_query($limit) {
$names = $query->execute()->fetchCol();
- drupal_json_output(array(
+ json_output(array(
'names' => $names,
));
exit;
@@ -131,7 +132,7 @@ function database_test_odd_pager_query($limit) {
$names = $query->execute()->fetchCol();
- drupal_json_output(array(
+ json_output(array(
'names' => $names,
));
exit;
@@ -160,7 +161,7 @@ function database_test_tablesort() {
// We need all the results at once to check the sort.
$tasks = $query->execute()->fetchAll();
- drupal_json_output(array(
+ json_output(array(
'tasks' => $tasks,
));
exit;
@@ -189,7 +190,7 @@ function database_test_tablesort_first() {
// We need all the results at once to check the sort.
$tasks = $query->execute()->fetchAll();
- drupal_json_output(array(
+ json_output(array(
'tasks' => $tasks,
));
exit;
diff --git a/core/modules/simpletest/tests/database_test.test b/core/modules/simpletest/tests/database_test.test
index 16c09c6..8c893a7 100644
--- a/core/modules/simpletest/tests/database_test.test
+++ b/core/modules/simpletest/tests/database_test.test
@@ -1,4 +1,6 @@
installTables($schema);
@@ -61,7 +63,7 @@ class DatabaseTestCase extends DrupalWebTestCase {
* Set up tables for NULL handling.
*/
function ensureSampleDataNull() {
- $schema['test_null'] = drupal_get_schema('test_null');
+ $schema['test_null'] = get_schema('test_null');
$this->installTables($schema);
db_insert('test_null')
@@ -355,7 +357,7 @@ class DatabaseFetchTestCase extends DatabaseTestCase {
*/
function testQueryFetchClass() {
$records = array();
- $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => 'FakeRecord'));
+ $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => 'Drupal\FakeRecord'));
foreach ($result as $record) {
$records[] = $record;
if ($this->assertTrue($record instanceof FakeRecord, t('Record is an object of class FakeRecord.'))) {
@@ -652,7 +654,7 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
$query = db_insert('test')->useDefaults(array('job'));
$id = $query->execute();
- $schema = drupal_get_schema('test');
+ $schema = get_schema('test');
$job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
$this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
@@ -685,7 +687,7 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
->useDefaults(array('job'));
$id = $query->execute();
- $schema = drupal_get_schema('test');
+ $schema = get_schema('test');
$job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
$this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
@@ -2950,7 +2952,7 @@ class DatabaseSerializeQueryTestCase extends DatabaseTestCase {
/**
* Range query tests.
*/
-class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
+class DatabaseRangeQueryTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Range query test',
@@ -2981,7 +2983,7 @@ class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
/**
* Temporary query tests.
*/
-class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
+class DatabaseTemporaryQueryTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Temporary query test',
@@ -3706,7 +3708,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
/**
* Check the sequences API.
*/
-class DatabaseNextIdCase extends DrupalWebTestCase {
+class DatabaseNextIdCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => t('Sequences API'),
@@ -3733,7 +3735,7 @@ class DatabaseNextIdCase extends DrupalWebTestCase {
/**
* Tests the empty pseudo-statement class.
*/
-class DatabaseEmptyStatementTestCase extends DrupalWebTestCase {
+class DatabaseEmptyStatementTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => t('Empty statement'),
diff --git a/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module b/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module
index b3d9bbc..66bf2d1 100644
--- a/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module
+++ b/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module
@@ -1 +1,2 @@
'Drupal error handlers',
@@ -23,19 +25,19 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
$error_notice = array(
'%type' => 'Notice',
'!message' => 'Undefined variable: bananas',
- '%function' => 'error_test_generate_warnings()',
+ '%function' => 'Drupal\error_test_generate_warnings()',
'%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'),
);
$error_warning = array(
'%type' => 'Warning',
'!message' => 'Division by zero',
- '%function' => 'error_test_generate_warnings()',
+ '%function' => 'Drupal\error_test_generate_warnings()',
'%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'),
);
$error_user_notice = array(
'%type' => 'User warning',
'!message' => 'Drupal is awesome',
- '%function' => 'error_test_generate_warnings()',
+ '%function' => 'Drupal\error_test_generate_warnings()',
'%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'),
);
@@ -71,14 +73,14 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
$error_exception = array(
'%type' => 'Exception',
'!message' => 'Drupal is awesome',
- '%function' => 'error_test_trigger_exception()',
+ '%function' => 'Drupal\error_test_trigger_exception()',
'%line' => 57,
'%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'),
);
$error_pdo_exception = array(
'%type' => 'PDOException',
'!message' => 'SELECT * FROM bananas_are_awesome',
- '%function' => 'error_test_trigger_pdo_exception()',
+ '%function' => 'Drupal\error_test_trigger_pdo_exception()',
'%line' => 65,
'%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'),
);
diff --git a/core/modules/simpletest/tests/error_test.module b/core/modules/simpletest/tests/error_test.module
index d062cb0..c2379ee 100644
--- a/core/modules/simpletest/tests/error_test.module
+++ b/core/modules/simpletest/tests/error_test.module
@@ -1,4 +1,6 @@
uri = $filepath;
- $file->filename = drupal_basename($file->uri);
+ $file->filename = basename($file->uri);
$file->filemime = 'text/plain';
$file->uid = 1;
$file->timestamp = REQUEST_TIME;
@@ -224,7 +226,7 @@ class FileTestCase extends DrupalWebTestCase {
$file->status = 0;
// Write the record directly rather than calling file_save() so we don't
// invoke the hooks.
- $this->assertNotIdentical(drupal_write_record('file_managed', $file), FALSE, t('The file was added to the database.'), 'Create test file');
+ $this->assertNotIdentical(write_record('file_managed', $file), FALSE, t('The file was added to the database.'), 'Create test file');
return $file;
}
@@ -319,19 +321,19 @@ class FileSpaceUsedTest extends FileTestCase {
// Create records for a couple of users with different sizes.
$file = array('uid' => 2, 'uri' => 'public://example1.txt', 'filesize' => 50, 'status' => FILE_STATUS_PERMANENT);
- drupal_write_record('file_managed', $file);
+ write_record('file_managed', $file);
$file = array('uid' => 2, 'uri' => 'public://example2.txt', 'filesize' => 20, 'status' => FILE_STATUS_PERMANENT);
- drupal_write_record('file_managed', $file);
+ write_record('file_managed', $file);
$file = array('uid' => 3, 'uri' => 'public://example3.txt', 'filesize' => 100, 'status' => FILE_STATUS_PERMANENT);
- drupal_write_record('file_managed', $file);
+ write_record('file_managed', $file);
$file = array('uid' => 3, 'uri' => 'public://example4.txt', 'filesize' => 200, 'status' => FILE_STATUS_PERMANENT);
- drupal_write_record('file_managed', $file);
+ write_record('file_managed', $file);
// Now create some non-permanent files.
$file = array('uid' => 2, 'uri' => 'public://example5.txt', 'filesize' => 1, 'status' => 0);
- drupal_write_record('file_managed', $file);
+ write_record('file_managed', $file);
$file = array('uid' => 3, 'uri' => 'public://example6.txt', 'filesize' => 3, 'status' => 0);
- drupal_write_record('file_managed', $file);
+ write_record('file_managed', $file);
}
/**
@@ -360,7 +362,7 @@ class FileSpaceUsedTest extends FileTestCase {
/**
* This will run tests against the file validation functions (file_validate_*).
*/
-class FileValidatorTest extends DrupalWebTestCase {
+class FileValidatorTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'File validator tests',
@@ -374,11 +376,11 @@ class FileValidatorTest extends DrupalWebTestCase {
$this->image = new stdClass();
$this->image->uri = 'core/misc/druplicon.png';
- $this->image->filename = drupal_basename($this->image->uri);
+ $this->image->filename = basename($this->image->uri);
$this->non_image = new stdClass();
$this->non_image->uri = 'core/misc/jquery.js';
- $this->non_image->filename = drupal_basename($this->non_image->uri);
+ $this->non_image->filename = basename($this->non_image->uri);
}
/**
@@ -482,7 +484,7 @@ class FileValidatorTest extends DrupalWebTestCase {
function testFileValidateSize() {
global $user;
$original_user = $user;
- drupal_save_session(FALSE);
+ save_session(FALSE);
// Run these test as uid = 1.
$user = user_load(1);
@@ -508,7 +510,7 @@ class FileValidatorTest extends DrupalWebTestCase {
$this->assertEqual(count($errors), 2, t('Errors for both the file and their limit.'), 'File');
$user = $original_user;
- drupal_save_session(TRUE);
+ save_session(TRUE);
}
}
@@ -541,7 +543,7 @@ class FileUnmanagedSaveDataTest extends FileTestCase {
// Provide a filename.
$filepath = file_unmanaged_save_data($contents, 'public://asdf.txt', FILE_EXISTS_REPLACE);
$this->assertTrue($filepath, t('Unnamed file saved correctly.'));
- $this->assertEqual('asdf.txt', drupal_basename($filepath), t('File was named correctly.'));
+ $this->assertEqual('asdf.txt', basename($filepath), t('File was named correctly.'));
$this->assertEqual($contents, file_get_contents($filepath), t('Contents of the file are correct.'));
$this->assertFilePermissions($filepath, variable_get('file_chmod_file', 0664));
}
@@ -668,7 +670,7 @@ class FileSaveUploadTest extends FileHookTestCase {
$this->drupalPost('file-test/upload', $edit, t('Submit'));
$this->assertResponse(200, t('Received a 200 response for posted test file.'));
$this->assertRaw(t('You WIN!'));
- $this->assertTrue(is_file('temporary://' . $dir . '/' . trim(drupal_basename($image3_realpath))));
+ $this->assertTrue(is_file('temporary://' . $dir . '/' . trim(basename($image3_realpath))));
// Check that file_load_multiple() with no arguments returns FALSE.
$this->assertFalse(file_load_multiple(), t('No files were loaded.'));
@@ -1052,7 +1054,7 @@ class FileScanDirectoryTest extends FileTestCase {
function setUp() {
parent::setUp();
- $this->path = drupal_get_path('module', 'simpletest') . '/files';
+ $this->path = get_path('module', 'simpletest') . '/files';
}
/**
@@ -1146,10 +1148,10 @@ class FileScanDirectoryTest extends FileTestCase {
* Check that the recurse option decends into subdirectories.
*/
function testOptionRecurse() {
- $files = file_scan_directory(drupal_get_path('module', 'simpletest'), '/^javascript-/', array('recurse' => FALSE));
+ $files = file_scan_directory(get_path('module', 'simpletest'), '/^javascript-/', array('recurse' => FALSE));
$this->assertTrue(empty($files), t("Without recursion couldn't find javascript files."));
- $files = file_scan_directory(drupal_get_path('module', 'simpletest'), '/^javascript-/', array('recurse' => TRUE));
+ $files = file_scan_directory(get_path('module', 'simpletest'), '/^javascript-/', array('recurse' => TRUE));
$this->assertEqual(2, count($files), t('With recursion we found the expected javascript files.'));
}
@@ -2204,7 +2206,7 @@ class FileSaveDataTest extends FileHookTestCase {
$this->assertTrue($result, t('Unnamed file saved correctly.'));
$this->assertEqual(file_default_scheme(), file_uri_scheme($result->uri), t("File was placed in Drupal's files directory."));
- $this->assertEqual($result->filename, drupal_basename($result->uri), t("Filename was set to the file's basename."));
+ $this->assertEqual($result->filename, basename($result->uri), t("Filename was set to the file's basename."));
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of the file are correct.'));
$this->assertEqual($result->filemime, 'application/octet-stream', t('A MIME type was set.'));
$this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
@@ -2229,7 +2231,7 @@ class FileSaveDataTest extends FileHookTestCase {
$this->assertTrue($result, t('Unnamed file saved correctly.'));
$this->assertEqual('public', file_uri_scheme($result->uri), t("File was placed in Drupal's files directory."));
- $this->assertEqual($filename, drupal_basename($result->uri), t('File was named correctly.'));
+ $this->assertEqual($filename, basename($result->uri), t('File was named correctly.'));
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of the file are correct.'));
$this->assertEqual($result->filemime, 'text/plain', t('A MIME type was set.'));
$this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
@@ -2560,7 +2562,7 @@ class FileNameMungingTest extends FileTestCase {
// Disable insecure uploads.
variable_set('allow_insecure_uploads', 0);
$munged_name = file_munge_filename($this->name, '', TRUE);
- $messages = drupal_get_messages();
+ $messages = get_messages();
$this->assertTrue(in_array(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $munged_name)), $messages['status']), t('Alert properly set when a file is renamed.'));
$this->assertNotEqual($munged_name, $this->name, t('The new filename (%munged) has been modified from the original (%original)', array('%munged' => $munged_name, '%original' => $this->name)));
}
@@ -2597,7 +2599,7 @@ class FileNameMungingTest extends FileTestCase {
/**
* Tests for file_get_mimetype().
*/
-class FileMimeTypeTest extends DrupalWebTestCase {
+class FileMimeTypeTest extends WebTestCase {
function setUp() {
parent::setUp('file_test');
}
@@ -2682,10 +2684,10 @@ class FileMimeTypeTest extends DrupalWebTestCase {
/**
* Tests stream wrapper functions.
*/
-class StreamWrapperTest extends DrupalWebTestCase {
+class StreamWrapperTest extends WebTestCase {
protected $scheme = 'dummy';
- protected $classname = 'DrupalDummyStreamWrapper';
+ protected $classname = 'Drupal\DummyStreamWrapper';
public static function getInfo() {
return array(
@@ -2697,7 +2699,7 @@ class StreamWrapperTest extends DrupalWebTestCase {
function setUp() {
parent::setUp('file_test');
- drupal_static_reset('file_get_stream_wrappers');
+ drupal_static_reset('Drupal\file_get_stream_wrappers');
}
function tearDown() {
@@ -2712,7 +2714,7 @@ class StreamWrapperTest extends DrupalWebTestCase {
// Check the dummy scheme.
$this->assertEqual($this->classname, file_stream_wrapper_get_class($this->scheme), t('Got correct class name for dummy scheme.'));
// Check core's scheme.
- $this->assertEqual('DrupalPublicStreamWrapper', file_stream_wrapper_get_class('public'), t('Got correct class name for public scheme.'));
+ $this->assertEqual('Drupal\PublicStreamWrapper', file_stream_wrapper_get_class('public'), t('Got correct class name for public scheme.'));
}
/**
@@ -2723,7 +2725,7 @@ class StreamWrapperTest extends DrupalWebTestCase {
$this->assertEqual($this->classname, get_class($instance), t('Got correct class type for dummy scheme.'));
$instance = file_stream_wrapper_get_instance_by_scheme('public');
- $this->assertEqual('DrupalPublicStreamWrapper', get_class($instance), t('Got correct class type for public scheme.'));
+ $this->assertEqual('Drupal\PublicStreamWrapper', get_class($instance), t('Got correct class type for public scheme.'));
}
/**
@@ -2734,13 +2736,13 @@ class StreamWrapperTest extends DrupalWebTestCase {
$this->assertEqual($this->classname, get_class($instance), t('Got correct class type for dummy URI.'));
$instance = file_stream_wrapper_get_instance_by_uri('public://foo');
- $this->assertEqual('DrupalPublicStreamWrapper', get_class($instance), t('Got correct class type for public URI.'));
+ $this->assertEqual('Drupal\PublicStreamWrapper', get_class($instance), t('Got correct class type for public URI.'));
// Test file_uri_target().
$this->assertEqual(file_uri_target('public://foo/bar.txt'), 'foo/bar.txt', t('Got a valid stream target from public://foo/bar.txt.'));
$this->assertFalse(file_uri_target('foo/bar.txt'), t('foo/bar.txt is not a valid stream.'));
- // Test file_build_uri() and DrupalLocalStreamWrapper::getDirectoryPath().
+ // Test file_build_uri() and LocalStreamWrapper::getDirectoryPath().
$this->assertEqual(file_build_uri('foo/bar.txt'), 'public://foo/bar.txt', t('Expected scheme was added.'));
$this->assertEqual(file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath(), variable_get('file_public_path'), t('Expected default directory path was returned.'));
$this->assertEqual(file_stream_wrapper_get_instance_by_scheme('temporary')->getDirectoryPath(), variable_get('file_temporary_path'), t('Expected temporary directory path was returned.'));
diff --git a/core/modules/simpletest/tests/file_test.module b/core/modules/simpletest/tests/file_test.module
index 6fcda95..6e0c63d 100644
--- a/core/modules/simpletest/tests/file_test.module
+++ b/core/modules/simpletest/tests/file_test.module
@@ -1,4 +1,5 @@
'Upload test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_file_test_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -34,12 +35,12 @@ function file_test_stream_wrappers() {
return array(
'dummy' => array(
'name' => t('Dummy files'),
- 'class' => 'DrupalDummyStreamWrapper',
+ 'class' => 'DummyStreamWrapper',
'description' => t('Dummy wrapper for simpletest.'),
),
'dummy-remote' => array(
'name' => t('Dummy files (remote)'),
- 'class' => 'DrupalDummyRemoteStreamWrapper',
+ 'class' => 'DummyRemoteStreamWrapper',
'description' => t('Dummy wrapper for simpletest (remote).'),
),
);
@@ -124,13 +125,13 @@ function _file_test_form_submit(&$form, &$form_state) {
$file = file_save_upload('file_test_upload', $validators, $destination, $form_state['values']['file_test_replace']);
if ($file) {
$form_state['values']['file_test_upload'] = $file;
- drupal_set_message(t('File @filepath was uploaded.', array('@filepath' => $file->uri)));
- drupal_set_message(t('File name is @filename.', array('@filename' => $file->filename)));
- drupal_set_message(t('File MIME type is @mimetype.', array('@mimetype' => $file->filemime)));
- drupal_set_message(t('You WIN!'));
+ set_message(t('File @filepath was uploaded.', array('@filepath' => $file->uri)));
+ set_message(t('File name is @filename.', array('@filename' => $file->filename)));
+ set_message(t('File MIME type is @mimetype.', array('@mimetype' => $file->filemime)));
+ set_message(t('You WIN!'));
}
elseif ($file === FALSE) {
- drupal_set_message(t('Epic upload FAIL!'), 'error');
+ set_message(t('Epic upload FAIL!'), 'error');
}
}
@@ -423,7 +424,7 @@ function file_test_file_mimetype_mapping_alter(&$mapping) {
*
* Dummy stream wrapper implementation (dummy://).
*/
-class DrupalDummyStreamWrapper extends DrupalLocalStreamWrapper {
+class DummyStreamWrapper extends LocalStreamWrapper {
function getDirectoryPath() {
return variable_get('stream_public_path', 'sites/default/files');
}
@@ -454,7 +455,7 @@ class DrupalDummyStreamWrapper extends DrupalLocalStreamWrapper {
*
* Basically just the public scheme but not returning a local file for realpath.
*/
-class DrupalDummyRemoteStreamWrapper extends DrupalPublicStreamWrapper {
+class DummyRemoteStreamWrapper extends PublicStreamWrapper {
function realpath() {
return FALSE;
}
diff --git a/core/modules/simpletest/tests/filetransfer.test b/core/modules/simpletest/tests/filetransfer.test
index 905d23c..3a8feb3 100644
--- a/core/modules/simpletest/tests/filetransfer.test
+++ b/core/modules/simpletest/tests/filetransfer.test
@@ -1,7 +1,9 @@
testConnection = TestFileTransfer::factory(DRUPAL_ROOT, array('hostname' => $this->hostname, 'username' => $this->username, 'password' => $this->password, 'port' => $this->port));
+ $this->testConnection = TestFileTransfer::factory(ROOT, array('hostname' => $this->hostname, 'username' => $this->username, 'password' => $this->password, 'port' => $this->port));
}
function _getFakeModuleFiles() {
@@ -79,7 +81,7 @@ class FileTranferTest extends DrupalWebTestCase {
$gotit = TRUE;
try {
- $this->testConnection->copyDirectory($source, DRUPAL_ROOT . '/'. variable_get('file_public_path', conf_path() . '/files'));
+ $this->testConnection->copyDirectory($source, ROOT . '/'. variable_get('file_public_path', conf_path() . '/files'));
}
catch (FileTransferException $e) {
$gotit = FALSE;
diff --git a/core/modules/simpletest/tests/filter_test.module b/core/modules/simpletest/tests/filter_test.module
index 2cebc70..a675b53 100644
--- a/core/modules/simpletest/tests/filter_test.module
+++ b/core/modules/simpletest/tests/filter_test.module
@@ -1,4 +1,5 @@
'Form alter hooks',
@@ -492,7 +493,7 @@ class FormAlterTestCase extends DrupalWebTestCase {
/**
* Test form validation handlers.
*/
-class FormValidationTestCase extends DrupalWebTestCase {
+class FormValidationTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Form validation handlers',
@@ -589,7 +590,7 @@ class FormValidationTestCase extends DrupalWebTestCase {
/**
* Test form element labels, required markers and associated output.
*/
-class FormsElementsLabelsTestCase extends DrupalWebTestCase {
+class FormsElementsLabelsTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -670,7 +671,7 @@ class FormsElementsLabelsTestCase extends DrupalWebTestCase {
/**
* Test the tableselect form element for expected behavior.
*/
-class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase {
+class FormsElementsTableSelectFunctionalTest extends WebTestCase {
public static function getInfo() {
return array(
@@ -851,14 +852,14 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase {
$form_state['input'] = $edit;
$form_state['input']['form_id'] = $form_id;
- drupal_prepare_form($form_id, $form, $form_state);
+ prepare_form($form_id, $form, $form_state);
- drupal_process_form($form_id, $form, $form_state);
+ process_form($form_id, $form, $form_state);
$errors = form_get_errors();
// Clear errors and messages.
- drupal_get_messages();
+ get_messages();
form_clear_error();
// Return the processed form together with form_state and errors
@@ -871,7 +872,7 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase {
/**
* Test the vertical_tabs form element for expected behavior.
*/
-class FormsElementsVerticalTabsFunctionalTest extends DrupalWebTestCase {
+class FormsElementsVerticalTabsFunctionalTest extends WebTestCase {
public static function getInfo() {
return array(
@@ -907,7 +908,7 @@ class FormsElementsVerticalTabsFunctionalTest extends DrupalWebTestCase {
* when a validation error occurs, it makes sure that changed form element
* values aren't lost due to a wrong form rebuild.
*/
-class FormsFormStorageTestCase extends DrupalWebTestCase {
+class FormsFormStorageTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -1051,7 +1052,7 @@ class FormsFormStorageTestCase extends DrupalWebTestCase {
/**
* Test wrapper form callbacks.
*/
-class FormsFormWrapperTestCase extends DrupalWebTestCase {
+class FormsFormWrapperTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Form wrapper callback',
@@ -1077,7 +1078,7 @@ class FormsFormWrapperTestCase extends DrupalWebTestCase {
/**
* Test $form_state clearance.
*/
-class FormStateValuesCleanTestCase extends DrupalWebTestCase {
+class FormStateValuesCleanTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Form state values clearance',
@@ -1125,7 +1126,7 @@ class FormStateValuesCleanTestCase extends DrupalWebTestCase {
/**
* Tests $form_state clearance with form elements having buttons.
*/
-class FormStateValuesCleanAdvancedTestCase extends DrupalWebTestCase {
+class FormStateValuesCleanAdvancedTestCase extends WebTestCase {
/**
* An image file path for uploading.
*/
@@ -1172,11 +1173,11 @@ class FormStateValuesCleanAdvancedTestCase extends DrupalWebTestCase {
*
* @todo Add tests for other aspects of form rebuilding.
*/
-class FormsRebuildTestCase extends DrupalWebTestCase {
+class FormsRebuildTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Form rebuilding',
- 'description' => 'Tests functionality of drupal_rebuild_form().',
+ 'description' => 'Tests functionality of rebuild_form().',
'group' => 'Form API',
);
}
@@ -1264,7 +1265,7 @@ class FormsRebuildTestCase extends DrupalWebTestCase {
/**
* Test the programmatic form submission behavior.
*/
-class FormsProgrammaticTestCase extends DrupalWebTestCase {
+class FormsProgrammaticTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -1327,7 +1328,7 @@ class FormsProgrammaticTestCase extends DrupalWebTestCase {
private function submitForm($values, $valid_input) {
// Programmatically submit the given values.
$form_state = array('values' => $values);
- drupal_form_submit('form_test_programmatic_form', $form_state);
+ form_submit('form_test_programmatic_form', $form_state);
// Check that the form returns an error when expected, and vice versa.
$errors = form_get_errors();
@@ -1353,7 +1354,7 @@ class FormsProgrammaticTestCase extends DrupalWebTestCase {
/**
* Test that FAPI correctly determines $form_state['triggering_element'].
*/
-class FormsTriggeringElementTestCase extends DrupalWebTestCase {
+class FormsTriggeringElementTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -1451,7 +1452,7 @@ class FormsTriggeringElementTestCase extends DrupalWebTestCase {
/**
* Tests rebuilding of arbitrary forms by altering them.
*/
-class FormsArbitraryRebuildTestCase extends DrupalWebTestCase {
+class FormsArbitraryRebuildTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Rebuild arbitrary forms',
@@ -1517,7 +1518,7 @@ class FormsArbitraryRebuildTestCase extends DrupalWebTestCase {
/**
* Tests form API file inclusion.
*/
-class FormsFileInclusionTestCase extends DrupalWebTestCase {
+class FormsFileInclusionTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -1551,7 +1552,7 @@ class FormsFileInclusionTestCase extends DrupalWebTestCase {
/**
* Tests checkbox element.
*/
-class FormCheckboxTestCase extends DrupalWebTestCase {
+class FormCheckboxTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -1573,7 +1574,7 @@ class FormCheckboxTestCase extends DrupalWebTestCase {
// #return_value, with the exception of integer 0, which is not supported.
// @see form_process_checkbox().
foreach (array('0', '', 1, '1', 'foobar', '1foobar') as $return_value) {
- $form_array = drupal_get_form('form_test_checkbox_type_juggling', $default_value, $return_value);
+ $form_array = get_form('form_test_checkbox_type_juggling', $default_value, $return_value);
$form = drupal_render($form_array);
if ($default_value === TRUE) {
$checked = TRUE;
diff --git a/core/modules/simpletest/tests/form_test.file.inc b/core/modules/simpletest/tests/form_test.file.inc
index f9197ea..fceacfb 100644
--- a/core/modules/simpletest/tests/form_test.file.inc
+++ b/core/modules/simpletest/tests/form_test.file.inc
@@ -1,4 +1,5 @@
'
',
);
@@ -33,7 +34,7 @@ function form_test_load_include_menu($form, &$form_state) {
* Submit callback for the form API file inclusion test forms.
*/
function form_test_load_include_submit($form, $form_state) {
- drupal_set_message('Submit callback called.');
+ set_message('Submit callback called.');
}
/**
diff --git a/core/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/form_test.module
index e1e2435..0d6703a 100644
--- a/core/modules/simpletest/tests/form_test.module
+++ b/core/modules/simpletest/tests/form_test.module
@@ -1,4 +1,5 @@
'Form altering test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_alter_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
$items['form-test/validate'] = array(
'title' => 'Form validation handlers test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_validate_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
$items['form-test/limit-validation-errors'] = array(
'title' => 'Form validation with some error suppression',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_limit_validation_errors_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -33,28 +34,28 @@ function form_test_menu() {
$items['form_test/tableselect/multiple-true'] = array(
'title' => 'Tableselect checkboxes test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_tableselect_multiple_true_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
$items['form_test/tableselect/multiple-false'] = array(
'title' => 'Tableselect radio button test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_tableselect_multiple_false_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
$items['form_test/tableselect/empty-text'] = array(
'title' => 'Tableselect empty text test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_tableselect_empty_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
$items['form_test/tableselect/advanced-select'] = array(
'title' => 'Tableselect js_select tests',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_tableselect_js_select_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -62,7 +63,7 @@ function form_test_menu() {
$items['form_test/vertical-tabs'] = array(
'title' => 'Vertical tabs tests',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_vertical_tabs_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -70,7 +71,7 @@ function form_test_menu() {
$items['form_test/form-storage'] = array(
'title' => 'Form storage test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_storage_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -86,7 +87,7 @@ function form_test_menu() {
$items['form_test/form-state-values-clean'] = array(
'title' => 'Form state values clearance test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_form_state_values_clean_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -94,7 +95,7 @@ function form_test_menu() {
$items['form_test/form-state-values-clean-advanced'] = array(
'title' => 'Form state values clearance advanced test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_form_state_values_clean_advanced_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -102,33 +103,33 @@ function form_test_menu() {
$items['form-test/checkbox'] = array(
'title' => t('Form test'),
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_checkbox'),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
);
$items['form-test/select'] = array(
'title' => t('Select'),
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_select'),
'access callback' => TRUE,
);
$items['form-test/placeholder-text'] = array(
'title' => 'Placeholder',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_placeholder_test'),
'access callback' => TRUE,
);
$items['form-test/checkboxes-radios'] = array(
'title' => t('Checkboxes, Radios'),
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_checkboxes_radios'),
'access callback' => TRUE,
);
$items['form-test/disabled-elements'] = array(
'title' => t('Form test'),
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_disabled_elements'),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
@@ -136,7 +137,7 @@ function form_test_menu() {
$items['form-test/input-forgery'] = array(
'title' => t('Form test'),
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('_form_test_input_forgery'),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
@@ -144,7 +145,7 @@ function form_test_menu() {
$items['form-test/form-rebuild-preserve-values'] = array(
'title' => 'Form values preservation during rebuild test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_form_rebuild_preserve_values_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -152,7 +153,7 @@ function form_test_menu() {
$items['form_test/form-labels'] = array(
'title' => 'Form label test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_label_test_form'),
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
@@ -160,7 +161,7 @@ function form_test_menu() {
$items['form-test/state-persist'] = array(
'title' => 'Form state persistence without storage',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_state_persist'),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
@@ -168,7 +169,7 @@ function form_test_menu() {
$items['form-test/clicked-button'] = array(
'title' => 'Clicked button test',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_clicked_button'),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
@@ -180,7 +181,7 @@ function form_test_menu() {
'page callback' => 'form_test_two_instances',
'access callback' => 'node_access',
'access arguments' => array('create', 'page'),
- 'file path' => drupal_get_path('module', 'node'),
+ 'file path' => get_path('module', 'node'),
'file' => 'node.pages.inc',
'type' => MENU_CALLBACK,
);
@@ -188,7 +189,7 @@ function form_test_menu() {
$items['form-test/load-include-menu'] = array(
'title' => 'FAPI test loading includes',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_load_include_menu'),
'access callback' => TRUE,
'file' => 'form_test.file.inc',
@@ -197,14 +198,14 @@ function form_test_menu() {
$items['form-test/load-include-custom'] = array(
'title' => 'FAPI test loading includes',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_load_include_custom'),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
);
$items['form-test/checkboxes-zero'] = array(
'title' => 'FAPI test involving checkboxes and zero',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('form_test_checkboxes_zero'),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
@@ -217,7 +218,7 @@ function form_test_menu() {
* Form submit handler to return form values as JSON.
*/
function _form_test_submit_values_json($form, &$form_state) {
- drupal_json_output($form_state['values']);
+ json_output($form_state['values']);
drupal_exit();
}
@@ -235,7 +236,7 @@ function form_test_alter_form($form, &$form_state) {
* Implements hook_form_FORM_ID_alter() on behalf of block.module.
*/
function block_form_form_test_alter_form_alter(&$form, &$form_state) {
- drupal_set_message('block_form_form_test_alter_form_alter() executed.');
+ set_message('block_form_form_test_alter_form_alter() executed.');
}
/**
@@ -243,7 +244,7 @@ function block_form_form_test_alter_form_alter(&$form, &$form_state) {
*/
function form_test_form_alter(&$form, &$form_state, $form_id) {
if ($form_id == 'form_test_alter_form') {
- drupal_set_message('form_test_form_alter() executed.');
+ set_message('form_test_form_alter() executed.');
}
}
@@ -251,18 +252,18 @@ function form_test_form_alter(&$form, &$form_state, $form_id) {
* Implements hook_form_FORM_ID_alter().
*/
function form_test_form_form_test_alter_form_alter(&$form, &$form_state) {
- drupal_set_message('form_test_form_form_test_alter_form_alter() executed.');
+ set_message('form_test_form_form_test_alter_form_alter() executed.');
}
/**
* Implements hook_form_FORM_ID_alter() on behalf of system.module.
*/
function system_form_form_test_alter_form_alter(&$form, &$form_state) {
- drupal_set_message('system_form_form_test_alter_form_alter() executed.');
+ set_message('system_form_form_test_alter_form_alter() executed.');
}
/**
- * Form builder for testing drupal_validate_form().
+ * Form builder for testing validate_form().
*
* Serves for testing form processing and alterations by form validation
* handlers, especially for the case of a validation error:
@@ -321,7 +322,7 @@ function form_test_element_validate_name(&$element, &$form_state) {
if ($triggered) {
// Output the element's value from $form_state.
- drupal_set_message(t('@label value: @value', array('@label' => $element['#title'], '@value' => $form_state['values']['name'])));
+ set_message(t('@label value: @value', array('@label' => $element['#title'], '@value' => $form_state['values']['name'])));
// Trigger a form validation error to see our changes.
form_set_error('');
@@ -338,7 +339,7 @@ function form_test_validate_form_validate(&$form, &$form_state) {
// Alter the submitted value in $form_state.
form_set_value($form['name'], 'value changed by form_set_value() in #validate', $form_state);
// Output the element's value from $form_state.
- drupal_set_message(t('@label value: @value', array('@label' => $form['name']['#title'], '@value' => $form_state['values']['name'])));
+ set_message(t('@label value: @value', array('@label' => $form['name']['#title'], '@value' => $form_state['values']['name'])));
// Trigger a form validation error to see our changes.
form_set_error('');
@@ -424,7 +425,7 @@ function form_test_limit_validation_errors_form_partial_submit($form, $form_stat
// The title has not been validated, thus its value - in case of the test case
// an empty string - may not be set.
if (!isset($form_state['values']['title']) && isset($form_state['values']['test'])) {
- drupal_set_message('Only validated values appear in the form values.');
+ set_message('Only validated values appear in the form values.');
}
}
@@ -508,7 +509,7 @@ function _form_test_tableselect_multiple_true_form($form, $form_state) {
function _form_test_tableselect_multiple_true_form_submit($form, &$form_state) {
$selected = $form_state['values']['tableselect'];
foreach ($selected as $key => $value) {
- drupal_set_message(t('Submitted: @key = @value', array('@key' => $key, '@value' => $value)));
+ set_message(t('Submitted: @key = @value', array('@key' => $key, '@value' => $value)));
}
}
@@ -523,7 +524,7 @@ function _form_test_tableselect_multiple_false_form($form, $form_state) {
* Process the tableselect #multiple = FALSE submitted values.
*/
function _form_test_tableselect_multiple_false_form_submit($form, &$form_state) {
- drupal_set_message(t('Submitted: @value', array('@value' => $form_state['values']['tableselect'])));
+ set_message(t('Submitted: @value', array('@value' => $form_state['values']['tableselect'])));
}
/**
@@ -617,7 +618,7 @@ function form_test_storage_form($form, &$form_state) {
}
// Count how often the form is constructed.
$_SESSION['constructions']++;
- drupal_set_message("Form constructions: " . $_SESSION['constructions']);
+ set_message("Form constructions: " . $_SESSION['constructions']);
$form['title'] = array(
'#type' => 'textfield',
@@ -683,10 +684,10 @@ function form_storage_test_form_continue_submit($form, &$form_state) {
* Form submit handler to finish multi-step form.
*/
function form_test_storage_form_submit($form, &$form_state) {
- drupal_set_message("Title: " . check_plain($form_state['values']['title']));
- drupal_set_message("Form constructions: " . $_SESSION['constructions']);
+ set_message("Title: " . check_plain($form_state['values']['title']));
+ set_message("Form constructions: " . $_SESSION['constructions']);
if (isset($form_state['storage']['thing']['changed'])) {
- drupal_set_message("The thing has been changed.");
+ set_message("The thing has been changed.");
}
$form_state['redirect'] = 'node';
}
@@ -768,7 +769,7 @@ function form_test_wrapper_callback($form_id) {
'build_info' => array('args' => array()),
'wrapper_callback' => 'form_test_wrapper_callback_wrapper',
);
- return drupal_build_form($form_id, $form_state);
+ return build_form($form_id, $form_state);
}
/**
@@ -808,7 +809,7 @@ function form_test_form_state_values_clean_form($form, &$form_state) {
*/
function form_test_form_state_values_clean_form_submit($form, &$form_state) {
form_state_values_clean($form_state);
- drupal_json_output($form_state['values']);
+ json_output($form_state['values']);
exit;
}
@@ -910,7 +911,7 @@ function _form_test_checkbox($form, &$form_state) {
* Return the form values via JSON.
*/
function _form_test_checkbox_submit($form, &$form_state) {
- drupal_json_output($form_state['values']);
+ json_output($form_state['values']);
exit();
}
@@ -920,7 +921,7 @@ function _form_test_checkbox_submit($form, &$form_state) {
function form_test_select($form, &$form_state) {
$base = array(
'#type' => 'select',
- '#options' => drupal_map_assoc(array('one', 'two', 'three')),
+ '#options' => map_assoc(array('one', 'two', 'three')),
);
$form['select'] = $base + array(
@@ -1019,7 +1020,7 @@ function form_test_select($form, &$form_state) {
* Form submit handler for form_test_select().
*/
function form_test_select_submit($form, &$form_state) {
- drupal_json_output($form_state['values']);
+ json_output($form_state['values']);
exit();
}
@@ -1275,7 +1276,7 @@ function _form_test_disabled_elements($form, &$form_state) {
* Return the form values via JSON.
*/
function _form_test_disabled_elements_submit($form, &$form_state) {
- drupal_json_output($form_state['values']);
+ json_output($form_state['values']);
exit();
}
@@ -1304,7 +1305,7 @@ function _form_test_input_forgery($form, &$form_state) {
* Return the form values via JSON.
*/
function _form_test_input_forgery_submit($form, &$form_state) {
- drupal_json_output($form_state['values']);
+ json_output($form_state['values']);
exit();
}
@@ -1383,7 +1384,7 @@ function form_test_form_rebuild_preserve_values_form_add_more($form, &$form_stat
*/
function form_test_form_rebuild_preserve_values_form_submit($form, &$form_state) {
// Finish the workflow. Do not rebuild.
- drupal_set_message(t('Form values: %values', array('%values' => var_export($form_state['values'], TRUE))));
+ set_message(t('Form values: %values', array('%values' => var_export($form_state['values'], TRUE))));
}
/**
@@ -1411,7 +1412,7 @@ function form_test_state_persist($form, &$form_state) {
* @see form_test_state_persist()
*/
function form_test_state_persist_submit($form, &$form_state) {
- drupal_set_message($form_state['value']);
+ set_message($form_state['value']);
$form_state['rebuild'] = TRUE;
}
@@ -1570,10 +1571,10 @@ function form_test_clicked_button($form, &$form_state) {
*/
function form_test_clicked_button_validate($form, &$form_state) {
if (isset($form_state['triggering_element'])) {
- drupal_set_message(t('The clicked button is %name.', array('%name' => $form_state['triggering_element']['#name'])));
+ set_message(t('The clicked button is %name.', array('%name' => $form_state['triggering_element']['#name'])));
}
else {
- drupal_set_message('There is no clicked button.');
+ set_message('There is no clicked button.');
}
}
@@ -1581,7 +1582,7 @@ function form_test_clicked_button_validate($form, &$form_state) {
* Form submit handler for the form_test_clicked_button() form.
*/
function form_test_clicked_button_submit($form, &$form_state) {
- drupal_set_message('Submit handler for form_test_clicked_button executed.');
+ set_message('Submit handler for form_test_clicked_button executed.');
}
/**
@@ -1604,7 +1605,7 @@ function form_test_form_user_register_form_alter(&$form, &$form_state) {
* Submit callback that just lets the form rebuild.
*/
function form_test_user_register_form_rebuild($form, &$form_state) {
- drupal_set_message('Form rebuilt.');
+ set_message('Form rebuilt.');
$form_state['rebuild'] = TRUE;
}
@@ -1620,8 +1621,8 @@ function form_test_two_instances() {
'language' => LANGUAGE_NONE,
);
$node2 = clone($node1);
- $return['node_form_1'] = drupal_get_form('page_node_form', $node1);
- $return['node_form_2'] = drupal_get_form('page_node_form', $node2);
+ $return['node_form_1'] = get_form('page_node_form', $node1);
+ $return['node_form_2'] = get_form('page_node_form', $node2);
return $return;
}
diff --git a/core/modules/simpletest/tests/graph.test b/core/modules/simpletest/tests/graph.test
index e60cd39..a4f1acc 100644
--- a/core/modules/simpletest/tests/graph.test
+++ b/core/modules/simpletest/tests/graph.test
@@ -1,4 +1,5 @@
'Graph',
@@ -18,7 +19,7 @@ class GraphUnitTest extends DrupalUnitTestCase {
}
function setUp() {
- require_once DRUPAL_ROOT . '/core/includes/graph.inc';
+ require_once ROOT . '/core/includes/graph.inc';
parent::setUp();
}
@@ -42,7 +43,7 @@ class GraphUnitTest extends DrupalUnitTestCase {
8 => array(9),
9 => array(),
));
- drupal_depth_first_search($graph);
+ depth_first_search($graph);
$expected_paths = array(
1 => array(2, 3, 4),
@@ -106,7 +107,7 @@ class GraphUnitTest extends DrupalUnitTestCase {
* Verify expected paths in a graph.
*
* @param $graph
- * A graph array processed by drupal_depth_first_search().
+ * A graph array processed by depth_first_search().
* @param $expected_paths
* An associative array containing vertices with their expected paths.
*/
@@ -123,7 +124,7 @@ class GraphUnitTest extends DrupalUnitTestCase {
* Verify expected reverse paths in a graph.
*
* @param $graph
- * A graph array processed by drupal_depth_first_search().
+ * A graph array processed by depth_first_search().
* @param $expected_reverse_paths
* An associative array containing vertices with their expected reverse
* paths.
@@ -141,7 +142,7 @@ class GraphUnitTest extends DrupalUnitTestCase {
* Verify expected components in a graph.
*
* @param $graph
- * A graph array processed by drupal_depth_first_search().
+ * A graph array processed by depth_first_search().
* @param $expected_components
* An array containing of components defined as a list of their vertices.
*/
@@ -162,7 +163,7 @@ class GraphUnitTest extends DrupalUnitTestCase {
* Verify expected order in a graph.
*
* @param $graph
- * A graph array processed by drupal_depth_first_search().
+ * A graph array processed by depth_first_search().
* @param $expected_orders
* An array containing lists of vertices in their expected order.
*/
diff --git a/core/modules/simpletest/tests/http.php b/core/modules/simpletest/tests/http.php
index 91985a6..5408b2d 100644
--- a/core/modules/simpletest/tests/http.php
+++ b/core/modules/simpletest/tests/http.php
@@ -1,4 +1,5 @@
$value) {
// Change current directory to the Drupal root.
chdir('../../../..');
-define('DRUPAL_ROOT', getcwd());
-require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
+define('ROOT', getcwd());
+require_once ROOT . '/core/includes/bootstrap.inc';
// Make sure this file can only be used by simpletest.
-drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
-if (!drupal_valid_test_ua()) {
+bootstrap(BOOTSTRAP_CONFIGURATION);
+if (!valid_test_ua()) {
header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
exit;
}
-drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+bootstrap(BOOTSTRAP_FULL);
menu_execute_active_handler();
diff --git a/core/modules/simpletest/tests/https.php b/core/modules/simpletest/tests/https.php
index c342abc..a26ece6 100644
--- a/core/modules/simpletest/tests/https.php
+++ b/core/modules/simpletest/tests/https.php
@@ -1,4 +1,5 @@
$value) {
// Change current directory to the Drupal root.
chdir('../../../..');
-define('DRUPAL_ROOT', getcwd());
-require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
+define('ROOT', getcwd());
+require_once ROOT . '/core/includes/bootstrap.inc';
// Make sure this file can only be used by simpletest.
-drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
-if (!drupal_valid_test_ua()) {
+bootstrap(BOOTSTRAP_CONFIGURATION);
+if (!valid_test_ua()) {
header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
exit;
}
-drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+bootstrap(BOOTSTRAP_FULL);
menu_execute_active_handler();
diff --git a/core/modules/simpletest/tests/image.test b/core/modules/simpletest/tests/image.test
index daf5394..8e83334 100644
--- a/core/modules/simpletest/tests/image.test
+++ b/core/modules/simpletest/tests/image.test
@@ -1,4 +1,6 @@
$values) {
// Load up a fresh image.
- $image = image_load(drupal_get_path('module', 'simpletest') . '/files/' . $file, 'gd');
+ $image = image_load(get_path('module', 'simpletest') . '/files/' . $file, 'gd');
if (!$image) {
$this->fail(t('Could not load image %file.', array('%file' => $file)));
continue 2;
@@ -401,7 +403,7 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
}
// Perform our operation.
- $function = 'image_' . $values['function'];
+ $function = 'Drupal\image_' . $values['function'];
$arguments = array();
$arguments[] = &$image;
$arguments = array_merge($arguments, $values['arguments']);
diff --git a/core/modules/simpletest/tests/image_test.module b/core/modules/simpletest/tests/image_test.module
index de640f0..0d83af5 100644
--- a/core/modules/simpletest/tests/image_test.module
+++ b/core/modules/simpletest/tests/image_test.module
@@ -1,4 +1,6 @@
assertEqual(self::$sent_message['to'], 'testing@example.com', t('Pluggable mail system is extendable.'));
@@ -53,7 +54,7 @@ class MailTestCase extends DrupalWebTestCase implements MailSystemInterface {
self::$sent_message = NULL;
// Send a test message that simpletest_mail_alter should cancel.
- $message = drupal_mail('simpletest', 'cancel_test', 'cancel@example.com', $language);
+ $message = mail('simpletest', 'cancel_test', 'cancel@example.com', $language);
// Assert that the message was not actually sent.
$this->assertNull(self::$sent_message, 'Message was canceled.');
@@ -68,9 +69,9 @@ class MailTestCase extends DrupalWebTestCase implements MailSystemInterface {
// Join the body array into one string.
$message['body'] = implode("\n\n", $message['body']);
// Convert any HTML to plain-text.
- $message['body'] = drupal_html_to_text($message['body']);
+ $message['body'] = html_to_text($message['body']);
// Wrap the mail body for sending.
- $message['body'] = drupal_wrap_mail($message['body']);
+ $message['body'] = wrap_mail($message['body']);
return $message;
}
@@ -83,13 +84,13 @@ class MailTestCase extends DrupalWebTestCase implements MailSystemInterface {
}
/**
- * Unit tests for drupal_html_to_text().
+ * Unit tests for html_to_text().
*/
-class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
+class HtmlToTextTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'HTML to text conversion',
- 'description' => 'Tests drupal_html_to_text().',
+ 'description' => 'Tests html_to_text().',
'group' => 'Mail',
);
}
@@ -114,7 +115,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
}
/**
- * Helper function for testing drupal_html_to_text().
+ * Helper function for testing html_to_text().
*
* @param $html
* The source HTML string to be converted.
@@ -124,13 +125,13 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
* A text message to display in the assertion message.
* @param $allowed_tags
* (optional) An array of allowed tags, or NULL to default to the full
- * set of tags supported by drupal_html_to_text().
+ * set of tags supported by html_to_text().
*/
function assertHtmlToText($html, $text, $message, $allowed_tags = NULL) {
preg_match_all('/<([a-z0-6]+)/', drupal_strtolower($html), $matches);
$tested_tags = implode(', ', array_unique($matches[1]));
$message .= ' (' . $tested_tags . ')';
- $result = drupal_html_to_text($html, $allowed_tags);
+ $result = html_to_text($html, $allowed_tags);
$pass = $this->assertEqual($result, $text, check_plain($message));
$verbose = 'html =
' . $this->stringToHtml($html)
. '' . 'result =
' . $this->stringToHtml($result)
@@ -143,7 +144,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
}
/**
- * Test all supported tags of drupal_html_to_text().
+ * Test all supported tags of html_to_text().
*/
function testTags() {
global $base_path, $base_url;
@@ -238,10 +239,10 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
}
/**
- * Test $allowed_tags argument of drupal_html_to_text().
+ * Test $allowed_tags argument of html_to_text().
*/
function testDrupalHtmlToTextArgs() {
- // The second parameter of drupal_html_to_text() overrules the allowed tags.
+ // The second parameter of html_to_text() overrules the allowed tags.
$this->assertHtmlToText(
'Drupal Drupal Drupal',
"Drupal *Drupal* Drupal\n",
@@ -311,7 +312,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
. ''
. '[text]';
- $output = drupal_html_to_text($input);
+ $output = html_to_text($input);
$pass = $this->assertFalse(
preg_match('/\][^\n]*\[/s', $output),
'Block-level HTML tags should force newlines'
@@ -321,7 +322,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
}
$output_upper = drupal_strtoupper($output);
$upper_input = drupal_strtoupper($input);
- $upper_output = drupal_html_to_text($upper_input);
+ $upper_output = html_to_text($upper_input);
$pass = $this->assertEqual(
$upper_output,
$output_upper,
@@ -407,7 +408,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
}
/**
- * Tests that drupal_html_to_text() wraps before 1000 characters.
+ * Tests that html_to_text() wraps before 1000 characters.
*
* RFC 3676 says, "The Text/Plain media type is the lowest common
* denominator of Internet email, with lines of no more than 998 characters."
@@ -420,7 +421,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
*/
function testVeryLongLineWrap() {
$input = 'Drupal
' . str_repeat('x', 2100) . '
Drupal';
- $output = drupal_html_to_text($input);
+ $output = html_to_text($input);
// This awkward construct comes from includes/mail.inc lines 8-13.
$eol = variable_get('mail_line_endings', MAIL_LINE_ENDINGS);
// We must use strlen() rather than drupal_strlen() in order to count
diff --git a/core/modules/simpletest/tests/menu.test b/core/modules/simpletest/tests/menu.test
index 5a173b1..092d109 100644
--- a/core/modules/simpletest/tests/menu.test
+++ b/core/modules/simpletest/tests/menu.test
@@ -1,11 +1,13 @@
drupalGet($goto);
+ protected function assertBreadcrumb($redirect, array $trail, $page_title = NULL, array $tree = array(), $last_active = TRUE) {
+ if (isset($redirect)) {
+ $this->drupalGet($redirect);
}
// Compare paths with actual breadcrumb.
$parts = $this->getParts();
@@ -121,7 +123,7 @@ class MenuWebTestCase extends DrupalWebTestCase {
}
}
-class MenuRouterTestCase extends DrupalWebTestCase {
+class MenuRouterTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Menu router',
@@ -646,7 +648,7 @@ class MenuRouterTestCase extends DrupalWebTestCase {
/**
* Tests for menu links.
*/
-class MenuLinksUnitTestCase extends DrupalWebTestCase {
+class MenuLinksUnitTestCase extends WebTestCase {
// Use the lightweight testing profile for this test.
protected $profile = 'testing';
@@ -865,7 +867,7 @@ class MenuLinksUnitTestCase extends DrupalWebTestCase {
/**
* Tests rebuilding the menu by setting 'menu_rebuild_needed.'
*/
-class MenuRebuildTestCase extends DrupalWebTestCase {
+class MenuRebuildTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Menu rebuild test',
@@ -903,7 +905,7 @@ class MenuRebuildTestCase extends DrupalWebTestCase {
/**
* Menu tree data related tests.
*/
-class MenuTreeDataTestCase extends DrupalUnitTestCase {
+class MenuTreeDataTestCase extends UnitTestCase {
/**
* Dummy link structure acceptable for menu_tree_data().
*/
@@ -958,7 +960,7 @@ class MenuTreeDataTestCase extends DrupalUnitTestCase {
/**
* Menu tree output related tests.
*/
-class MenuTreeOutputTestCase extends DrupalWebTestCase {
+class MenuTreeOutputTestCase extends WebTestCase {
/**
* Dummy link structure acceptable for menu_tree_output().
*/
@@ -1368,7 +1370,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase {
// Verify breadcrumbs on user and user/%.
// We need to log back in and out below, and cannot simply grant the
// 'administer users' permission, since user_page() makes your head explode.
- user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array(
+ user_role_grant_permissions(ANONYMOUS_RID, array(
'access user profiles',
));
$this->drupalLogout();
diff --git a/core/modules/simpletest/tests/menu_test.module b/core/modules/simpletest/tests/menu_test.module
index c42aca6..59a6ae6 100644
--- a/core/modules/simpletest/tests/menu_test.module
+++ b/core/modules/simpletest/tests/menu_test.module
@@ -1,4 +1,5 @@
'Module API',
@@ -56,8 +57,8 @@ class ModuleUnitTest extends DrupalWebTestCase {
// Test the fixed list feature.
$fixed_list = array(
- 'system' => array('filename' => drupal_get_path('module', 'system')),
- 'menu' => array('filename' => drupal_get_path('module', 'menu')),
+ 'system' => array('filename' => get_path('module', 'system')),
+ 'menu' => array('filename' => get_path('module', 'menu')),
);
module_list(FALSE, FALSE, FALSE, $fixed_list);
$new_module_list = array_combine(array_keys($fixed_list), array_keys($fixed_list));
@@ -105,7 +106,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
module_load_include('inc', 'module_test', 'module_test.file');
$modules = module_implements('test_hook');
- $static = drupal_static('module_implements');
+ $static = drupal_static('Drupal\module_implements');
$this->assertTrue(in_array('module_test', $modules), 'Hook found.');
$this->assertEqual($static['test_hook']['module_test'], 'file', 'Include file detected.');
}
@@ -146,7 +147,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
// First, create a fake missing dependency. Forum depends on poll, which
// depends on a made-up module, foo. Nothing should be installed.
variable_set('dependency_test', 'missing dependency');
- drupal_static_reset('system_rebuild_module_data');
+ drupal_static_reset('Drupal\system_rebuild_module_data');
$result = module_enable(array('forum'));
$this->assertFalse($result, t('module_enable() returns FALSE if dependencies are missing.'));
$this->assertFalse(module_exists('forum'), t('module_enable() aborts if dependencies are missing.'));
@@ -154,7 +155,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
// Now, fix the missing dependency. Forum module depends on poll, but poll
// depends on the PHP module. module_enable() should work.
variable_set('dependency_test', 'dependency');
- drupal_static_reset('system_rebuild_module_data');
+ drupal_static_reset('Drupal\system_rebuild_module_data');
$result = module_enable(array('forum'));
$this->assertTrue($result, t('module_enable() returns the correct value.'));
// Verify that the fake dependency chain was installed.
@@ -174,7 +175,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
// Disable a module that is listed as a dependency by the install profile.
// Make sure that the profile itself is not on the list of dependent
// modules to be disabled.
- $profile = drupal_get_profile();
+ $profile = get_profile();
$info = install_profile_info($profile);
$this->assertTrue(in_array('comment', $info['dependencies']), t('Comment module is listed as a dependency of the install profile.'));
$this->assertTrue(module_exists('comment'), t('Comment module is enabled.'));
@@ -187,27 +188,27 @@ class ModuleUnitTest extends DrupalWebTestCase {
// Try to uninstall the PHP module by itself. This should be rejected,
// since the modules which it depends on need to be uninstalled first, and
// that is too destructive to perform automatically.
- $result = drupal_uninstall_modules(array('php'));
- $this->assertFalse($result, t('Calling drupal_uninstall_modules() on a module whose dependents are not uninstalled fails.'));
+ $result = uninstall_modules(array('php'));
+ $this->assertFalse($result, t('Calling uninstall_modules() on a module whose dependents are not uninstalled fails.'));
foreach (array('forum', 'poll', 'php') as $module) {
- $this->assertNotEqual(drupal_get_installed_schema_version($module), SCHEMA_UNINSTALLED, t('The @module module was not uninstalled.', array('@module' => $module)));
+ $this->assertNotEqual(get_installed_schema_version($module), SCHEMA_UNINSTALLED, t('The @module module was not uninstalled.', array('@module' => $module)));
}
// Now uninstall all three modules explicitly, but in the incorrect order,
// and make sure that drupal_uninstal_modules() uninstalled them in the
// correct sequence.
- $result = drupal_uninstall_modules(array('poll', 'php', 'forum'));
- $this->assertTrue($result, t('drupal_uninstall_modules() returns the correct value.'));
+ $result = uninstall_modules(array('poll', 'php', 'forum'));
+ $this->assertTrue($result, t('uninstall_modules() returns the correct value.'));
foreach (array('forum', 'poll', 'php') as $module) {
- $this->assertEqual(drupal_get_installed_schema_version($module), SCHEMA_UNINSTALLED, t('The @module module was uninstalled.', array('@module' => $module)));
+ $this->assertEqual(get_installed_schema_version($module), SCHEMA_UNINSTALLED, t('The @module module was uninstalled.', array('@module' => $module)));
}
- $this->assertEqual(variable_get('test_module_uninstall_order', array()), array('forum', 'poll', 'php'), t('Modules were uninstalled in the correct order by drupal_uninstall_modules().'));
+ $this->assertEqual(variable_get('test_module_uninstall_order', array()), array('forum', 'poll', 'php'), t('Modules were uninstalled in the correct order by uninstall_modules().'));
// Uninstall the profile module from above, and make sure that the profile
// itself is not on the list of dependent modules to be uninstalled.
- $result = drupal_uninstall_modules(array('comment'));
- $this->assertTrue($result, t('drupal_uninstall_modules() returns the correct value.'));
- $this->assertEqual(drupal_get_installed_schema_version('comment'), SCHEMA_UNINSTALLED, t('Comment module was uninstalled.'));
+ $result = uninstall_modules(array('comment'));
+ $this->assertTrue($result, t('uninstall_modules() returns the correct value.'));
+ $this->assertEqual(get_installed_schema_version('comment'), SCHEMA_UNINSTALLED, t('Comment module was uninstalled.'));
$uninstalled_modules = variable_get('test_module_uninstall_order', array());
$this->assertTrue(in_array('comment', $uninstalled_modules), t('Comment module is in the list of uninstalled modules.'));
$this->assertFalse(in_array($profile, $uninstalled_modules), t('The installation profile is not in the list of uninstalled modules.'));
@@ -217,7 +218,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
// on a specific version of php module in its info file. Make sure that
// module_enable() still works.
variable_set('dependency_test', 'version dependency');
- drupal_static_reset('system_rebuild_module_data');
+ drupal_static_reset('Drupal\system_rebuild_module_data');
$result = module_enable(array('forum'));
$this->assertTrue($result, t('module_enable() returns the correct value.'));
// Verify that the fake dependency chain was installed.
@@ -238,7 +239,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
/**
* Unit tests for module installation.
*/
-class ModuleInstallTestCase extends DrupalWebTestCase {
+class ModuleInstallTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Module installation',
@@ -252,11 +253,11 @@ class ModuleInstallTestCase extends DrupalWebTestCase {
}
/**
- * Test that calls to drupal_write_record() work during module installation.
+ * Test that calls to write_record() work during module installation.
*
* This is a useful function to test because modules often use it to insert
* initial data in their database tables when they are being installed or
- * enabled. Furthermore, drupal_write_record() relies on the module schema
+ * enabled. Furthermore, write_record() relies on the module schema
* information being available, so this also checks that the data from one of
* the module's hook implementations, in particular hook_schema(), is
* properly available during this time. Therefore, this test helps ensure
@@ -264,18 +265,18 @@ class ModuleInstallTestCase extends DrupalWebTestCase {
* them.
*/
function testDrupalWriteRecord() {
- // Check for data that was inserted using drupal_write_record() while the
+ // Check for data that was inserted using write_record() while the
// 'module_test' module was being installed and enabled.
$data = db_query("SELECT data FROM {module_test}")->fetchCol();
- $this->assertTrue(in_array('Data inserted in hook_install()', $data), t('Data inserted using drupal_write_record() in hook_install() is correctly saved.'));
- $this->assertTrue(in_array('Data inserted in hook_enable()', $data), t('Data inserted using drupal_write_record() in hook_enable() is correctly saved.'));
+ $this->assertTrue(in_array('Data inserted in hook_install()', $data), t('Data inserted using write_record() in hook_install() is correctly saved.'));
+ $this->assertTrue(in_array('Data inserted in hook_enable()', $data), t('Data inserted using write_record() in hook_enable() is correctly saved.'));
}
}
/**
* Unit tests for module uninstallation and related hooks.
*/
-class ModuleUninstallTestCase extends DrupalWebTestCase {
+class ModuleUninstallTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Module uninstallation',
@@ -295,7 +296,7 @@ class ModuleUninstallTestCase extends DrupalWebTestCase {
// Uninstalls the module_test module, so hook_modules_uninstalled()
// is executed.
module_disable(array('module_test'));
- drupal_uninstall_modules(array('module_test'));
+ uninstall_modules(array('module_test'));
// Are the perms defined by module_test removed from {role_permission}.
$count = db_query("SELECT COUNT(rid) FROM {role_permission} WHERE permission = :perm", array(':perm' => 'module_test perm'))->fetchField();
diff --git a/core/modules/simpletest/tests/module_test.file.inc b/core/modules/simpletest/tests/module_test.file.inc
index c0d3ec4..8c678c6 100644
--- a/core/modules/simpletest/tests/module_test.file.inc
+++ b/core/modules/simpletest/tests/module_test.file.inc
@@ -1,4 +1,5 @@
'Data inserted in hook_install()');
- drupal_write_record('module_test', $record);
+ write_record('module_test', $record);
}
/**
@@ -37,6 +38,6 @@ function module_test_install() {
*/
function module_test_enable() {
$record = array('data' => 'Data inserted in hook_enable()');
- drupal_write_record('module_test', $record);
+ write_record('module_test', $record);
}
diff --git a/core/modules/simpletest/tests/module_test.module b/core/modules/simpletest/tests/module_test.module
index bd85049..be3270f 100644
--- a/core/modules/simpletest/tests/module_test.module
+++ b/core/modules/simpletest/tests/module_test.module
@@ -1,4 +1,5 @@
pass;
$account->pass = user_hash_password($password);
- $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT, t('Re-hashed password has the minimum number of log2 iterations.'));
+ $this->assertIdentical(_password_get_count_log2($account->pass), MIN_HASH_COUNT, t('Re-hashed password has the minimum number of log2 iterations.'));
$this->assertTrue($account->pass != $old_hash, t('Password hash changed.'));
$this->assertTrue(user_check_password($password, $account), t('Password check succeeds.'));
// Since the log2 setting hasn't changed and the user has a valid password,
// user_needs_new_hash() should return FALSE.
$this->assertFalse(user_needs_new_hash($account), t('User does not need a new hash.'));
// Increment the log2 iteration to MIN + 1.
- variable_set('password_count_log2', DRUPAL_MIN_HASH_COUNT + 1);
+ variable_set('password_count_log2', MIN_HASH_COUNT + 1);
$this->assertTrue(user_needs_new_hash($account), t('User needs a new hash after incrementing the log2 count.'));
// Re-hash the password.
$old_hash = $account->pass;
$account->pass = user_hash_password($password);
- $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT + 1, t('Re-hashed password has the correct number of log2 iterations.'));
+ $this->assertIdentical(_password_get_count_log2($account->pass), MIN_HASH_COUNT + 1, t('Re-hashed password has the correct number of log2 iterations.'));
$this->assertTrue($account->pass != $old_hash, t('Password hash changed again.'));
// Now the hash should be OK.
$this->assertFalse(user_needs_new_hash($account), t('Re-hashed password does not need a new hash.'));
diff --git a/core/modules/simpletest/tests/path.test b/core/modules/simpletest/tests/path.test
index 18dab6b..910e53a 100644
--- a/core/modules/simpletest/tests/path.test
+++ b/core/modules/simpletest/tests/path.test
@@ -1,4 +1,5 @@
'Drupal match path',
- 'description' => 'Tests the drupal_match_path() function to make sure it works properly.',
+ 'description' => 'Tests the match_path() function to make sure it works properly.',
'group' => 'Path API',
);
}
@@ -40,7 +41,7 @@ class DrupalMatchPathTestCase extends DrupalWebTestCase {
$tests = $this->drupalMatchPathTests();
foreach ($tests as $patterns => $cases) {
foreach ($cases as $path => $expected_result) {
- $actual_result = drupal_match_path($path, $patterns);
+ $actual_result = match_path($path, $patterns);
$this->assertIdentical($actual_result, $expected_result, t('Tried matching the path @path to the pattern
@patterns
- expected @expected, got @actual.', array('@path' => $path, '@patterns' => $patterns, '@expected' => var_export($expected_result, TRUE), '@actual' => var_export($actual_result, TRUE))));
}
}
@@ -129,7 +130,7 @@ class DrupalMatchPathTestCase extends DrupalWebTestCase {
/**
* Tests hook_url_alter functions.
*/
-class UrlAlterFunctionalTest extends DrupalWebTestCase {
+class UrlAlterFunctionalTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => t('URL altering'),
@@ -231,7 +232,7 @@ class UrlAlterFunctionalTest extends DrupalWebTestCase {
*
* @param $original
* A string with the aliased or un-normal path that is run through
- * drupal_get_normal_path().
+ * get_normal_path().
* @param $final
* A string with the expected result after url().
* @return
@@ -239,25 +240,25 @@ class UrlAlterFunctionalTest extends DrupalWebTestCase {
*/
protected function assertUrlInboundAlter($original, $final) {
// Test inbound altering.
- $result = drupal_get_normal_path($original);
+ $result = get_normal_path($original);
$this->assertIdentical($result, $final, t('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
}
}
/**
- * Unit test for drupal_lookup_path().
+ * Unit test for lookup_path().
*/
-class PathLookupTest extends DrupalWebTestCase {
+class PathLookupTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => t('Path lookup'),
- 'description' => t('Tests that drupal_lookup_path() returns correct paths.'),
+ 'description' => t('Tests that lookup_path() returns correct paths.'),
'group' => t('Path API'),
);
}
/**
- * Test that drupal_lookup_path() returns the correct path.
+ * Test that lookup_path() returns the correct path.
*/
function testDrupalLookupPath() {
$account = $this->drupalCreateUser();
@@ -271,8 +272,8 @@ class PathLookupTest extends DrupalWebTestCase {
'alias' => 'foo',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('Basic alias lookup works.'));
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Basic source lookup works.'));
+ $this->assertEqual(lookup_path('alias', $path['source']), $path['alias'], t('Basic alias lookup works.'));
+ $this->assertEqual(lookup_path('source', $path['alias']), $path['source'], t('Basic source lookup works.'));
// Create a language specific alias for the default language (English).
$path = array(
@@ -281,8 +282,8 @@ class PathLookupTest extends DrupalWebTestCase {
'langcode' => 'en',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('English alias overrides language-neutral alias.'));
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('English source overrides language-neutral source.'));
+ $this->assertEqual(lookup_path('alias', $path['source']), $path['alias'], t('English alias overrides language-neutral alias.'));
+ $this->assertEqual(lookup_path('source', $path['alias']), $path['source'], t('English source overrides language-neutral source.'));
// Create a language-neutral alias for the same path, again.
$path = array(
@@ -290,7 +291,7 @@ class PathLookupTest extends DrupalWebTestCase {
'alias' => 'bar',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a language-neutral alias.'));
+ $this->assertEqual(lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a language-neutral alias.'));
// Create a language-specific (xx-lolspeak) alias for the same path.
$path = array(
@@ -299,9 +300,9 @@ class PathLookupTest extends DrupalWebTestCase {
'langcode' => 'xx-lolspeak',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a LOLspeak alias.'));
+ $this->assertEqual(lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a LOLspeak alias.'));
// The LOLspeak alias should be returned if we really want LOLspeak.
- $this->assertEqual(drupal_lookup_path('alias', $path['source'], 'xx-lolspeak'), 'LOL', t('LOLspeak alias returned if we specify xx-lolspeak to drupal_lookup_path().'));
+ $this->assertEqual(lookup_path('alias', $path['source'], 'xx-lolspeak'), 'LOL', t('LOLspeak alias returned if we specify xx-lolspeak to lookup_path().'));
// Create a new alias for this path in English, which should override the
// previous alias for "user/$uid".
@@ -311,16 +312,16 @@ class PathLookupTest extends DrupalWebTestCase {
'langcode' => 'en',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('Recently created English alias returned.'));
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Recently created English source returned.'));
+ $this->assertEqual(lookup_path('alias', $path['source']), $path['alias'], t('Recently created English alias returned.'));
+ $this->assertEqual(lookup_path('source', $path['alias']), $path['source'], t('Recently created English source returned.'));
// Remove the English aliases, which should cause a fallback to the most
// recently created language-neutral alias, 'bar'.
db_delete('url_alias')
->condition('langcode', 'en')
->execute();
- drupal_clear_path_cache();
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), 'bar', t('Path lookup falls back to recently created language-neutral alias.'));
+ clear_path_cache();
+ $this->assertEqual(lookup_path('alias', $path['source']), 'bar', t('Path lookup falls back to recently created language-neutral alias.'));
// Test the situation where the alias and language are the same, but
// the source differs. The newer alias record should be returned.
@@ -330,6 +331,6 @@ class PathLookupTest extends DrupalWebTestCase {
'alias' => 'bar',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Newer alias record is returned when comparing two LANGUAGE_NONE paths with the same alias.'));
+ $this->assertEqual(lookup_path('source', $path['alias']), $path['source'], t('Newer alias record is returned when comparing two LANGUAGE_NONE paths with the same alias.'));
}
}
diff --git a/core/modules/simpletest/tests/registry.test b/core/modules/simpletest/tests/registry.test
index bcd8d4e..a2bdc5e 100644
--- a/core/modules/simpletest/tests/registry.test
+++ b/core/modules/simpletest/tests/registry.test
@@ -1,6 +1,8 @@
'Registry parse file test',
@@ -45,7 +47,7 @@ CONTENTS;
}
-class RegistryParseFilesTestCase extends DrupalWebTestCase {
+class RegistryParseFilesTestCase extends WebTestCase {
protected $fileTypes = array('new', 'existing_changed');
public static function getInfo() {
diff --git a/core/modules/simpletest/tests/requirements1_test.install b/core/modules/simpletest/tests/requirements1_test.install
index 651d911..1e7f065 100644
--- a/core/modules/simpletest/tests/requirements1_test.install
+++ b/core/modules/simpletest/tests/requirements1_test.install
@@ -1,4 +1,5 @@
'Session tests',
@@ -19,14 +20,14 @@ class SessionTestCase extends DrupalWebTestCase {
}
/**
- * Tests for drupal_save_session() and drupal_session_regenerate().
+ * Tests for save_session() and session_regenerate().
*/
function testSessionSaveRegenerate() {
- $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE (inside of testing framework) when initially called with no arguments.'), t('Session'));
- $this->assertFalse(drupal_save_session(FALSE), t('drupal_save_session() correctly returns FALSE when called with FALSE.'), t('Session'));
- $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE when saving has been disabled.'), t('Session'));
- $this->assertTrue(drupal_save_session(TRUE), t('drupal_save_session() correctly returns TRUE when called with TRUE.'), t('Session'));
- $this->assertTrue(drupal_save_session(), t('drupal_save_session() correctly returns TRUE when saving has been enabled.'), t('Session'));
+ $this->assertFalse(save_session(), t('save_session() correctly returns FALSE (inside of testing framework) when initially called with no arguments.'), t('Session'));
+ $this->assertFalse(save_session(FALSE), t('save_session() correctly returns FALSE when called with FALSE.'), t('Session'));
+ $this->assertFalse(save_session(), t('save_session() correctly returns FALSE when saving has been disabled.'), t('Session'));
+ $this->assertTrue(save_session(TRUE), t('save_session() correctly returns TRUE when called with TRUE.'), t('Session'));
+ $this->assertTrue(save_session(), t('save_session() correctly returns TRUE when saving has been enabled.'), t('Session'));
// Test session hardening code from SA-2008-044.
$user = $this->drupalCreateUser(array('access content'));
@@ -84,13 +85,13 @@ class SessionTestCase extends DrupalWebTestCase {
$this->drupalGet('session-test/get');
$this->assertText($value_1, t('Session correctly returned the stored data for an authenticated user.'), t('Session'));
- // Attempt to write over val_1. If drupal_save_session(FALSE) is working.
+ // Attempt to write over val_1. If save_session(FALSE) is working.
// properly, val_1 will still be set.
$value_2 = $this->randomName();
$this->drupalGet('session-test/no-set/' . $value_2);
$this->assertText($value_2, t('The session value was correctly passed to session-test/no-set.'), t('Session'));
$this->drupalGet('session-test/get');
- $this->assertText($value_1, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session'));
+ $this->assertText($value_1, t('Session data is not saved for save_session(FALSE).'), t('Session'));
// Switch browser cookie to anonymous user, then back to user 1.
$this->sessionReset();
@@ -110,12 +111,12 @@ class SessionTestCase extends DrupalWebTestCase {
$this->drupalGet('session-test/get');
$this->assertText($value_3, t('Session correctly returned the stored data for an anonymous user.'), t('Session'));
- // Try to store data when drupal_save_session(FALSE).
+ // Try to store data when save_session(FALSE).
$value_4 = $this->randomName();
$this->drupalGet('session-test/no-set/' . $value_4);
$this->assertText($value_4, t('The session value was correctly passed to session-test/no-set.'), t('Session'));
$this->drupalGet('session-test/get');
- $this->assertText($value_3, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session'));
+ $this->assertText($value_3, t('Session data is not saved for save_session(FALSE).'), t('Session'));
// Login, the data should persist.
$this->drupalLogin($user);
@@ -167,7 +168,7 @@ class SessionTestCase extends DrupalWebTestCase {
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.'));
$this->assertFalse($this->drupalGetHeader('Set-Cookie'), t('New session was not started.'));
- // Verify that no session is created if drupal_save_session(FALSE) is called.
+ // Verify that no session is created if save_session(FALSE) is called.
$this->drupalGet('session-test/set-message-but-dont-save');
$this->assertSessionCookie(FALSE);
$this->assertSessionEmpty(TRUE);
@@ -291,7 +292,7 @@ class SessionTestCase extends DrupalWebTestCase {
/**
* Ensure that when running under https two session cookies are generated.
*/
-class SessionHttpsTestCase extends DrupalWebTestCase {
+class SessionHttpsTestCase extends WebTestCase {
public static function getInfo() {
return array(
diff --git a/core/modules/simpletest/tests/session_test.module b/core/modules/simpletest/tests/session_test.module
index 689ff09..9d602c1 100644
--- a/core/modules/simpletest/tests/session_test.module
+++ b/core/modules/simpletest/tests/session_test.module
@@ -1,4 +1,5 @@
$value));
}
@@ -105,11 +106,11 @@ function _session_test_no_set($value) {
* Menu callback: print the current session ID.
*/
function _session_test_id() {
- // Set a value in $_SESSION, so that drupal_session_commit() will start
+ // Set a value in $_SESSION, so that session_commit() will start
// a session.
$_SESSION['test'] = 'test';
- drupal_session_commit();
+ session_commit();
return 'session_id:' . session_id() . "\n";
}
@@ -125,7 +126,7 @@ function _session_test_id_from_cookie() {
* Menu callback, sets a message to me displayed on the following page.
*/
function _session_test_set_message() {
- drupal_set_message(t('This is a dummy message.'));
+ set_message(t('This is a dummy message.'));
print t('A message was set.');
// Do not return anything, so the current request does not result in a themed
// page with messages. The message will be displayed in the following request
@@ -133,10 +134,10 @@ function _session_test_set_message() {
}
/**
- * Menu callback, sets a message but call drupal_save_session(FALSE).
+ * Menu callback, sets a message but call save_session(FALSE).
*/
function _session_test_set_message_but_dont_save() {
- drupal_save_session(FALSE);
+ save_session(FALSE);
_session_test_set_message();
}
@@ -169,12 +170,12 @@ function session_test_form_user_login_alter(&$form) {
}
/**
- * Implements hook_drupal_goto_alter().
+ * Implements hook_redirect_alter().
*
* Force the redirection to go to a non-secure page after being on a secure
* page through https.php.
*/
-function session_test_drupal_goto_alter(&$path, &$options, &$http_response_code) {
+function session_test_redirect_alter(&$path, &$options, &$http_response_code) {
global $base_insecure_url, $is_https_mock;
// Alter the redirect to use HTTP when using a mock HTTPS request through
// https.php because form submissions would otherwise redirect to a
diff --git a/core/modules/simpletest/tests/symfony.test b/core/modules/simpletest/tests/symfony.test
index 8a7ecb9..5253839 100644
--- a/core/modules/simpletest/tests/symfony.test
+++ b/core/modules/simpletest/tests/symfony.test
@@ -1,4 +1,5 @@
'Class loader',
diff --git a/core/modules/simpletest/tests/system_dependencies_test.module b/core/modules/simpletest/tests/system_dependencies_test.module
index b3d9bbc..66bf2d1 100644
--- a/core/modules/simpletest/tests/system_dependencies_test.module
+++ b/core/modules/simpletest/tests/system_dependencies_test.module
@@ -1 +1,2 @@
$_GET['name'], '%value' => $_GET['value']));
}
@@ -179,7 +181,7 @@ function system_test_redirect_invalid_scheme() {
function system_test_modules_installed($modules) {
if (variable_get('test_verbose_module_hooks')) {
foreach ($modules as $module) {
- drupal_set_message(t('hook_modules_installed fired for @module', array('@module' => $module)));
+ set_message(t('hook_modules_installed fired for @module', array('@module' => $module)));
}
}
}
@@ -190,7 +192,7 @@ function system_test_modules_installed($modules) {
function system_test_modules_enabled($modules) {
if (variable_get('test_verbose_module_hooks')) {
foreach ($modules as $module) {
- drupal_set_message(t('hook_modules_enabled fired for @module', array('@module' => $module)));
+ set_message(t('hook_modules_enabled fired for @module', array('@module' => $module)));
}
}
}
@@ -201,7 +203,7 @@ function system_test_modules_enabled($modules) {
function system_test_modules_disabled($modules) {
if (variable_get('test_verbose_module_hooks')) {
foreach ($modules as $module) {
- drupal_set_message(t('hook_modules_disabled fired for @module', array('@module' => $module)));
+ set_message(t('hook_modules_disabled fired for @module', array('@module' => $module)));
}
}
}
@@ -212,7 +214,7 @@ function system_test_modules_disabled($modules) {
function system_test_modules_uninstalled($modules) {
if (variable_get('test_verbose_module_hooks')) {
foreach ($modules as $module) {
- drupal_set_message(t('hook_modules_uninstalled fired for @module', array('@module' => $module)));
+ set_message(t('hook_modules_uninstalled fired for @module', array('@module' => $module)));
}
}
}
@@ -228,9 +230,9 @@ function system_test_boot() {
* Implements hook_init().
*/
function system_test_init() {
- // Used by FrontPageTestCase to get the results of drupal_is_front_page().
- if (variable_get('front_page_output', 0) && drupal_is_front_page()) {
- drupal_set_message(t('On front page.'));
+ // Used by FrontPageTestCase to get the results of is_front_page().
+ if (variable_get('front_page_output', 0) && is_front_page()) {
+ set_message(t('On front page.'));
}
}
@@ -312,15 +314,15 @@ function system_test_page_build(&$page) {
$main_content_display = &drupal_static('system_main_content_added', FALSE);
if ($menu_item['path'] == 'system-test/main-content-handling') {
- $page['footer'] = drupal_set_page_content();
+ $page['footer'] = set_page_content();
$page['footer']['main']['#markup'] = '
' . $page['footer']['main']['#markup'] . '
';
}
elseif ($menu_item['path'] == 'system-test/main-content-fallback') {
- drupal_set_page_content();
+ set_page_content();
$main_content_display = FALSE;
}
elseif ($menu_item['path'] == 'system-test/main-content-duplication') {
- drupal_set_page_content();
+ set_page_content();
}
}
@@ -335,7 +337,7 @@ function system_test_main_content_fallback() {
* A simple page callback which adds a register shutdown function.
*/
function system_test_page_shutdown_functions($arg1, $arg2) {
- drupal_register_shutdown_function('_system_test_first_shutdown_function', $arg1, $arg2);
+ drupal_register_shutdown_function('Drupal\_system_test_first_shutdown_function', $arg1, $arg2);
}
/**
@@ -343,9 +345,9 @@ function system_test_page_shutdown_functions($arg1, $arg2) {
*/
function _system_test_first_shutdown_function($arg1, $arg2) {
// Output something, page has already been printed and the session stored
- // so we can't use drupal_set_message.
+ // so we can't use set_message.
print t('First shutdown function, arg1 : @arg1, arg2: @arg2', array('@arg1' => $arg1, '@arg2' => $arg2));
- drupal_register_shutdown_function('_system_test_second_shutdown_function', $arg1, $arg2);
+ drupal_register_shutdown_function('Drupal\_system_test_second_shutdown_function', $arg1, $arg2);
}
/**
@@ -353,13 +355,13 @@ function _system_test_first_shutdown_function($arg1, $arg2) {
*/
function _system_test_second_shutdown_function($arg1, $arg2) {
// Output something, page has already been printed and the session stored
- // so we can't use drupal_set_message.
+ // so we can't use set_message.
print t('Second shutdown function, arg1 : @arg1, arg2: @arg2', array('@arg1' => $arg1, '@arg2' => $arg2));
// Throw an exception with an HTML tag. Since this is called in a shutdown
// function, it will not bubble up to the default exception handler but will
- // be caught in _drupal_shutdown_function() and be displayed through
- // _drupal_render_exception_safe().
+ // be caught in _shutdown_function() and be displayed through
+ // _render_exception_safe().
throw new Exception('Drupal is
.');
}
@@ -402,6 +404,6 @@ class SystemTestFileTransfer {
*/
function system_test_authorize_init_page($page_title) {
$authorize_url = $GLOBALS['base_url'] . '/core/authorize.php';
- system_authorized_init('system_test_authorize_run', drupal_get_path('module', 'system_test') . '/system_test.module', array(), $page_title);
- drupal_goto($authorize_url);
+ system_authorized_init('system_test_authorize_run', get_path('module', 'system_test') . '/system_test.module', array(), $page_title);
+ redirect($authorize_url);
}
diff --git a/core/modules/simpletest/tests/tablesort.test b/core/modules/simpletest/tests/tablesort.test
index 9c068f8..4f9f9d3 100644
--- a/core/modules/simpletest/tests/tablesort.test
+++ b/core/modules/simpletest/tests/tablesort.test
@@ -1,4 +1,5 @@
assertNoText('system.base.css', t('The theme\'s .info file is able to override a module CSS file from being added to the page.'));
// Also test with aggregation enabled, simply ensuring no PHP errors are
- // triggered during drupal_build_css_cache() when a source file doesn't
+ // triggered during build_css_cache() when a source file doesn't
// exist. Then allow remaining tests to continue with aggregation disabled
// by default.
variable_set('preprocess_css', 1);
@@ -118,7 +120,7 @@ class ThemeUnitTest extends DrupalWebTestCase {
/**
* Unit tests for theme_table().
*/
-class ThemeTableUnitTest extends DrupalWebTestCase {
+class ThemeTableUnitTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Theme Table',
@@ -134,10 +136,10 @@ class ThemeTableUnitTest extends DrupalWebTestCase {
$header = array('one', 'two', 'three');
$rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
$this->content = theme('table', array('header' => $header, 'rows' => $rows));
- $js = drupal_add_js();
+ $js = add_js();
$this->assertTrue(isset($js['core/misc/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.'));
$this->assertRaw('sticky-enabled', t('Table has a class of sticky-enabled when $sticky = TRUE.'));
- drupal_static_reset('drupal_add_js');
+ drupal_static_reset('Drupal\add_js');
}
/**
@@ -150,10 +152,10 @@ class ThemeTableUnitTest extends DrupalWebTestCase {
$caption = NULL;
$colgroups = array();
$this->content = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes, 'caption' => $caption, 'colgroups' => $colgroups, 'sticky' => FALSE));
- $js = drupal_add_js();
+ $js = add_js();
$this->assertFalse(isset($js['core/misc/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.'));
$this->assertNoRaw('sticky-enabled', t('Table does not have a class of sticky-enabled because $sticky = FALSE.'));
- drupal_static_reset('drupal_add_js');
+ drupal_static_reset('Drupal\add_js');
}
/**
@@ -178,7 +180,7 @@ class ThemeTableUnitTest extends DrupalWebTestCase {
/**
* Tests for common theme functions.
*/
-class ThemeFunctionsTestCase extends DrupalWebTestCase {
+class ThemeFunctionsTestCase extends WebTestCase {
protected $profile = 'testing';
public static function getInfo() {
@@ -337,14 +339,14 @@ class ThemeFunctionsTestCase extends DrupalWebTestCase {
}
/**
- * Test the use of drupal_pre_render_links() on a nested array of links.
+ * Test the use of pre_render_links() on a nested array of links.
*/
function testDrupalPreRenderLinks() {
// Define the base array to be rendered, containing a variety of different
// kinds of links.
$base_array = array(
'#theme' => 'links',
- '#pre_render' => array('drupal_pre_render_links'),
+ '#pre_render' => array('pre_render_links'),
'#links' => array(
'parent_link' => array(
'title' => 'Parent link original',
@@ -438,7 +440,7 @@ class ThemeFunctionsTestCase extends DrupalWebTestCase {
/**
* Functional test for initialization of the theme system in hook_init().
*/
-class ThemeHookInitUnitTest extends DrupalWebTestCase {
+class ThemeHookInitUnitTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Theme initialization in hook_init()',
@@ -464,7 +466,7 @@ class ThemeHookInitUnitTest extends DrupalWebTestCase {
/**
* Tests autocompletion not loading registry.
*/
-class ThemeFastTestCase extends DrupalWebTestCase {
+class ThemeFastTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Theme fast initialization',
@@ -491,7 +493,7 @@ class ThemeFastTestCase extends DrupalWebTestCase {
/**
* Unit tests for theme_html_tag().
*/
-class ThemeHtmlTag extends DrupalUnitTestCase {
+class ThemeHtmlTag extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'Theme HTML Tag',
@@ -517,7 +519,7 @@ class ThemeHtmlTag extends DrupalUnitTestCase {
/**
* Functional test for attributes of html.tpl.php.
*/
-class ThemeHtmlTplPhpAttributesTestCase extends DrupalWebTestCase {
+class ThemeHtmlTplPhpAttributesTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'html.tpl.php html and body attributes',
@@ -545,7 +547,7 @@ class ThemeHtmlTplPhpAttributesTestCase extends DrupalWebTestCase {
/**
* Tests for the ThemeRegistry class.
*/
-class ThemeRegistryTestCase extends DrupalWebTestCase {
+class ThemeRegistryTestCase extends WebTestCase {
protected $profile = 'testing';
public static function getInfo() {
return array(
diff --git a/core/modules/simpletest/tests/theme_test.module b/core/modules/simpletest/tests/theme_test.module
index 570b72c..e59d27a 100644
--- a/core/modules/simpletest/tests/theme_test.module
+++ b/core/modules/simpletest/tests/theme_test.module
@@ -1,4 +1,5 @@
'Update dependency ordering',
@@ -19,7 +20,7 @@ class UpdateDependencyOrderingTestCase extends DrupalWebTestCase {
function setUp() {
parent::setUp('update_test_1', 'update_test_2', 'update_test_3');
- require_once DRUPAL_ROOT . '/core/includes/update.inc';
+ require_once ROOT . '/core/includes/update.inc';
}
/**
@@ -58,7 +59,7 @@ class UpdateDependencyOrderingTestCase extends DrupalWebTestCase {
/**
* Tests for missing update dependencies.
*/
-class UpdateDependencyMissingTestCase extends DrupalWebTestCase {
+class UpdateDependencyMissingTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Missing update dependencies',
@@ -71,7 +72,7 @@ class UpdateDependencyMissingTestCase extends DrupalWebTestCase {
// Only install update_test_2.module, even though its updates have a
// dependency on update_test_3.module.
parent::setUp('update_test_2');
- require_once DRUPAL_ROOT . '/core/includes/update.inc';
+ require_once ROOT . '/core/includes/update.inc';
}
function testMissingUpdate() {
@@ -88,7 +89,7 @@ class UpdateDependencyMissingTestCase extends DrupalWebTestCase {
/**
* Tests for the invocation of hook_update_dependencies().
*/
-class UpdateDependencyHookInvocationTestCase extends DrupalWebTestCase {
+class UpdateDependencyHookInvocationTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Update dependency hook invocation',
@@ -99,7 +100,7 @@ class UpdateDependencyHookInvocationTestCase extends DrupalWebTestCase {
function setUp() {
parent::setUp('update_test_1', 'update_test_2');
- require_once DRUPAL_ROOT . '/core/includes/update.inc';
+ require_once ROOT . '/core/includes/update.inc';
}
/**
diff --git a/core/modules/simpletest/tests/update_script_test.install b/core/modules/simpletest/tests/update_script_test.install
index 8af516b..9e1eded 100644
--- a/core/modules/simpletest/tests/update_script_test.install
+++ b/core/modules/simpletest/tests/update_script_test.install
@@ -1,4 +1,5 @@
upgradedSite = FALSE;
@@ -75,13 +77,13 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
$this->originalLanguage = $language;
$this->originalLanguageDefault = variable_get('language_default');
$this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files');
- $this->originalProfile = drupal_get_profile();
+ $this->originalProfile = get_profile();
$clean_url_original = variable_get('clean_url', 0);
// Unregister the registry.
// This is required to make sure that the database layer works properly.
- spl_autoload_unregister('drupal_autoload_class');
- spl_autoload_unregister('drupal_autoload_interface');
+ spl_autoload_unregister('autoload_class');
+ spl_autoload_unregister('autoload_interface');
// Create test directories ahead of installation so fatal errors and debug
// information can be logged during installation process.
@@ -121,19 +123,19 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
// Load user 1.
$this->originalUser = $user;
- drupal_save_session(FALSE);
+ save_session(FALSE);
$user = db_query('SELECT * FROM {users} WHERE uid = :uid', array(':uid' => 1))->fetchObject();
// Generate and set a D6-compatible session cookie.
$this->curlInitialize();
- $sid = drupal_hash_base64(uniqid(mt_rand(), TRUE) . drupal_random_bytes(55));
+ $sid = hash_base64(uniqid(mt_rand(), TRUE) . random_bytes(55));
curl_setopt($this->curlHandle, CURLOPT_COOKIE, rawurlencode(session_name()) . '=' . rawurlencode($sid));
// Force our way into the session of the child site.
- drupal_save_session(TRUE);
- _drupal_session_write($sid, '');
+ save_session(TRUE);
+ _session_write($sid, '');
// Remove the temporarily added ssid column.
- drupal_save_session(FALSE);
+ save_session(FALSE);
// Restore necessary variables.
$this->variable_set('clean_url', $clean_url_original);
@@ -144,7 +146,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
}
/**
- * Override of DrupalWebTestCase::tearDown() specialized for upgrade testing.
+ * Override of WebTestCase::tearDown() specialized for upgrade testing.
*/
protected function tearDown() {
global $user, $language;
@@ -168,7 +170,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
// Return the user to the original one.
$user = $this->originalUser;
- drupal_save_session(TRUE);
+ save_session(TRUE);
// Ensure that internal logged in variable and cURL options are reset.
$this->loggedInUser = FALSE;
@@ -293,7 +295,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
// but not on the test client, we need to load the code here.
$new_modules = array_diff(module_list(TRUE), $this->loadedModules);
foreach ($new_modules as $module) {
- drupal_load('module', $module);
+ load('module', $module);
}
// Reload hook implementations
@@ -301,7 +303,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
// Rebuild caches.
drupal_static_reset();
- drupal_flush_all_caches();
+ flush_all_caches();
// Reload global $conf array and permissions.
$this->refreshVariables();
diff --git a/core/modules/simpletest/tests/upgrade/upgrade_bare.test b/core/modules/simpletest/tests/upgrade/upgrade_bare.test
index f507aea..9f38c8b 100644
--- a/core/modules/simpletest/tests/upgrade/upgrade_bare.test
+++ b/core/modules/simpletest/tests/upgrade/upgrade_bare.test
@@ -1,4 +1,5 @@
databaseDumpFiles = array(
- drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.bare.database.php.gz',
+ get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.bare.database.php.gz',
);
parent::setUp();
}
diff --git a/core/modules/simpletest/tests/upgrade/upgrade_filled.test b/core/modules/simpletest/tests/upgrade/upgrade_filled.test
index 9b17bda..99001d2 100644
--- a/core/modules/simpletest/tests/upgrade/upgrade_filled.test
+++ b/core/modules/simpletest/tests/upgrade/upgrade_filled.test
@@ -1,4 +1,5 @@
databaseDumpFiles = array(
- drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.filled.database.php.gz',
+ get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.filled.database.php.gz',
);
parent::setUp();
}
diff --git a/core/modules/simpletest/tests/url_alter_test.install b/core/modules/simpletest/tests/url_alter_test.install
index 6e09ab5..20ccec5 100644
--- a/core/modules/simpletest/tests/url_alter_test.install
+++ b/core/modules/simpletest/tests/url_alter_test.install
@@ -1,4 +1,5 @@
'XML-RPC validator',
@@ -194,7 +195,7 @@ class XMLRPCValidator1IncTestCase extends DrupalWebTestCase {
}
}
-class XMLRPCMessagesTestCase extends DrupalWebTestCase {
+class XMLRPCMessagesTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'XML-RPC message and alteration',
diff --git a/core/modules/simpletest/tests/xmlrpc_test.module b/core/modules/simpletest/tests/xmlrpc_test.module
index db8f113..41d1e2d 100644
--- a/core/modules/simpletest/tests/xmlrpc_test.module
+++ b/core/modules/simpletest/tests/xmlrpc_test.module
@@ -1,4 +1,5 @@
hits, _statistics_format_item($page->title, $page->path), t('%time ms', array('%time' => round($page->average_time))), format_interval(round($page->total_time / 1000)));
}
- drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
+ set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
$build['statistics_top_pages_table'] = array(
'#theme' => 'table',
'#header' => $header,
@@ -125,13 +126,13 @@ function statistics_top_visitors() {
$result = $query->execute();
$rows = array();
- $destination = drupal_get_destination();
+ $destination = get_destination();
foreach ($result as $account) {
$ban_link = $account->iid ? l(t('unblock IP address'), "admin/config/people/ip-blocking/delete/$account->iid", array('query' => $destination)) : l(t('block IP address'), "admin/config/people/ip-blocking/$account->hostname", array('query' => $destination));
$rows[] = array($account->hits, ($account->uid ? theme('username', array('account' => $account)) : $account->hostname), format_interval(round($account->total / 1000)), (user_access('block IP addresses') && !$account->uid) ? $ban_link : '');
}
- drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
+ set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
$build['statistics_top_visitors_table'] = array(
'#theme' => 'table',
'#header' => $header,
@@ -146,7 +147,7 @@ function statistics_top_visitors() {
* Menu callback; presents the "referrer" page.
*/
function statistics_top_referrers() {
- drupal_set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
+ set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
$header = array(
array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
@@ -199,7 +200,7 @@ function statistics_access_log($aid) {
l(url($access->path, array('absolute' => TRUE)), $access->path)
);
// It is safe to avoid filtering $access->title through check_plain because
- // it comes from drupal_get_title().
+ // it comes from get_title().
$rows[] = array(
array('data' => t('Title'), 'header' => TRUE),
$access->title
@@ -228,7 +229,7 @@ function statistics_access_log($aid) {
return $build;
}
else {
- drupal_not_found();
+ not_found();
}
}
@@ -254,7 +255,7 @@ function statistics_settings_form() {
'#type' => 'select',
'#title' => t('Discard access logs older than'),
'#default_value' => variable_get('statistics_flush_accesslog_timer', 259200),
- '#options' => array(0 => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'),
+ '#options' => array(0 => t('Never')) + map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'),
'#description' => t('Older access log entries (including referrer statistics) will be automatically discarded. (Requires a correctly configured
cron maintenance task.)', array('@cron' => url('admin/reports/status'))),
);
diff --git a/core/modules/statistics/statistics.install b/core/modules/statistics/statistics.install
index a5dc7f8..23f97f6 100644
--- a/core/modules/statistics/statistics.install
+++ b/core/modules/statistics/statistics.install
@@ -1,4 +1,5 @@
fields(array(
- 'title' => truncate_utf8(strip_tags(drupal_get_title()), 255),
+ 'title' => truncate_utf8(strip_tags(get_title()), 255),
'path' => truncate_utf8($_GET['q'], 255),
'url' => isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '',
'hostname' => ip_address(),
@@ -175,7 +176,7 @@ function statistics_menu() {
$items['admin/config/system/statistics'] = array(
'title' => 'Statistics',
'description' => 'Control details about what and how your site logs access statistics.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('statistics_settings_form'),
'access arguments' => array('administer statistics'),
'file' => 'statistics.admin.inc',
@@ -314,7 +315,7 @@ function statistics_block_info() {
if (variable_get('statistics_count_content_views', 0)) {
$blocks['popular']['info'] = t('Popular content');
// Too dynamic to cache.
- $blocks['popular']['cache'] = DRUPAL_NO_CACHE;
+ $blocks['popular']['cache'] = NO_CACHE;
}
return $blocks;
}
@@ -324,7 +325,7 @@ function statistics_block_info() {
*/
function statistics_block_configure($delta = '') {
// Popular content block settings
- $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
+ $numbers = array('0' => t('Disabled')) + map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
$form['statistics_block_top_day_num'] = array('#type' => 'select', '#title' => t("Number of day's top views to display"), '#default_value' => variable_get('statistics_block_top_day_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "day" list.'));
$form['statistics_block_top_all_num'] = array('#type' => 'select', '#title' => t('Number of all time views to display'), '#default_value' => variable_get('statistics_block_top_all_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "all time" list.'));
$form['statistics_block_top_last_num'] = array('#type' => 'select', '#title' => t('Number of most recent views to display'), '#default_value' => variable_get('statistics_block_top_last_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "recently viewed" list.'));
@@ -378,7 +379,7 @@ function statistics_block_view($delta = '') {
* statistics module.
*/
function _statistics_link($path, $width = 35) {
- $title = drupal_get_path_alias($path);
+ $title = get_path_alias($path);
$title = truncate_utf8($title, $width, FALSE, TRUE);
return l($title, $path);
}
diff --git a/core/modules/statistics/statistics.pages.inc b/core/modules/statistics/statistics.pages.inc
index 1d91609..0bcc141 100644
--- a/core/modules/statistics/statistics.pages.inc
+++ b/core/modules/statistics/statistics.pages.inc
@@ -1,4 +1,5 @@
title);
+ set_title($node->title);
$build['statistics_table'] = array(
'#theme' => 'table',
'#header' => $header,
@@ -48,7 +49,7 @@ function statistics_node_tracker() {
return $build;
}
else {
- drupal_not_found();
+ not_found();
}
}
@@ -75,7 +76,7 @@ function statistics_user_tracker() {
l(t('details'), "admin/reports/access/$log->aid"));
}
- drupal_set_title(user_format_name($account));
+ set_title(user_format_name($account));
$build['statistics_table'] = array(
'#theme' => 'table',
'#header' => $header,
@@ -86,6 +87,6 @@ function statistics_user_tracker() {
return $build;
}
else {
- drupal_not_found();
+ not_found();
}
}
diff --git a/core/modules/statistics/statistics.test b/core/modules/statistics/statistics.test
index 592f165..aa1df76 100644
--- a/core/modules/statistics/statistics.test
+++ b/core/modules/statistics/statistics.test
@@ -1,4 +1,6 @@
'Statistics logging tests',
@@ -218,7 +220,7 @@ class StatisticsReportsTestCase extends StatisticsTestCase {
$block->visibility = 0;
$edit = array('statistics_block_top_day_num' => 3, 'statistics_block_top_all_num' => 3, 'statistics_block_top_last_num' => 3);
module_invoke('statistics', 'block_save', 'popular', $edit);
- drupal_write_record('block', $block);
+ write_record('block', $block);
// Get some page and check if the block is displayed.
$this->drupalGet('user');
@@ -284,7 +286,7 @@ class StatisticsBlockVisitorsTestCase extends StatisticsTestCase {
/**
* Test statistics administration screen.
*/
-class StatisticsAdminTestCase extends DrupalWebTestCase {
+class StatisticsAdminTestCase extends WebTestCase {
protected $privileged_user;
protected $test_node;
diff --git a/core/modules/statistics/statistics.tokens.inc b/core/modules/statistics/statistics.tokens.inc
index c2c8fc3..61bd048 100644
--- a/core/modules/statistics/statistics.tokens.inc
+++ b/core/modules/statistics/statistics.tokens.inc
@@ -1,4 +1,5 @@
'Syslog functionality',
diff --git a/core/modules/system/html.tpl.php b/core/modules/system/html.tpl.php
index 960eefb..291f5fe 100644
--- a/core/modules/system/html.tpl.php
+++ b/core/modules/system/html.tpl.php
@@ -1,4 +1,5 @@
status report for more information.', array('@status' => url('admin/reports/status'))), 'error');
+ set_message(t('One or more problems were detected with your Drupal installation. Check the
status report for more information.', array('@status' => url('admin/reports/status'))), 'error');
}
$blocks = array();
if ($admin = db_query("SELECT menu_name, mlid FROM {menu_links} WHERE link_path = 'admin/config' AND module = 'system'")->fetchAssoc()) {
@@ -83,14 +85,14 @@ function system_admin_index() {
$module_info[$module] = new stdClass();
$module_info[$module]->info = $info;
}
- uasort($module_info, 'system_sort_modules_by_info_name');
+ uasort($module_info, 'Drupal\system_sort_modules_by_info_name');
$menu_items = array();
foreach ($module_info as $module => $info) {
// Only display a section if there are any available tasks.
if ($admin_tasks = system_get_module_admin_tasks($module, $info->info)) {
// Sort links by title.
- uasort($admin_tasks, 'drupal_sort_title');
+ uasort($admin_tasks, 'Drupal\sort_title');
// Move 'Configure permissions' links to the bottom of each section.
$permission_key = "admin/people/permissions#module-$module";
if (isset($admin_tasks[$permission_key])) {
@@ -110,7 +112,7 @@ function system_admin_index() {
*/
function system_settings_overview() {
// Check database setup if necessary
- if (function_exists('db_check_setup') && empty($_POST)) {
+ if (function_exists('Drupal\db_check_setup') && empty($_POST)) {
db_check_setup();
}
@@ -128,7 +130,7 @@ function system_settings_overview() {
function system_themes_page() {
// Get current list of themes.
$themes = system_rebuild_theme_data();
- uasort($themes, 'system_sort_modules_by_info_name');
+ uasort($themes, 'Drupal\system_sort_modules_by_info_name');
$theme_default = variable_get('theme_default', 'stark');
$theme_groups = array();
@@ -167,15 +169,15 @@ function system_themes_page() {
// Ensure this theme is compatible with this version of core.
// Require the 'content' region to make sure the main page
// content has a common place in all themes.
- $theme->incompatible_core = !isset($theme->info['core']) || ($theme->info['core'] != DRUPAL_CORE_COMPATIBILITY) || (!isset($theme->info['regions']['content']));
+ $theme->incompatible_core = !isset($theme->info['core']) || ($theme->info['core'] != CORE_COMPATIBILITY) || (!isset($theme->info['regions']['content']));
$theme->incompatible_php = version_compare(phpversion(), $theme->info['php']) < 0;
}
- $query['token'] = drupal_get_token('system-theme-operation-link');
+ $query['token'] = get_token('system-theme-operation-link');
$theme->operations = array();
if (!empty($theme->status) || !$theme->incompatible_core && !$theme->incompatible_php) {
// Create the operations links.
$query['theme'] = $theme->name;
- if (drupal_theme_access($theme)) {
+ if (theme_access($theme)) {
$theme->operations[] = array(
'title' => t('Settings'),
'href' => 'admin/appearance/settings/' . $theme->name,
@@ -234,10 +236,10 @@ function system_themes_page() {
$theme_group_titles['disabled'] = format_plural(count($theme_groups['disabled']), 'Disabled theme', 'Disabled themes');
}
- uasort($theme_groups['enabled'], 'system_sort_themes');
- drupal_alter('system_themes_page', $theme_groups);
+ uasort($theme_groups['enabled'], 'Drupal\system_sort_themes');
+ alter('system_themes_page', $theme_groups);
- $admin_form = drupal_get_form('system_themes_admin_form', $admin_theme_options);
+ $admin_form = get_form('system_themes_admin_form', $admin_theme_options);
return theme('system_themes_page', array('theme_groups' => $theme_groups, 'theme_group_titles' => $theme_group_titles)) . drupal_render($admin_form);
}
@@ -272,7 +274,7 @@ function system_themes_admin_form($form, &$form_state, $theme_options) {
* Process system_themes_admin_form form submissions.
*/
function system_themes_admin_form_submit($form, &$form_state) {
- drupal_set_message(t('The configuration options have been saved.'));
+ set_message(t('The configuration options have been saved.'));
variable_set('admin_theme', $form_state['values']['admin_theme']);
}
@@ -280,7 +282,7 @@ function system_themes_admin_form_submit($form, &$form_state) {
* Menu callback; Enables a theme.
*/
function system_theme_enable() {
- if (isset($_REQUEST['theme']) && isset($_REQUEST['token']) && drupal_valid_token($_REQUEST['token'], 'system-theme-operation-link')) {
+ if (isset($_REQUEST['theme']) && isset($_REQUEST['token']) && valid_token($_REQUEST['token'], 'system-theme-operation-link')) {
$theme = $_REQUEST['theme'];
// Get current list of themes.
$themes = list_themes();
@@ -288,21 +290,21 @@ function system_theme_enable() {
// Check if the specified theme is one recognized by the system.
if (!empty($themes[$theme])) {
theme_enable(array($theme));
- drupal_set_message(t('The %theme theme has been enabled.', array('%theme' => $themes[$theme]->info['name'])));
+ set_message(t('The %theme theme has been enabled.', array('%theme' => $themes[$theme]->info['name'])));
}
else {
- drupal_set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
+ set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
}
- drupal_goto('admin/appearance');
+ redirect('admin/appearance');
}
- return drupal_access_denied();
+ return access_denied();
}
/**
* Menu callback; Disables a theme.
*/
function system_theme_disable() {
- if (isset($_REQUEST['theme']) && isset($_REQUEST['token']) && drupal_valid_token($_REQUEST['token'], 'system-theme-operation-link')) {
+ if (isset($_REQUEST['theme']) && isset($_REQUEST['token']) && valid_token($_REQUEST['token'], 'system-theme-operation-link')) {
$theme = $_REQUEST['theme'];
// Get current list of themes.
$themes = list_themes();
@@ -311,26 +313,26 @@ function system_theme_disable() {
if (!empty($themes[$theme])) {
if ($theme == variable_get('theme_default', 'stark')) {
// Don't disable the default theme.
- drupal_set_message(t('%theme is the default theme and cannot be disabled.', array('%theme' => $themes[$theme]->info['name'])), 'error');
+ set_message(t('%theme is the default theme and cannot be disabled.', array('%theme' => $themes[$theme]->info['name'])), 'error');
}
else {
theme_disable(array($theme));
- drupal_set_message(t('The %theme theme has been disabled.', array('%theme' => $themes[$theme]->info['name'])));
+ set_message(t('The %theme theme has been disabled.', array('%theme' => $themes[$theme]->info['name'])));
}
}
else {
- drupal_set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
+ set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
}
- drupal_goto('admin/appearance');
+ redirect('admin/appearance');
}
- return drupal_access_denied();
+ return access_denied();
}
/**
* Menu callback; Set the default theme.
*/
function system_theme_default() {
- if (isset($_REQUEST['theme']) && isset($_REQUEST['token']) && drupal_valid_token($_REQUEST['token'], 'system-theme-operation-link')) {
+ if (isset($_REQUEST['theme']) && isset($_REQUEST['token']) && valid_token($_REQUEST['token'], 'system-theme-operation-link')) {
$theme = $_REQUEST['theme'];
// Get current list of themes.
$themes = list_themes();
@@ -355,21 +357,21 @@ function system_theme_default() {
// a value of 0 means the admin theme is set to be the default theme.
$admin_theme = variable_get('admin_theme', 0);
if ($admin_theme != 0 && $admin_theme != $theme) {
- drupal_set_message(t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', array(
+ set_message(t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', array(
'%admin_theme' => $themes[$admin_theme]->info['name'],
'%selected_theme' => $themes[$theme]->info['name'],
)));
}
else {
- drupal_set_message(t('%theme is now the default theme.', array('%theme' => $themes[$theme]->info['name'])));
+ set_message(t('%theme is now the default theme.', array('%theme' => $themes[$theme]->info['name'])));
}
}
else {
- drupal_set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
+ set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
}
- drupal_goto('admin/appearance');
+ redirect('admin/appearance');
}
- return drupal_access_denied();
+ return access_denied();
}
/**
@@ -526,7 +528,7 @@ function system_theme_settings($form, &$form_state, $key = '') {
if ($key) {
// Call engine-specific settings.
- $function = $themes[$key]->prefix . '_engine_settings';
+ $function = 'Drupal\\' . $themes[$key]->prefix . '_engine_settings';
if (function_exists($function)) {
$form['engine_specific'] = array(
'#type' => 'fieldset',
@@ -554,13 +556,13 @@ function system_theme_settings($form, &$form_state, $key = '') {
// Process the theme and all its base themes.
foreach ($theme_keys as $theme) {
// Include the theme-settings.php file.
- $filename = DRUPAL_ROOT . '/' . str_replace("/$theme.info", '', $themes[$theme]->filename) . '/theme-settings.php';
+ $filename = ROOT . '/' . str_replace("/$theme.info", '', $themes[$theme]->filename) . '/theme-settings.php';
if (file_exists($filename)) {
require_once $filename;
}
// Call theme-specific settings.
- $function = $theme . '_form_system_theme_settings_alter';
+ $function = 'Drupal\\' . $theme . '_form_system_theme_settings_alter';
if (function_exists($function)) {
$function($form, $form_state);
}
@@ -704,7 +706,7 @@ function system_theme_settings_submit($form, &$form_state) {
}
variable_set($key, $values);
- drupal_set_message(t('The configuration options have been saved.'));
+ set_message(t('The configuration options have been saved.'));
cache_clear_all();
}
@@ -741,7 +743,7 @@ function _system_is_incompatible(&$incompatible, $files, $file) {
*
* The list of modules gets populated by module.info files, which contain each
* module's name, description, and information about which modules it requires.
- * See drupal_parse_info_file() for information on module.info descriptors.
+ * See parse_info_file() for information on module.info descriptors.
*
* Dependency checking is performed to ensure that a module:
* - can not be enabled if there are disabled modules it requires.
@@ -769,7 +771,7 @@ function system_modules($form, $form_state = array()) {
}
}
- uasort($visible_files, 'system_sort_modules_by_info_name');
+ uasort($visible_files, 'Drupal\system_sort_modules_by_info_name');
// If the modules form was submitted, then system_modules_submit() runs first
// and if there are unfilled required modules, then $form_state['storage'] is
@@ -783,11 +785,11 @@ function system_modules($form, $form_state = array()) {
$form['modules'] = array('#tree' => TRUE);
// Used when checking if module implements a help page.
- $help_arg = module_exists('help') ? drupal_help_arg() : FALSE;
+ $help_arg = module_exists('help') ? help_arg() : FALSE;
// Used when displaying modules that are required by the install profile.
- require_once DRUPAL_ROOT . '/core/includes/install.inc';
- $distribution_name = check_plain(drupal_install_profile_distribution_name());
+ require_once ROOT . '/core/includes/install.inc';
+ $distribution_name = check_plain(install_profile_distribution_name());
// Iterate through each of the modules.
foreach ($visible_files as $filename => $module) {
@@ -808,7 +810,7 @@ function system_modules($form, $form_state = array()) {
elseif (isset($visible_files[$requires])) {
$requires_name = $files[$requires]->info['name'];
// Disable this module if it is incompatible with the dependency's version.
- if ($incompatible_version = drupal_check_incompatibility($v, str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', $files[$requires]->info['version']))) {
+ if ($incompatible_version = check_incompatibility($v, str_replace(CORE_COMPATIBILITY . '-', '', $files[$requires]->info['version']))) {
$extra['requires'][$requires] = t('@module (
incompatible with version @version)', array(
'@module' => $requires_name . $incompatible_version,
'@version' => $files[$requires]->info['version'],
@@ -817,7 +819,7 @@ function system_modules($form, $form_state = array()) {
}
// Disable this module if the dependency is incompatible with this
// version of Drupal core.
- elseif ($files[$requires]->info['core'] != DRUPAL_CORE_COMPATIBILITY) {
+ elseif ($files[$requires]->info['core'] != CORE_COMPATIBILITY) {
$extra['requires'][$requires] = t('@module (
incompatible with this version of Drupal core)', array(
'@module' => $requires_name,
));
@@ -902,7 +904,7 @@ function system_modules($form, $form_state = array()) {
}
// Lastly, sort all fieldsets by title.
- uasort($form['modules'], 'element_sort_by_title');
+ uasort($form['modules'], 'Drupal\element_sort_by_title');
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
@@ -968,10 +970,10 @@ function _system_modules_build_row($info, $extra) {
$status_long = '';
// Check the core compatibility.
- if (!isset($info['core']) || $info['core'] != DRUPAL_CORE_COMPATIBILITY) {
+ if (!isset($info['core']) || $info['core'] != CORE_COMPATIBILITY) {
$compatible = FALSE;
$status_short .= t('Incompatible with this version of Drupal core.');
- $status_long .= t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => DRUPAL_CORE_COMPATIBILITY));
+ $status_long .= t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => CORE_COMPATIBILITY));
}
// Ensure this module is compatible with the currently installed version of PHP.
@@ -1064,7 +1066,7 @@ function system_modules_confirm_form($modules, $storage) {
* Submit callback; handles modules form submission.
*/
function system_modules_submit($form, &$form_state) {
- include_once DRUPAL_ROOT . '/core/includes/install.inc';
+ include_once ROOT . '/core/includes/install.inc';
// Builds list of modules.
$modules = array();
@@ -1140,8 +1142,8 @@ function system_modules_submit($form, &$form_state) {
// the dependent modules aren't installed either.
foreach ($modules as $name => $module) {
// Only invoke hook_requirements() on modules that are going to be installed.
- if ($module['enabled'] && drupal_get_installed_schema_version($name) == SCHEMA_UNINSTALLED) {
- if (!drupal_check_module($name)) {
+ if ($module['enabled'] && get_installed_schema_version($name) == SCHEMA_UNINSTALLED) {
+ if (!check_module($name)) {
$modules[$name]['enabled'] = FALSE;
foreach (array_keys($files[$name]->required_by) as $required_by) {
$modules[$required_by]['enabled'] = FALSE;
@@ -1160,7 +1162,7 @@ function system_modules_submit($form, &$form_state) {
// Builds arrays of modules that need to be enabled, disabled, and installed.
foreach ($modules as $name => $module) {
if ($module['enabled']) {
- if (drupal_get_installed_schema_version($name) == SCHEMA_UNINSTALLED) {
+ if (get_installed_schema_version($name) == SCHEMA_UNINSTALLED) {
$actions['install'][] = $name;
$actions['enable'][] = $name;
}
@@ -1189,8 +1191,8 @@ function system_modules_submit($form, &$form_state) {
// message if there are changes.
$post_install_list = module_list(TRUE);
if ($pre_install_list != $post_install_list) {
- drupal_flush_all_caches();
- drupal_set_message(t('The configuration options have been saved.'));
+ flush_all_caches();
+ set_message(t('The configuration options have been saved.'));
}
$form_state['redirect'] = 'admin/modules';
@@ -1213,7 +1215,7 @@ function system_modules_submit($form, &$form_state) {
*/
function system_modules_uninstall($form, $form_state = NULL) {
// Make sure the install API is available.
- include_once DRUPAL_ROOT . '/core/includes/install.inc';
+ include_once ROOT . '/core/includes/install.inc';
// Display the confirm form if any modules have been submitted.
if (!empty($form_state['storage']) && $confirm_form = system_modules_uninstall_confirm_form($form_state['storage'])) {
@@ -1232,8 +1234,8 @@ function system_modules_uninstall($form, $form_state = NULL) {
// Only build the rest of the form if there are any modules available to
// uninstall.
if (!empty($disabled_modules)) {
- $profile = drupal_get_profile();
- uasort($disabled_modules, 'system_sort_modules_by_info_name');
+ $profile = get_profile();
+ uasort($disabled_modules, 'Drupal\system_sort_modules_by_info_name');
$form['uninstall'] = array('#tree' => TRUE);
foreach ($disabled_modules as $module) {
$module_name = $module->info['name'] ? $module->info['name'] : $module->name;
@@ -1249,7 +1251,7 @@ function system_modules_uninstall($form, $form_state = NULL) {
// we can allow this module to be uninstalled. (The install profile is
// excluded from this list.)
foreach (array_keys($module->required_by) as $dependent) {
- if ($dependent != $profile && drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) {
+ if ($dependent != $profile && get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) {
$dependent_name = isset($all_modules[$dependent]->info['name']) ? $all_modules[$dependent]->info['name'] : $dependent;
$form['modules'][$module->name]['#required_by'][] = $dependent_name;
$form['uninstall'][$module->name]['#disabled'] = TRUE;
@@ -1287,7 +1289,7 @@ function system_modules_uninstall_confirm_form($storage) {
// Construct the hidden form elements and list items.
foreach (array_filter($storage['uninstall']) as $module => $value) {
- $info = drupal_parse_info_file(drupal_get_path('module', $module) . '/' . $module . '.info');
+ $info = parse_info_file(get_path('module', $module) . '/' . $module . '.info');
$uninstall[] = $info['name'];
$form['uninstall'][$module] = array('#type' => 'hidden',
'#value' => 1,
@@ -1316,8 +1318,8 @@ function system_modules_uninstall_confirm_form($storage) {
function system_modules_uninstall_validate($form, &$form_state) {
// Form submitted, but no modules selected.
if (!count(array_filter($form_state['values']['uninstall']))) {
- drupal_set_message(t('No modules selected.'), 'error');
- drupal_goto('admin/modules/uninstall');
+ set_message(t('No modules selected.'), 'error');
+ redirect('admin/modules/uninstall');
}
}
@@ -1326,13 +1328,13 @@ function system_modules_uninstall_validate($form, &$form_state) {
*/
function system_modules_uninstall_submit($form, &$form_state) {
// Make sure the install API is available.
- include_once DRUPAL_ROOT . '/core/includes/install.inc';
+ include_once ROOT . '/core/includes/install.inc';
if (!empty($form['#confirmed'])) {
// Call the uninstall routine for each selected module.
$modules = array_keys($form_state['values']['uninstall']);
- drupal_uninstall_modules($modules);
- drupal_set_message(t('The selected modules have been uninstalled.'));
+ uninstall_modules($modules);
+ set_message(t('The selected modules have been uninstalled.'));
$form_state['redirect'] = 'admin/modules/uninstall';
}
@@ -1346,7 +1348,7 @@ function system_modules_uninstall_submit($form, &$form_state) {
* Menu callback. Display blocked IP addresses.
*
* @param $default_ip
- * Optional IP address to be passed on to drupal_get_form() for
+ * Optional IP address to be passed on to get_form() for
* use as the default value of the IP address form field.
*/
function system_ip_blocking($default_ip = '') {
@@ -1360,7 +1362,7 @@ function system_ip_blocking($default_ip = '') {
);
}
- $build['system_ip_blocking_form'] = drupal_get_form('system_ip_blocking_form', $default_ip);
+ $build['system_ip_blocking_form'] = get_form('system_ip_blocking_form', $default_ip);
$build['system_ip_blocking_table'] = array(
'#theme' => 'table',
@@ -1415,7 +1417,7 @@ function system_ip_blocking_form_submit($form, &$form_state) {
db_insert('blocked_ips')
->fields(array('ip' => $ip))
->execute();
- drupal_set_message(t('The IP address %ip has been blocked.', array('%ip' => $ip)));
+ set_message(t('The IP address %ip has been blocked.', array('%ip' => $ip)));
$form_state['redirect'] = 'admin/config/people/ip-blocking';
return;
}
@@ -1442,7 +1444,7 @@ function system_ip_blocking_delete_submit($form, &$form_state) {
->condition('iid', $blocked_ip['iid'])
->execute();
watchdog('user', 'Deleted %ip', array('%ip' => $blocked_ip['ip']));
- drupal_set_message(t('The IP address %ip was deleted.', array('%ip' => $blocked_ip['ip'])));
+ set_message(t('The IP address %ip was deleted.', array('%ip' => $blocked_ip['ip'])));
$form_state['redirect'] = 'admin/config/people/ip-blocking';
}
@@ -1483,7 +1485,7 @@ function system_site_information_settings() {
$form['front_page']['site_frontpage'] = array(
'#type' => 'textfield',
'#title' => t('Default front page'),
- '#default_value' => (variable_get('site_frontpage') != 'user' ? drupal_get_path_alias(variable_get('site_frontpage', 'user')) : ''),
+ '#default_value' => (variable_get('site_frontpage') != 'user' ? get_path_alias(variable_get('site_frontpage', 'user')) : ''),
'#size' => 40,
'#description' => t('Optionally, specify a relative URL to display as the front page. Leave blank to display the default content feed.'),
'#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
@@ -1491,7 +1493,7 @@ function system_site_information_settings() {
$form['front_page']['default_nodes_main'] = array(
'#type' => 'select', '#title' => t('Number of posts on front page'),
'#default_value' => variable_get('default_nodes_main', 10),
- '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
+ '#options' => map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
'#description' => t('The maximum number of posts displayed on overview pages such as the front page.'),
'#access' => (variable_get('site_frontpage') == 'node'),
);
@@ -1536,25 +1538,25 @@ function system_site_information_settings_validate($form, &$form_state) {
}
else {
// Get the normal path of the front page.
- form_set_value($form['front_page']['site_frontpage'], drupal_get_normal_path($form_state['values']['site_frontpage']), $form_state);
+ form_set_value($form['front_page']['site_frontpage'], get_normal_path($form_state['values']['site_frontpage']), $form_state);
}
// Validate front page path.
- if (!drupal_valid_path($form_state['values']['site_frontpage'])) {
+ if (!valid_path($form_state['values']['site_frontpage'])) {
form_set_error('site_frontpage', t("The path '%path' is either invalid or you do not have access to it.", array('%path' => $form_state['values']['site_frontpage'])));
}
// Get the normal paths of both error pages.
if (!empty($form_state['values']['site_403'])) {
- form_set_value($form['error_page']['site_403'], drupal_get_normal_path($form_state['values']['site_403']), $form_state);
+ form_set_value($form['error_page']['site_403'], get_normal_path($form_state['values']['site_403']), $form_state);
}
if (!empty($form_state['values']['site_404'])) {
- form_set_value($form['error_page']['site_404'], drupal_get_normal_path($form_state['values']['site_404']), $form_state);
+ form_set_value($form['error_page']['site_404'], get_normal_path($form_state['values']['site_404']), $form_state);
}
// Validate 403 error path.
- if (!empty($form_state['values']['site_403']) && !drupal_valid_path($form_state['values']['site_403'])) {
+ if (!empty($form_state['values']['site_403']) && !valid_path($form_state['values']['site_403'])) {
form_set_error('site_403', t("The path '%path' is either invalid or you do not have access to it.", array('%path' => $form_state['values']['site_403'])));
}
// Validate 404 error path.
- if (!empty($form_state['values']['site_404']) && !drupal_valid_path($form_state['values']['site_404'])) {
+ if (!empty($form_state['values']['site_404']) && !valid_path($form_state['values']['site_404'])) {
form_set_error('site_404', t("The path '%path' is either invalid or you do not have access to it.", array('%path' => $form_state['values']['site_404'])));
}
}
@@ -1584,8 +1586,8 @@ function system_cron_settings() {
$form['cron']['cron_safe_threshold'] = array(
'#type' => 'select',
'#title' => t('Run cron every'),
- '#default_value' => variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD),
- '#options' => array(0 => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 43200, 86400, 604800), 'format_interval'),
+ '#default_value' => variable_get('cron_safe_threshold', CRON_DEFAULT_THRESHOLD),
+ '#options' => array(0 => t('Never')) + map_assoc(array(3600, 10800, 21600, 43200, 86400, 604800), 'Drupal\format_interval'),
);
return system_settings_form($form);
@@ -1598,14 +1600,14 @@ function system_cron_settings() {
*/
function system_run_cron_submit($form, &$form_state) {
// Run cron manually from Cron form.
- if (drupal_cron_run()) {
- drupal_set_message(t('Cron run successfully.'));
+ if (cron_run()) {
+ set_message(t('Cron run successfully.'));
}
else {
- drupal_set_message(t('Cron run failed.'), 'error');
+ set_message(t('Cron run failed.'), 'error');
}
- drupal_goto('admin/config/system/cron');
+ redirect('admin/config/system/cron');
}
/**
@@ -1637,7 +1639,7 @@ function system_logging_settings() {
* @see system_settings_form()
*/
function system_performance_settings() {
- drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
+ add_js(get_path('module', 'system') . '/system.js');
$form['clear_cache'] = array(
'#type' => 'fieldset',
@@ -1662,7 +1664,7 @@ function system_performance_settings() {
'#default_value' => $cache,
'#weight' => -2,
);
- $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval');
+ $period = map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'Drupal\format_interval');
$period[0] = '<' . t('none') . '>';
$form['caching']['cache_lifetime'] = array(
'#type' => 'select',
@@ -1714,8 +1716,8 @@ function system_performance_settings() {
'#disabled' => $disabled,
);
- $form['#submit'][] = 'drupal_clear_css_cache';
- $form['#submit'][] = 'drupal_clear_js_cache';
+ $form['#submit'][] = 'clear_css_cache';
+ $form['#submit'][] = 'clear_js_cache';
// This form allows page compression settings to be changed, which can
// invalidate the page cache, so it needs to be cleared on form submit.
$form['#submit'][] = 'system_clear_page_cache_submit';
@@ -1729,8 +1731,8 @@ function system_performance_settings() {
* @ingroup forms
*/
function system_clear_cache_submit($form, &$form_state) {
- drupal_flush_all_caches();
- drupal_set_message(t('Caches cleared.'));
+ flush_all_caches();
+ set_message(t('Caches cleared.'));
}
/**
@@ -1825,7 +1827,7 @@ function system_image_toolkit_settings() {
}
// Get the toolkit's settings form.
- $function = 'image_' . $current_toolkit . '_settings';
+ $function = 'Drupal\image_' . $current_toolkit . '_settings';
if (function_exists($function)) {
$form['image_toolkit_settings'] = $function();
}
@@ -1850,7 +1852,7 @@ function system_rss_feeds_settings() {
'#type' => 'select',
'#title' => t('Number of items in each feed'),
'#default_value' => variable_get('feed_default_items', 10),
- '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
+ '#options' => map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
'#description' => t('Default number of items to include in each feed.')
);
$form['feed_item_length'] = array(
@@ -1872,7 +1874,7 @@ function system_rss_feeds_settings() {
* @see system_regional_settings_submit()
*/
function system_regional_settings() {
- include_once DRUPAL_ROOT . '/core/includes/locale.inc';
+ include_once ROOT . '/core/includes/locale.inc';
$countries = country_get_list();
// Date settings:
@@ -1938,11 +1940,11 @@ function system_regional_settings() {
$form['timezone']['configurable_timezones_wrapper']['user_default_timezone'] = array(
'#type' => 'radios',
'#title' => t('Time zone for new users'),
- '#default_value' => variable_get('user_default_timezone', DRUPAL_USER_TIMEZONE_DEFAULT),
+ '#default_value' => variable_get('user_default_timezone', USER_TIMEZONE_DEFAULT),
'#options' => array(
- DRUPAL_USER_TIMEZONE_DEFAULT => t('Default time zone.'),
- DRUPAL_USER_TIMEZONE_EMPTY => t('Empty time zone.'),
- DRUPAL_USER_TIMEZONE_SELECT => t('Users may set their own time zone at registration.'),
+ USER_TIMEZONE_DEFAULT => t('Default time zone.'),
+ USER_TIMEZONE_EMPTY => t('Empty time zone.'),
+ USER_TIMEZONE_SELECT => t('Users may set their own time zone at registration.'),
),
'#description' => t('Only applied if users may set their own time zone.')
);
@@ -1958,12 +1960,12 @@ function system_regional_settings() {
*/
function system_date_time_settings() {
// Get list of all available date types.
- drupal_static_reset('system_get_date_types');
+ drupal_static_reset('Drupal\system_get_date_types');
$format_types = system_get_date_types();
// Get list of all available date formats.
$all_formats = array();
- drupal_static_reset('system_get_date_formats');
+ drupal_static_reset('Drupal\system_get_date_formats');
$date_formats = system_get_date_formats(); // Call this to rebuild the list, and to have default list.
foreach ($date_formats as $type => $format_info) {
$all_formats = array_merge($all_formats, $format_info);
@@ -2053,7 +2055,7 @@ function theme_system_date_time_settings($variables) {
}
$output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'system-date-types')));
- $output .= drupal_render_children($form);
+ $output .= render_children($form);
return $output;
}
@@ -2082,7 +2084,7 @@ function system_add_date_format_type_form($form, &$form_state) {
// Get list of all available date formats.
$formats = array();
- drupal_static_reset('system_get_date_formats');
+ drupal_static_reset('Drupal\system_get_date_formats');
$date_formats = system_get_date_formats(); // Call this to rebuild the list, and to have default list.
foreach ($date_formats as $type => $format_info) {
$formats = array_merge($formats, $format_info);
@@ -2145,7 +2147,7 @@ function system_add_date_format_type_form_submit($form, &$form_state) {
system_date_format_type_save($format_type);
variable_set('date_format_' . $machine_name, $form_state['values']['date_format']);
- drupal_set_message(t('New date type added successfully.'));
+ set_message(t('New date type added successfully.'));
$form_state['redirect'] = 'admin/config/regional/date-time';
}
@@ -2154,7 +2156,7 @@ function system_add_date_format_type_form_submit($form, &$form_state) {
*/
function system_date_time_lookup() {
$result = format_date(REQUEST_TIME, 'custom', $_GET['format']);
- drupal_json_output($result);
+ json_output($result);
}
/**
@@ -2195,13 +2197,13 @@ function system_clean_url_settings($form, &$form_state) {
$available = TRUE;
}
else {
- $request = drupal_http_request($GLOBALS['base_url'] . '/admin/config/search/clean-urls/check');
+ $request = http_request($GLOBALS['base_url'] . '/admin/config/search/clean-urls/check');
// If the request returns HTTP 200, clean URLs are available.
if (isset($request->code) && $request->code == 200) {
$available = TRUE;
// If the user started the clean URL test, provide explicit feedback.
if (isset($form_state['input']['clean_url_test_execute'])) {
- drupal_set_message(t('The clean URL test passed.'));
+ set_message(t('The clean URL test passed.'));
}
}
else {
@@ -2212,12 +2214,12 @@ function system_clean_url_settings($form, &$form_state) {
// Warn the user of a conflicting situation, unless after processing
// a submitted form.
if (!isset($form_state['input']['op'])) {
- drupal_set_message(t('Clean URLs are enabled, but the clean URL test failed. Uncheck the box below to disable clean URLs.'), 'warning');
+ set_message(t('Clean URLs are enabled, but the clean URL test failed. Uncheck the box below to disable clean URLs.'), 'warning');
}
}
// If the user started the clean URL test, provide explicit feedback.
elseif (isset($form_state['input']['clean_url_test_execute'])) {
- drupal_set_message(t('The clean URL test failed.'), 'warning');
+ set_message(t('The clean URL test failed.'), 'warning');
}
}
}
@@ -2240,7 +2242,7 @@ function system_clean_url_settings($form, &$form_state) {
}
// Show the clean URLs test form.
else {
- drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
+ add_js(get_path('module', 'system') . '/system.js');
$form_state['redirect'] = url('admin/config/search/clean-urls');
$form['clean_url_description'] = array(
@@ -2277,15 +2279,15 @@ function system_clean_url_settings($form, &$form_state) {
*/
function system_status($check = FALSE) {
// Load .install files
- include_once DRUPAL_ROOT . '/core/includes/install.inc';
- drupal_load_updates();
+ include_once ROOT . '/core/includes/install.inc';
+ load_updates();
// Check run-time requirements and status information.
$requirements = module_invoke_all('requirements', 'runtime');
- usort($requirements, '_system_sort_requirements');
+ usort($requirements, 'Drupal\_system_sort_requirements');
if ($check) {
- return drupal_requirements_severity($requirements) == REQUIREMENT_ERROR;
+ return requirements_severity($requirements) == REQUIREMENT_ERROR;
}
// MySQL import might have set the uid of the anonymous user to autoincrement
// value. Let's try fixing it. See http://drupal.org/node/204411
@@ -2303,14 +2305,14 @@ function system_status($check = FALSE) {
*/
function system_run_cron() {
// Run cron manually
- if (drupal_cron_run()) {
- drupal_set_message(t('Cron ran successfully.'));
+ if (cron_run()) {
+ set_message(t('Cron ran successfully.'));
}
else {
- drupal_set_message(t('Cron run failed.'), 'error');
+ set_message(t('Cron run failed.'), 'error');
}
- drupal_goto('admin/reports/status');
+ redirect('admin/reports/status');
}
/**
@@ -2325,16 +2327,16 @@ function system_php() {
* Default page callback for batches.
*/
function system_batch_page() {
- require_once DRUPAL_ROOT . '/core/includes/batch.inc';
+ require_once ROOT . '/core/includes/batch.inc';
$output = _batch_page();
if ($output === FALSE) {
- drupal_access_denied();
+ access_denied();
}
elseif (isset($output)) {
// Force a page without blocks or messages to
// display a list of collected messages later.
- drupal_set_page_content($output);
+ set_page_content($output);
$page = element_info('page');
$page['#show_messages'] = FALSE;
return $page;
@@ -2662,7 +2664,7 @@ function theme_system_modules_uninstall($variables) {
}
$output = theme('table', array('header' => $header, 'rows' => $rows, 'empty' => t('No modules are available to uninstall.')));
- $output .= drupal_render_children($form);
+ $output .= render_children($form);
return $output;
}
@@ -2705,7 +2707,7 @@ function theme_system_themes_page($variables) {
// Make sure to provide feedback on compatibility.
if (!empty($theme->incompatible_core)) {
- $output .= '
' . t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => DRUPAL_CORE_COMPATIBILITY)) . '
';
+ $output .= '
' . t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => CORE_COMPATIBILITY)) . '
';
}
elseif (!empty($theme->incompatible_php)) {
if (substr_count($theme->info['php'], '.') < 2) {
@@ -2753,7 +2755,7 @@ function system_date_delete_format_form_submit($form, &$form_state) {
if ($form_state['values']['confirm']) {
$format = system_get_date_format($form_state['values']['dfid']);
system_date_format_delete($form_state['values']['dfid']);
- drupal_set_message(t('Removed date format %format.', array('%format' => format_date(REQUEST_TIME, 'custom', $format->format))));
+ set_message(t('Removed date format %format.', array('%format' => format_date(REQUEST_TIME, 'custom', $format->format))));
$form_state['redirect'] = 'admin/config/regional/date-time/formats';
}
}
@@ -2786,7 +2788,7 @@ function system_delete_date_format_type_form_submit($form, &$form_state) {
if ($form_state['values']['confirm']) {
$type_info = system_get_date_types($form_state['values']['format_type']);
system_date_format_type_delete($form_state['values']['format_type']);
- drupal_set_message(t('Removed date type %type.', array('%type' => $type_info['title'])));
+ set_message(t('Removed date type %type.', array('%type' => $type_info['title'])));
$form_state['redirect'] = 'admin/config/regional/date-time';
}
}
@@ -2799,7 +2801,7 @@ function system_date_time_formats() {
$header = array(t('Format'), array('data' => t('Operations'), 'colspan' => '2'));
$rows = array();
- drupal_static_reset('system_get_date_formats');
+ drupal_static_reset('Drupal\system_get_date_formats');
$formats = system_get_date_formats('custom');
if (!empty($formats)) {
foreach ($formats as $format) {
@@ -2855,7 +2857,7 @@ function system_configure_date_formats_form($form, &$form_state, $dfid = 0) {
'#default_value' => ($dfid ? $format->format : ''),
'#field_suffix' => '
' . $now . '',
'#attached' => array(
- 'js' => array(drupal_get_path('module', 'system') . '/system.js', $js_settings),
+ 'js' => array(get_path('module', 'system') . '/system.js', $js_settings),
),
'#required' => TRUE,
);
@@ -2893,12 +2895,12 @@ function system_add_date_formats_form_submit($form, &$form_state) {
$format['locked'] = 0;
if (!empty($form_state['values']['dfid'])) {
system_date_format_save($format, $form_state['values']['dfid']);
- drupal_set_message(t('Custom date format updated.'));
+ set_message(t('Custom date format updated.'));
}
else {
$format['is_new'] = 1;
system_date_format_save($format);
- drupal_set_message(t('Custom date format added.'));
+ set_message(t('Custom date format added.'));
}
$form_state['redirect'] = 'admin/config/regional/date-time/formats';
@@ -2956,7 +2958,7 @@ function system_actions_manage() {
}
if ($actions_map) {
- $build['system_actions_manage_form'] = drupal_get_form('system_actions_manage_form', $options);
+ $build['system_actions_manage_form'] = get_form('system_actions_manage_form', $options);
}
return $build;
@@ -3027,7 +3029,7 @@ function system_actions_manage_form_submit($form, &$form_state) {
*/
function system_actions_configure($form, &$form_state, $action = NULL) {
if ($action === NULL) {
- drupal_goto('admin/config/system/actions');
+ redirect('admin/config/system/actions');
}
$actions_map = actions_actions_map(actions_list());
@@ -3041,7 +3043,7 @@ function system_actions_configure($form, &$form_state, $action = NULL) {
$edit['actions_label'] = $data->label;
$edit['actions_type'] = $data->type;
$function = $data->callback;
- $action = drupal_hash_base64($data->callback);
+ $action = hash_base64($data->callback);
$params = unserialize($data->parameters);
if ($params) {
foreach ($params as $name => $val) {
@@ -3064,7 +3066,7 @@ function system_actions_configure($form, &$form_state, $action = NULL) {
'#description' => t('A unique label for this advanced action. This label will be displayed in the interface of modules that integrate with actions.'),
'#weight' => -10
);
- $action_form = $function . '_form';
+ $action_form = 'Drupal\\' . $function . '_form';
$form = array_merge($form, $action_form($edit));
$form['actions_type'] = array(
'#type' => 'value',
@@ -3099,7 +3101,7 @@ function system_actions_configure($form, &$form_state, $action = NULL) {
* Validate system_actions_configure() form submissions.
*/
function system_actions_configure_validate($form, &$form_state) {
- $function = actions_function_lookup($form_state['values']['actions_action']) . '_validate';
+ $function = 'Drupal\\' . actions_function_lookup($form_state['values']['actions_action']) . '_validate';
// Hand off validation to the action.
if (function_exists($function)) {
$function($form, $form_state);
@@ -3111,14 +3113,14 @@ function system_actions_configure_validate($form, &$form_state) {
*/
function system_actions_configure_submit($form, &$form_state) {
$function = actions_function_lookup($form_state['values']['actions_action']);
- $submit_function = $function . '_submit';
+ $submit_function = 'Drupal\\' . $function . '_submit';
// Action will return keyed array of values to store.
$params = $submit_function($form, $form_state);
$aid = isset($form_state['values']['actions_aid']) ? $form_state['values']['actions_aid'] : NULL;
actions_save($function, $form_state['values']['actions_type'], $params, $form_state['values']['actions_label'], $aid);
- drupal_set_message(t('The action has been successfully saved.'));
+ set_message(t('The action has been successfully saved.'));
$form_state['redirect'] = 'admin/config/system/actions/manage';
}
@@ -3153,7 +3155,7 @@ function system_actions_delete_form_submit($form, &$form_state) {
$action = actions_load($aid);
actions_delete($aid);
watchdog('user', 'Deleted action %aid (%action)', array('%aid' => $aid, '%action' => $action->label));
- drupal_set_message(t('Action %action was deleted', array('%action' => $action->label)));
+ set_message(t('Action %action was deleted', array('%action' => $action->label)));
$form_state['redirect'] = 'admin/config/system/actions/manage';
}
@@ -3165,7 +3167,7 @@ function system_actions_delete_form_submit($form, &$form_state) {
*/
function system_action_delete_orphans_post($orphaned) {
foreach ($orphaned as $callback) {
- drupal_set_message(t("Deleted orphaned action (%action).", array('%action' => $callback)));
+ set_message(t("Deleted orphaned action (%action).", array('%action' => $callback)));
}
}
@@ -3174,5 +3176,5 @@ function system_action_delete_orphans_post($orphaned) {
*/
function system_actions_remove_orphans() {
actions_synchronize(TRUE);
- drupal_goto('admin/config/system/actions/manage');
+ redirect('admin/config/system/actions/manage');
}
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index e8026e6..0a785e9 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -1,4 +1,6 @@
REQUEST_TIME,
':never' => AGGREGATOR_CLEAR_NEVER,
));
- $queue = DrupalQueue::get('aggregator_feeds');
+ $queue = Queue::get('aggregator_feeds');
foreach ($result as $feed) {
$queue->createItem($feed);
}
@@ -158,7 +160,7 @@ function hook_cron() {
* An associative array where the key is the queue name and the value is
* again an associative array. Possible keys are:
* - 'worker callback': The name of the function to call. It will be called
- * with one argument, the item created via DrupalQueue::createItem() in
+ * with one argument, the item created via Queue::createItem() in
* hook_cron().
* - 'time': (optional) How much time Drupal should spend on calling this
* worker in seconds. Defaults to 15.
@@ -177,14 +179,14 @@ function hook_cron_queue_info() {
/**
* Alter cron queue information before cron runs.
*
- * Called by drupal_cron_run() to allow modules to alter cron queue settings
+ * Called by cron_run() to allow modules to alter cron queue settings
* before any jobs are processesed.
*
* @param array $queues
* An array of cron queue information.
*
* @see hook_cron_queue_info()
- * @see drupal_cron_run()
+ * @see cron_run()
*/
function hook_cron_queue_info_alter(&$queues) {
// This site has many feeds so let's spend 90 seconds on each cron run
@@ -269,7 +271,7 @@ function hook_element_info_alter(&$type) {
* It is not loaded because Drupal is still in bootstrap mode.
*
* @param $destination
- * If this hook is invoked as part of a drupal_goto() call, then this argument
+ * If this hook is invoked as part of a redirect() call, then this argument
* will be a fully-qualified URL that is the destination of the redirect.
*/
function hook_exit($destination = NULL) {
@@ -286,13 +288,13 @@ function hook_exit($destination = NULL) {
* @param $javascript
* An array of all JavaScript being presented on the page.
*
- * @see drupal_add_js()
- * @see drupal_get_js()
- * @see drupal_js_defaults()
+ * @see add_js()
+ * @see get_js()
+ * @see js_defaults()
*/
function hook_js_alter(&$javascript) {
// Swap out jQuery to use an updated version of the library.
- $javascript['core/misc/jquery.js']['data'] = drupal_get_path('module', 'jquery_update') . '/jquery.js';
+ $javascript['core/misc/jquery.js']['data'] = get_path('module', 'jquery_update') . '/jquery.js';
}
/**
@@ -309,11 +311,11 @@ function hook_js_alter(&$javascript) {
* version_compare() to compare different versions.
* - 'js': An array of JavaScript elements; each element's key is used as $data
* argument, each element's value is used as $options array for
- * drupal_add_js(). To add library-specific (not module-specific) JavaScript
+ * add_js(). To add library-specific (not module-specific) JavaScript
* settings, the key may be skipped, the value must specify
* 'type' => 'setting', and the actual settings must be contained in a 'data'
* element of the value.
- * - 'css': Like 'js', an array of CSS elements passed to drupal_add_css().
+ * - 'css': Like 'js', an array of CSS elements passed to add_css().
* - 'dependencies': An array of libraries that are required for a library. Each
* element is an array listing the module and name of another library. Note
* that all dependencies for each dependent library will also be added when
@@ -327,8 +329,8 @@ function hook_js_alter(&$javascript) {
* An array defining libraries associated with a module.
*
* @see system_library_info()
- * @see drupal_add_library()
- * @see drupal_get_library()
+ * @see add_library()
+ * @see get_library()
*/
function hook_library_info() {
// Library One.
@@ -337,10 +339,10 @@ function hook_library_info() {
'website' => 'http://example.com/library-1',
'version' => '1.2',
'js' => array(
- drupal_get_path('module', 'my_module') . '/library-1.js' => array(),
+ get_path('module', 'my_module') . '/library-1.js' => array(),
),
'css' => array(
- drupal_get_path('module', 'my_module') . '/library-2.css' => array(
+ get_path('module', 'my_module') . '/library-2.css' => array(
'type' => 'file',
'media' => 'screen',
),
@@ -394,7 +396,7 @@ function hook_library_info_alter(&$libraries, $module) {
// Update the existing Farbtastic to version 2.0.
$libraries['farbtastic']['version'] = '2.0';
$libraries['farbtastic']['js'] = array(
- drupal_get_path('module', 'farbtastic_update') . '/farbtastic-2.0.js' => array(),
+ get_path('module', 'farbtastic_update') . '/farbtastic-2.0.js' => array(),
);
}
}
@@ -406,12 +408,12 @@ function hook_library_info_alter(&$libraries, $module) {
* @param $css
* An array of all CSS items (files and inline CSS) being requested on the page.
*
- * @see drupal_add_css()
- * @see drupal_get_css()
+ * @see add_css()
+ * @see get_css()
*/
function hook_css_alter(&$css) {
// Remove defaults.css file.
- unset($css[drupal_get_path('module', 'system') . '/defaults.css']);
+ unset($css[get_path('module', 'system') . '/defaults.css']);
}
/**
@@ -447,7 +449,7 @@ function hook_ajax_render_alter($commands) {
* Nested array of renderable elements that make up the page.
*
* @see hook_page_alter()
- * @see drupal_render_page()
+ * @see render_page()
*/
function hook_page_build(&$page) {
if (menu_get_object('node', 1)) {
@@ -561,7 +563,7 @@ function hook_menu_get_item_alter(&$router_item, $path, $original_map) {
* mymodule_abc_view() will be called with 'def', 'foo', 'bar' and 'baz' as
* arguments, in that order.
*
- * Special care should be taken for the page callback drupal_get_form(), because
+ * Special care should be taken for the page callback get_form(), because
* your specific form callback function will always receive $form and
* &$form_state as the first function arguments:
* @code
@@ -683,10 +685,10 @@ function hook_menu_get_item_alter(&$router_item, $path, $original_map) {
* function, with path component substitution as described above.
* - "delivery callback": The function to call to package the result of the
* page callback function and send it to the browser. Defaults to
- * drupal_deliver_html_page() unless a value is inherited from a parent menu
+ * deliver_html_page() unless a value is inherited from a parent menu
* item. Note that this function is called even if the access checks fail,
* so any custom delivery callback function should take that into account.
- * See drupal_deliver_html_page() for an example.
+ * See deliver_html_page() for an example.
* - "access callback": A function returning TRUE if the user has access
* rights to this menu item, and FALSE if not. It can also be a boolean
* constant instead of a function, and you can also use numeric values
@@ -876,7 +878,7 @@ function hook_menu_link_alter(&$item) {
*/
function hook_translated_menu_link_alter(&$item, $map) {
if ($item['href'] == 'devel/cache/clear') {
- $item['localized_options']['query'] = drupal_get_destination();
+ $item['localized_options']['query'] = get_destination();
}
}
@@ -899,7 +901,7 @@ function hook_menu_link_insert($link) {
$record['mlid'] = $link['mlid'];
$record['menu_name'] = $link['menu_name'];
$record['status'] = 0;
- drupal_write_record('menu_example', $record);
+ write_record('menu_example', $record);
}
/**
@@ -1018,7 +1020,7 @@ function hook_menu_local_tasks_alter(&$data, $router_item, $root_path) {
*
* This hook is invoked by menu_get_active_breadcrumb() and allows alteration
* of the breadcrumb links for the current page, which may be preferred instead
- * of setting a custom breadcrumb via drupal_set_breadcrumb().
+ * of setting a custom breadcrumb via set_breadcrumb().
*
* Implementations should take into account that menu_get_active_breadcrumb()
* subsequently performs the following adjustments to the active trail *after*
@@ -1042,7 +1044,7 @@ function hook_menu_local_tasks_alter(&$data, $router_item, $root_path) {
* @param $item
* The menu router item of the current page.
*
- * @see drupal_set_breadcrumb()
+ * @see set_breadcrumb()
* @see menu_get_active_breadcrumb()
* @see menu_get_active_trail()
* @see menu_set_active_trail()
@@ -1052,7 +1054,7 @@ function hook_menu_breadcrumb_alter(&$active_trail, $item) {
// the active trail. This means that menu_get_active_breadcrumb() will remove
// the last link (for the current page), but since it is added once more here,
// it will appear.
- if (!drupal_is_front_page()) {
+ if (!is_front_page()) {
$end = end($active_trail);
if ($item['href'] == $end['href']) {
$active_trail[] = $end;
@@ -1153,7 +1155,7 @@ function hook_menu_contextual_links_alter(&$links, $router_item, $root_path) {
* Nested array of renderable elements that make up the page.
*
* @see hook_page_build()
- * @see drupal_render_page()
+ * @see render_page()
*/
function hook_page_alter(&$page) {
// Add help text to the user login block.
@@ -1189,7 +1191,7 @@ function hook_page_alter(&$page) {
* Nested array of form elements that comprise the form.
* @param $form_state
* A keyed array containing the current state of the form. The arguments
- * that drupal_get_form() was originally called with are available in the
+ * that get_form() was originally called with are available in the
* array $form_state['build_info']['args'].
* @param $form_id
* String representing the name of the form itself. Typically this is the
@@ -1224,7 +1226,7 @@ function hook_form_alter(&$form, &$form_state, $form_id) {
* Nested array of form elements that comprise the form.
* @param $form_state
* A keyed array containing the current state of the form. The arguments
- * that drupal_get_form() was originally called with are available in the
+ * that get_form() was originally called with are available in the
* array $form_state['build_info']['args'].
* @param $form_id
* String representing the name of the form itself. Typically this is the
@@ -1232,7 +1234,7 @@ function hook_form_alter(&$form, &$form_state, $form_id) {
*
* @see hook_form_alter()
* @see hook_form_BASE_FORM_ID_alter()
- * @see drupal_prepare_form()
+ * @see prepare_form()
*/
function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) {
// Modification for the form with the given form ID goes here. For example, if
@@ -1250,7 +1252,7 @@ function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) {
/**
* Provide a form-specific alteration for shared ('base') forms.
*
- * By default, when drupal_get_form() is called, Drupal looks for a function
+ * By default, when get_form() is called, Drupal looks for a function
* with the same name as the form ID, and uses that function to build the form.
* In contrast, base forms allow multiple form IDs to be mapped to a single base
* (also called 'factory') form function.
@@ -1280,7 +1282,7 @@ function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) {
*
* @see hook_form_alter()
* @see hook_form_FORM_ID_alter()
- * @see drupal_prepare_form()
+ * @see prepare_form()
* @see hook_forms()
*/
function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) {
@@ -1299,7 +1301,7 @@ function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) {
/**
* Map form_ids to form builder functions.
*
- * By default, when drupal_get_form() is called, the system will look for a
+ * By default, when get_form() is called, the system will look for a
* function with the same name as the form ID, and use that function to build
* the form. If no such function is found, Drupal calls this hook. Modules
* implementing this hook can then provide their own instructions for mapping
@@ -1329,8 +1331,8 @@ function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) {
* @param $form_id
* The unique string identifying the desired form.
* @param $args
- * An array containing the original arguments provided to drupal_get_form()
- * or drupal_form_submit(). These are always passed to the form builder and
+ * An array containing the original arguments provided to get_form()
+ * or form_submit(). These are always passed to the form builder and
* do not have to be specified manually in 'callback arguments'.
*
* @return
@@ -1389,8 +1391,8 @@ function hook_forms($form_id, $args) {
*/
function hook_boot() {
// We need user_access() in the shutdown function. Make sure it gets loaded.
- drupal_load('module', 'user');
- drupal_register_shutdown_function('devel_shutdown');
+ load('module', 'user');
+ drupal_register_shutdown_function('Drupal\devel_shutdown');
}
/**
@@ -1410,8 +1412,8 @@ function hook_boot() {
function hook_init() {
// Since this file should only be loaded on the front page, it cannot be
// declared in the info file.
- if (drupal_is_front_page()) {
- drupal_add_css(drupal_get_path('module', 'foo') . '/foo.css');
+ if (is_front_page()) {
+ add_css(get_path('module', 'foo') . '/foo.css');
}
}
@@ -1454,23 +1456,23 @@ function hook_image_toolkits() {
}
/**
- * Alter an email message created with the drupal_mail() function.
+ * Alter an email message created with the mail() function.
*
* hook_mail_alter() allows modification of email messages created and sent
- * with drupal_mail(). Usage examples include adding and/or changing message
+ * with mail(). Usage examples include adding and/or changing message
* text, message fields, and message headers.
*
- * Email messages sent using functions other than drupal_mail() will not
+ * Email messages sent using functions other than mail() will not
* invoke hook_mail_alter(). For example, a contributed module directly
- * calling the drupal_mail_system()->mail() or PHP mail() function
- * will not invoke this hook. All core modules use drupal_mail() for
+ * calling the mail_system()->mail() or PHP mail() function
+ * will not invoke this hook. All core modules use mail() for
* messaging, it is best practice but not mandatory in contributed modules.
*
* @param $message
* An array containing the message data. Keys in this array include:
* - 'id':
- * The drupal_mail() id of the message. Look at module source code or
- * drupal_mail() for possible id values.
+ * The mail() id of the message. Look at module source code or
+ * mail() for possible id values.
* - 'to':
* The address or addresses the message will be sent to. The
* formatting of this string must comply with RFC 2822.
@@ -1488,7 +1490,7 @@ function hook_image_toolkits() {
* Associative array containing mail headers, such as From, Sender,
* MIME-Version, Content-Type, etc.
* - 'params':
- * An array of optional parameters supplied by the caller of drupal_mail()
+ * An array of optional parameters supplied by the caller of mail()
* that is used to build the message before hook_mail_alter() is invoked.
* - 'language':
* The language object used to build the message before hook_mail_alter()
@@ -1496,7 +1498,7 @@ function hook_image_toolkits() {
* - 'send':
* Set to FALSE to abort sending this email message.
*
- * @see drupal_mail()
+ * @see mail()
*/
function hook_mail_alter(&$message) {
if ($message['id'] == 'modulename_messagekey') {
@@ -1517,8 +1519,8 @@ function hook_mail_alter(&$message) {
* hook in order to reorder the implementing modules, which are otherwise
* ordered by the module's system weight.
*
- * Note that hooks invoked using drupal_alter() can have multiple variations
- * (such as hook_form_alter() and hook_form_FORM_ID_alter()). drupal_alter()
+ * Note that hooks invoked using alter() can have multiple variations
+ * (such as hook_form_alter() and hook_form_FORM_ID_alter()). alter()
* will call all such variants defined by a single module in turn. For the
* purposes of hook_module_implements_alter(), these variants are treated as
* a single hook. Thus, to ensure that your implementation of
@@ -1560,7 +1562,7 @@ function hook_module_implements_alter(&$implementations, $hook) {
* is the corresponding path to the theme's .info file.
*/
function hook_system_theme_info() {
- $themes['mymodule_test_theme'] = drupal_get_path('module', 'mymodule') . '/mymodule_test_theme/mymodule_test_theme.info';
+ $themes['mymodule_test_theme'] = get_path('module', 'mymodule') . '/mymodule_test_theme/mymodule_test_theme.info';
return $themes;
}
@@ -1570,7 +1572,7 @@ function hook_system_theme_info() {
* This hook is invoked in _system_rebuild_module_data() and in
* _system_rebuild_theme_data(). A module may implement this hook in order to
* add to or alter the data generated by reading the .info file with
- * drupal_parse_info_file().
+ * parse_info_file().
*
* @param $info
* The .info file contents, passed by reference so that it can be altered.
@@ -1987,37 +1989,37 @@ function hook_watchdog(array $log_entry) {
'@message' => strip_tags($log_entry['message']),
));
- drupal_mail('emaillog', 'entry', $to, $language, $params);
+ mail('emaillog', 'entry', $to, $language, $params);
}
/**
- * Prepare a message based on parameters; called from drupal_mail().
+ * Prepare a message based on parameters; called from mail().
*
* Note that hook_mail(), unlike hook_mail_alter(), is only called on the
- * $module argument to drupal_mail(), not all modules.
+ * $module argument to mail(), not all modules.
*
* @param $key
* An identifier of the mail.
* @param $message
* An array to be filled in. Elements in this array include:
* - id: An ID to identify the mail sent. Look at module source code
- * or drupal_mail() for possible id values.
+ * or mail() for possible id values.
* - to: The address or addresses the message will be sent to. The
* formatting of this string must comply with RFC 2822.
* - subject: Subject of the e-mail to be sent. This must not contain any
- * newline characters, or the mail may not be sent properly. drupal_mail()
+ * newline characters, or the mail may not be sent properly. mail()
* sets this to an empty string when the hook is invoked.
* - body: An array of lines containing the message to be sent. Drupal will
- * format the correct line endings for you. drupal_mail() sets this to an
+ * format the correct line endings for you. mail() sets this to an
* empty array when the hook is invoked.
* - from: The address the message will be marked as being from, which is
- * set by drupal_mail() to either a custom address or the site-wide
+ * set by mail() to either a custom address or the site-wide
* default email address when the hook is invoked.
* - headers: Associative array containing mail headers, such as From,
- * Sender, MIME-Version, Content-Type, etc. drupal_mail() pre-fills
+ * Sender, MIME-Version, Content-Type, etc. mail() pre-fills
* several headers in this array.
* @param $params
- * An array of parameters supplied by the caller of drupal_mail().
+ * An array of parameters supplied by the caller of mail().
*/
function hook_mail($key, &$message, $params) {
$account = $params['account'];
@@ -2054,7 +2056,7 @@ function hook_mail($key, &$message, $params) {
$subject = strtr($context['subject'], $variables);
$body = strtr($context['message'], $variables);
$message['subject'] .= str_replace(array("\r", "\n"), '', $subject);
- $message['body'][] = drupal_html_to_text($body);
+ $message['body'][] = html_to_text($body);
}
/**
@@ -2062,12 +2064,12 @@ function hook_mail($key, &$message, $params) {
*
* This hook allows your module to add cache bins to the list of cache bins
* that will be cleared by the Clear button on the Performance page or
- * whenever drupal_flush_all_caches is invoked.
+ * whenever flush_all_caches is invoked.
*
* @return
* An array of cache bins.
*
- * @see drupal_flush_all_caches()
+ * @see flush_all_caches()
*/
function hook_flush_caches() {
return array('example');
@@ -2137,7 +2139,7 @@ function hook_modules_installed($modules) {
*/
function hook_modules_enabled($modules) {
if (in_array('lousy_module', $modules)) {
- drupal_set_message(t('mymodule is not compatible with lousy_module'), 'error');
+ set_message(t('mymodule is not compatible with lousy_module'), 'error');
mymodule_disable_functionality();
}
}
@@ -2220,13 +2222,13 @@ function hook_stream_wrappers() {
return array(
'public' => array(
'name' => t('Public files'),
- 'class' => 'DrupalPublicStreamWrapper',
+ 'class' => 'PublicStreamWrapper',
'description' => t('Public local files served by the webserver.'),
'type' => STREAM_WRAPPERS_LOCAL_NORMAL,
),
'private' => array(
'name' => t('Private files'),
- 'class' => 'DrupalPrivateStreamWrapper',
+ 'class' => 'PrivateStreamWrapper',
'description' => t('Private local files served by Drupal.'),
'type' => STREAM_WRAPPERS_LOCAL_NORMAL,
),
@@ -2596,8 +2598,8 @@ function hook_requirements($phase) {
'title' => $t('PHP'),
'value' => ($phase == 'runtime') ? l(phpversion(), 'admin/reports/status/php') : phpversion(),
);
- if (version_compare(phpversion(), DRUPAL_MINIMUM_PHP) < 0) {
- $requirements['php']['description'] = $t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP));
+ if (version_compare(phpversion(), MINIMUM_PHP) < 0) {
+ $requirements['php']['description'] = $t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => MINIMUM_PHP));
$requirements['php']['severity'] = REQUIREMENT_ERROR;
}
@@ -2633,7 +2635,7 @@ function hook_requirements($phase) {
*
* This hook is called at both install and uninstall time, and in the latter
* case, it cannot rely on the .module file being loaded or hooks being known.
- * If the .module file is needed, it may be loaded with drupal_load().
+ * If the .module file is needed, it may be loaded with load().
*
* The tables declared by this hook will be automatically created when
* the module is first enabled, and removed when the module is uninstalled.
@@ -2898,8 +2900,8 @@ function hook_install() {
* @param $sandbox
* Stores information for multipass updates. See above for more information.
*
- * @throws DrupalUpdateException, PDOException
- * In case of error, update hooks should throw an instance of DrupalUpdateException
+ * @throws UpdateException, PDOException
+ * In case of error, update hooks should throw an instance of UpdateException
* with a meaningful message for the user. If a database query fails for whatever
* reason, it will throw a PDOException.
*
@@ -2952,7 +2954,7 @@ function hook_update_N(&$sandbox) {
return t('The update did what it was supposed to do.');
// In case of an error, simply throw an exception with an error message.
- throw new DrupalUpdateException('Something went wrong; here is what you should do.');
+ throw new UpdateException('Something went wrong; here is what you should do.');
}
/**
@@ -3039,7 +3041,7 @@ function hook_update_last_removed() {
*
* When hook_uninstall() is called, your module will already be disabled, so
* its .module file will not be automatically included. If you need to call API
- * functions from your .module file in this hook, use drupal_load() to make
+ * functions from your .module file in this hook, use load() to make
* them available. (Keep this usage to a minimum, though, especially when
* calling API functions that invoke hooks, or API functions from modules
* listed as dependencies, since these may not be available or work as expected
@@ -3155,7 +3157,7 @@ function hook_registry_files_alter(&$files, $modules) {
* installer to pause and display a page to the user by returning any themed
* output that should be displayed on that page (but see below for tasks that
* use the form API or batch API; the return values of these task functions are
- * handled differently). You should also use drupal_set_title() within the task
+ * handled differently). You should also use set_title() within the task
* callback function to set a custom page title. For some tasks, however, you
* may want to simply do some processing and pass control to the next task
* without ending the page request; to indicate this, simply do not send back
@@ -3302,27 +3304,27 @@ function hook_install_tasks() {
}
/**
- * Change the page the user is sent to by drupal_goto().
+ * Change the page the user is sent to by redirect().
*
* @param $path
* A Drupal path or a full URL.
* @param $options
* An associative array of additional URL options to pass to url().
* @param $http_response_code
- * The HTTP status code to use for the redirection. See drupal_goto() for more
+ * The HTTP status code to use for the redirection. See redirect() for more
* information.
*/
-function hook_drupal_goto_alter(&$path, &$options, &$http_response_code) {
+function hook_redirect_alter(&$path, &$options, &$http_response_code) {
// A good addition to misery module.
$http_response_code = 500;
}
/**
- * Alter XHTML HEAD tags before they are rendered by drupal_get_html_head().
+ * Alter XHTML HEAD tags before they are rendered by get_html_head().
*
* Elements available to be altered are only those added using
- * drupal_add_html_head_link() or drupal_add_html_head(). CSS and JS files
- * are handled using drupal_add_css() and drupal_add_js(), so the head links
+ * add_html_head_link() or add_html_head(). CSS and JS files
+ * are handled using add_css() and add_js(), so the head links
* for those files will not appear in the $head_elements array.
*
* @param $head_elements
@@ -3648,7 +3650,7 @@ function hook_date_formats_alter(&$formats) {
/**
* Alters the delivery callback used to send the result of the page callback to the browser.
*
- * Called by drupal_deliver_page() to allow modules to alter how the
+ * Called by deliver_page() to allow modules to alter how the
* page is delivered to the browser.
*
* This hook is intended for altering the delivery callback based on
@@ -3679,13 +3681,13 @@ function hook_date_formats_alter(&$formats) {
* @param $callback
* The name of a function.
*
- * @see drupal_deliver_page()
+ * @see deliver_page()
*/
function hook_page_delivery_callback_alter(&$callback) {
// jQuery sets a HTTP_X_REQUESTED_WITH header of 'XMLHttpRequest'.
// If a page would normally be delivered as an html page, and it is called
// from jQuery, deliver it instead as an Ajax response.
- if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' && $callback == 'drupal_deliver_html_page') {
+ if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' && $callback == 'deliver_html_page') {
$callback = 'ajax_deliver';
}
}
@@ -3724,7 +3726,7 @@ function hook_system_themes_page_alter(&$theme_groups) {
* @param $path_language
* The language of the path.
*
- * @see drupal_get_normal_path()
+ * @see get_normal_path()
*/
function hook_url_inbound_alter(&$path, $original_path, $path_language) {
// Create the path user/me/edit, which allows a user to edit their account.
@@ -4056,7 +4058,7 @@ function hook_batch_alter(&$batch) {
* doesn't matter, but if you need to override an existing Updater, make
* sure your Updater has a lighter weight so that it comes first.
*
- * @see drupal_get_updaters()
+ * @see get_updaters()
* @see hook_updater_info_alter()
*/
function hook_updater_info() {
@@ -4085,7 +4087,7 @@ function hook_updater_info() {
* Associative array of updaters as defined through hook_updater_info().
* Alter this array directly.
*
- * @see drupal_get_updaters()
+ * @see get_updaters()
* @see hook_updater_info()
*/
function hook_updater_info_alter(&$updaters) {
@@ -4120,7 +4122,7 @@ function hook_countries_alter(&$countries) {
* Supported values are MENU_SITE_OFFLINE, MENU_ACCESS_DENIED,
* MENU_NOT_FOUND and MENU_SITE_ONLINE. Any other value than
* MENU_SITE_ONLINE will skip the default menu handling system and be passed
- * for delivery to drupal_deliver_page() with a NULL
+ * for delivery to deliver_page() with a NULL
* $default_delivery_callback.
* @param $path
* Contains the system path that is going to be loaded. This is read only,
@@ -4166,7 +4168,7 @@ function hook_menu_site_status_alter(&$menu_site_status, $path) {
* @see FileTransfer
* @see authorize.php
* @see hook_filetransfer_info_alter()
- * @see drupal_get_filetransfer_info()
+ * @see get_filetransfer_info()
*/
function hook_filetransfer_info() {
$info['sftp'] = array(
diff --git a/core/modules/system/system.archiver.inc b/core/modules/system/system.archiver.inc
index c37f07d..cf84b60 100644
--- a/core/modules/system/system.archiver.inc
+++ b/core/modules/system/system.archiver.inc
@@ -1,4 +1,6 @@
DRUPAL_MINIMUM_PHP));
+ if (version_compare($phpversion, MINIMUM_PHP) < 0) {
+ $requirements['php']['description'] = $t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => MINIMUM_PHP));
$requirements['php']['severity'] = REQUIREMENT_ERROR;
// If PHP is old, it's not safe to continue with the requirements check.
return $requirements;
@@ -152,7 +154,7 @@ function system_requirements($phase) {
}
else {
// Make sure at least one supported database driver exists.
- $drivers = drupal_detect_database_types();
+ $drivers = detect_database_types();
if (empty($drivers)) {
$database_ok = FALSE;
$pdo_message = $t('Your web server does not appear to support any common PDO database extensions. Check with your hosting provider to see if they support PDO (PHP Data Objects) and offer any databases that
Drupal supports.', array(
@@ -180,7 +182,7 @@ function system_requirements($phase) {
}
else {
// Database information.
- $class = 'DatabaseTasks_' . Database::getConnection()->driver();
+ $class = 'Drupal\DatabaseTasks_' . Database::getConnection()->driver();
$tasks = new $class();
$requirements['database_system'] = array(
'title' => $t('Database system'),
@@ -199,16 +201,16 @@ function system_requirements($phase) {
'value' => $memory_limit == -1 ? t('-1 (Unlimited)') : $memory_limit,
);
- if ($memory_limit && $memory_limit != -1 && parse_size($memory_limit) < parse_size(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)) {
+ if ($memory_limit && $memory_limit != -1 && parse_size($memory_limit) < parse_size(MINIMUM_PHP_MEMORY_LIMIT)) {
$description = '';
if ($phase == 'install') {
- $description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));
+ $description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', array('%memory_minimum_limit' => MINIMUM_PHP_MEMORY_LIMIT));
}
elseif ($phase == 'update') {
- $description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the update process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));
+ $description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the update process.', array('%memory_minimum_limit' => MINIMUM_PHP_MEMORY_LIMIT));
}
elseif ($phase == 'runtime') {
- $description = $t('Depending on your configuration, Drupal can run with a %memory_limit PHP memory limit. However, a %memory_minimum_limit PHP memory limit or above is recommended, especially if your site uses additional custom or contributed modules.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));
+ $description = $t('Depending on your configuration, Drupal can run with a %memory_limit PHP memory limit. However, a %memory_minimum_limit PHP memory limit or above is recommended, especially if your site uses additional custom or contributed modules.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => MINIMUM_PHP_MEMORY_LIMIT));
}
if (!empty($description)) {
@@ -226,8 +228,8 @@ function system_requirements($phase) {
// Test settings.php file writability
if ($phase == 'runtime') {
- $conf_dir = drupal_verify_install_file(conf_path(), FILE_NOT_WRITABLE, 'dir');
- $conf_file = drupal_verify_install_file(conf_path() . '/settings.php', FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE);
+ $conf_dir = verify_install_file(conf_path(), FILE_NOT_WRITABLE, 'dir');
+ $conf_file = verify_install_file(conf_path() . '/settings.php', FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE);
if (!$conf_dir || !$conf_file) {
$requirements['settings.php'] = array(
'value' => $t('Not protected'),
@@ -368,9 +370,9 @@ function system_requirements($phase) {
// Check installed modules.
foreach (module_list() as $module) {
- $updates = drupal_get_schema_versions($module);
+ $updates = get_schema_versions($module);
if ($updates !== FALSE) {
- $default = drupal_get_installed_schema_version($module);
+ $default = get_installed_schema_version($module);
if (max($updates) > $default) {
$requirements['update']['severity'] = REQUIREMENT_ERROR;
$requirements['update']['value'] = $t('Out of date');
@@ -400,7 +402,7 @@ function system_requirements($phase) {
// Display an error if a newly introduced dependency in a module is not resolved.
if ($phase == 'update') {
- $profile = drupal_get_profile();
+ $profile = get_profile();
$files = system_rebuild_module_data();
foreach ($files as $module => $file) {
// Ignore disabled modules and install profiles.
@@ -430,8 +432,8 @@ function system_requirements($phase) {
// Check for an incompatible version.
$required_file = $files[$required_module];
$required_name = $required_file->info['name'];
- $version = str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', $required_file->info['version']);
- $compatibility = drupal_check_incompatibility($requirement, $version);
+ $version = str_replace(CORE_COMPATIBILITY . '-', '', $required_file->info['version']);
+ $compatibility = check_incompatibility($requirement, $version);
if ($compatibility) {
$compatibility = rtrim(substr($compatibility, 2), ')');
$requirements["$module-$required_module"] = array(
@@ -447,7 +449,7 @@ function system_requirements($phase) {
}
// Test Unicode library
- include_once DRUPAL_ROOT . '/core/includes/unicode.inc';
+ include_once ROOT . '/core/includes/unicode.inc';
$requirements = array_merge($requirements, unicode_requirements());
if ($phase == 'runtime') {
@@ -467,12 +469,12 @@ function system_requirements($phase) {
$requirements['update status']['title'] = $t('Update notifications');
// Check that Drupal can issue HTTP requests.
- if (variable_get('drupal_http_request_fails', TRUE) && !system_check_http_request()) {
+ if (variable_get('http_request_fails', TRUE) && !system_check_http_request()) {
$requirements['http requests'] = array(
'title' => $t('HTTP request status'),
'value' => $t('Fails'),
'severity' => REQUIREMENT_ERROR,
- 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add
$conf[\'drupal_http_request_fails\'] = FALSE; to the bottom of your settings.php file.'),
+ 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add
$conf[\'http_request_fails\'] = FALSE; to the bottom of your settings.php file.'),
);
}
}
@@ -485,10 +487,10 @@ function system_requirements($phase) {
*/
function system_install() {
// Create tables.
- drupal_install_schema('system');
- $versions = drupal_get_schema_versions('system');
+ install_schema('system');
+ $versions = get_schema_versions('system');
$version = $versions ? max($versions) : SCHEMA_INSTALLED;
- drupal_set_installed_schema_version('system', $version);
+ set_installed_schema_version('system', $version);
// Clear out module list and hook implementation statics before calling
// system_rebuild_theme_data().
@@ -507,7 +509,7 @@ function system_install() {
->execute();
// Populate the cron key variable.
- $cron_key = drupal_hash_base64(drupal_random_bytes(55));
+ $cron_key = hash_base64(random_bytes(55));
variable_set('cron_key', $cron_key);
}
@@ -824,7 +826,7 @@ function system_schema() {
'default' => 0,
),
'status' => array(
- 'description' => 'A field indicating the status of the file. Two status are defined in core: temporary (0) and permanent (1). Temporary files older than DRUPAL_MAXIMUM_TEMP_FILE_AGE will be removed during a cron run.',
+ 'description' => 'A field indicating the status of the file. Two status are defined in core: temporary (0) and permanent (1). Temporary files older than MAXIMUM_TEMP_FILE_AGE will be removed during a cron run.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
diff --git a/core/modules/system/system.mail.inc b/core/modules/system/system.mail.inc
index 1ce9fc0..70309e8 100644
--- a/core/modules/system/system.mail.inc
+++ b/core/modules/system/system.mail.inc
@@ -1,4 +1,5 @@
array(
'variables' => array('theme_groups' => NULL),
'file' => 'system.admin.inc',
@@ -309,21 +311,21 @@ function system_element_info() {
);
$types['html_tag'] = array(
'#theme' => 'html_tag',
- '#pre_render' => array('drupal_pre_render_conditional_comments'),
+ '#pre_render' => array('pre_render_conditional_comments'),
'#attributes' => array(),
'#value' => NULL,
);
$types['styles'] = array(
'#items' => array(),
- '#pre_render' => array('drupal_pre_render_styles'),
- '#group_callback' => 'drupal_group_css',
- '#aggregate_callback' => 'drupal_aggregate_css',
+ '#pre_render' => array('pre_render_styles'),
+ '#group_callback' => 'group_css',
+ '#aggregate_callback' => 'aggregate_css',
);
$types['scripts'] = array(
'#items' => array(),
- '#pre_render' => array('drupal_pre_render_scripts'),
- '#group_callback' => 'drupal_group_js',
- '#aggregate_callback' => 'drupal_aggregate_js',
+ '#pre_render' => array('pre_render_scripts'),
+ '#group_callback' => 'group_js',
+ '#aggregate_callback' => 'aggregate_js',
);
// Input elements.
@@ -475,7 +477,7 @@ function system_element_info() {
// Form structure.
$types['item'] = array(
'#markup' => '',
- '#pre_render' => array('drupal_pre_render_markup'),
+ '#pre_render' => array('pre_render_markup'),
'#theme_wrappers' => array('form_element'),
);
$types['hidden'] = array(
@@ -488,10 +490,10 @@ function system_element_info() {
);
$types['markup'] = array(
'#markup' => '',
- '#pre_render' => array('drupal_pre_render_markup'),
+ '#pre_render' => array('pre_render_markup'),
);
$types['link'] = array(
- '#pre_render' => array('drupal_pre_render_link', 'drupal_pre_render_markup'),
+ '#pre_render' => array('pre_render_link', 'pre_render_markup'),
);
$types['fieldset'] = array(
'#collapsible' => FALSE,
@@ -640,7 +642,7 @@ function system_menu() {
$items['admin/appearance/settings'] = array(
'title' => 'Settings',
'description' => 'Configure default and theme specific settings.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_theme_settings'),
'access arguments' => array('administer themes'),
'type' => MENU_LOCAL_TASK,
@@ -669,7 +671,7 @@ function system_menu() {
$items['admin/modules'] = array(
'title' => 'Modules',
'description' => 'Extend site functionality.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_modules'),
'access arguments' => array('administer modules'),
'file' => 'system.admin.inc',
@@ -719,7 +721,7 @@ function system_menu() {
);
$items['admin/config/people/ip-blocking/delete/%blocked_ip'] = array(
'title' => 'Delete IP address',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_ip_blocking_delete', 5),
'access arguments' => array('block IP addresses'),
'file' => 'system.admin.inc',
@@ -738,7 +740,7 @@ function system_menu() {
$items['admin/config/media/file-system'] = array(
'title' => 'File system',
'description' => 'Tell Drupal where to store uploaded files and how they are accessed.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_file_system_settings'),
'access arguments' => array('administer site configuration'),
'weight' => -10,
@@ -747,7 +749,7 @@ function system_menu() {
$items['admin/config/media/image-toolkit'] = array(
'title' => 'Image toolkit',
'description' => 'Choose which image toolkit to use if you have installed optional toolkits.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_image_toolkit_settings'),
'access arguments' => array('administer site configuration'),
'weight' => 20,
@@ -767,7 +769,7 @@ function system_menu() {
$items['admin/config/services/rss-publishing'] = array(
'title' => 'RSS publishing',
'description' => 'Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_rss_feeds_settings'),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -786,7 +788,7 @@ function system_menu() {
$items['admin/config/development/maintenance'] = array(
'title' => 'Maintenance mode',
'description' => 'Take the site offline for maintenance or bring it back online.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_site_maintenance_mode'),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -795,7 +797,7 @@ function system_menu() {
$items['admin/config/development/performance'] = array(
'title' => 'Performance',
'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_performance_settings'),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -804,7 +806,7 @@ function system_menu() {
$items['admin/config/development/logging'] = array(
'title' => 'Logging and errors',
'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.",
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_logging_settings'),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -824,7 +826,7 @@ function system_menu() {
$items['admin/config/regional/settings'] = array(
'title' => 'Regional settings',
'description' => "Settings for the site's default time zone and country.",
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_regional_settings'),
'access arguments' => array('administer site configuration'),
'weight' => -20,
@@ -833,7 +835,7 @@ function system_menu() {
$items['admin/config/regional/date-time'] = array(
'title' => 'Date and time',
'description' => 'Configure display formats for date and time.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_date_time_settings'),
'access arguments' => array('administer site configuration'),
'weight' => -15,
@@ -842,7 +844,7 @@ function system_menu() {
$items['admin/config/regional/date-time/types'] = array(
'title' => 'Types',
'description' => 'Configure display formats for date and time.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_date_time_settings'),
'access arguments' => array('administer site configuration'),
'type' => MENU_DEFAULT_LOCAL_TASK,
@@ -852,7 +854,7 @@ function system_menu() {
$items['admin/config/regional/date-time/types/add'] = array(
'title' => 'Add date type',
'description' => 'Add new date type.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_add_date_format_type_form'),
'access arguments' => array('administer site configuration'),
'type' => MENU_LOCAL_ACTION,
@@ -862,7 +864,7 @@ function system_menu() {
$items['admin/config/regional/date-time/types/%/delete'] = array(
'title' => 'Delete date type',
'description' => 'Allow users to delete a configured date type.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_delete_date_format_type_form', 5),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -880,7 +882,7 @@ function system_menu() {
'title' => 'Add format',
'description' => 'Allow users to add additional date formats.',
'type' => MENU_LOCAL_ACTION,
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_configure_date_formats_form'),
'access arguments' => array('administer site configuration'),
'weight' => -10,
@@ -889,7 +891,7 @@ function system_menu() {
$items['admin/config/regional/date-time/formats/%/edit'] = array(
'title' => 'Edit date format',
'description' => 'Allow users to edit a configured date format.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_configure_date_formats_form', 5),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -897,7 +899,7 @@ function system_menu() {
$items['admin/config/regional/date-time/formats/%/delete'] = array(
'title' => 'Delete date format',
'description' => 'Allow users to delete a configured date format.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_date_delete_format_form', 5),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -923,7 +925,7 @@ function system_menu() {
$items['admin/config/search/clean-urls'] = array(
'title' => 'Clean URLs',
'description' => 'Enable or disable clean URLs for your site.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_clean_url_settings'),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -931,7 +933,7 @@ function system_menu() {
);
$items['admin/config/search/clean-urls/check'] = array(
'title' => 'Clean URL check',
- 'page callback' => 'drupal_json_output',
+ 'page callback' => 'json_output',
'page arguments' => array(array('status' => TRUE)),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
@@ -965,7 +967,7 @@ function system_menu() {
);
$items['admin/config/system/actions/configure'] = array(
'title' => 'Configure an advanced action',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_actions_configure'),
'access arguments' => array('administer actions'),
'type' => MENU_VISIBLE_IN_BREADCRUMB,
@@ -974,7 +976,7 @@ function system_menu() {
$items['admin/config/system/actions/delete/%actions'] = array(
'title' => 'Delete action',
'description' => 'Delete an action.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_actions_delete_form', 5),
'access arguments' => array('administer actions'),
'file' => 'system.admin.inc',
@@ -989,7 +991,7 @@ function system_menu() {
$items['admin/config/system/site-information'] = array(
'title' => 'Site information',
'description' => 'Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_site_information_settings'),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -998,7 +1000,7 @@ function system_menu() {
$items['admin/config/system/cron'] = array(
'title' => 'Cron',
'description' => 'Manage automatic site maintenance tasks.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('system_cron_settings'),
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
@@ -1084,7 +1086,7 @@ function _system_batch_theme() {
// Retrieve the current state of the batch.
$batch = &batch_get();
if (!$batch && isset($_REQUEST['id'])) {
- require_once DRUPAL_ROOT . '/core/includes/batch.inc';
+ require_once ROOT . '/core/includes/batch.inc';
$batch = batch_load($_REQUEST['id']);
}
// Use the same theme as the page that started the batch.
@@ -1668,13 +1670,13 @@ function system_stream_wrappers() {
$wrappers = array(
'public' => array(
'name' => t('Public files'),
- 'class' => 'DrupalPublicStreamWrapper',
+ 'class' => 'PublicStreamWrapper',
'description' => t('Public local files served by the webserver.'),
'type' => STREAM_WRAPPERS_LOCAL_NORMAL,
),
'temporary' => array(
'name' => t('Temporary files'),
- 'class' => 'DrupalTemporaryStreamWrapper',
+ 'class' => 'TemporaryStreamWrapper',
'description' => t('Temporary local files for upload and previews.'),
'type' => STREAM_WRAPPERS_LOCAL_HIDDEN,
),
@@ -1684,7 +1686,7 @@ function system_stream_wrappers() {
if (variable_get('file_private_path', FALSE)) {
$wrappers['private'] = array(
'name' => t('Private files'),
- 'class' => 'DrupalPrivateStreamWrapper',
+ 'class' => 'PrivateStreamWrapper',
'description' => t('Private local files served by Drupal.'),
'type' => STREAM_WRAPPERS_LOCAL_NORMAL,
);
@@ -1710,7 +1712,7 @@ function blocked_ip_load($iid) {
* Menu item access callback - only admin or enabled themes can be accessed.
*/
function _system_themes_access($theme) {
- return user_access('administer themes') && drupal_theme_access($theme);
+ return user_access('administer themes') && theme_access($theme);
}
/**
@@ -1738,7 +1740,7 @@ function _system_themes_access($theme) {
* or to call system_authorized_init() and then redirect to authorize.php,
* using the URL from system_authorized_get_url(). Redirecting yourself is
* necessary when your authorized operation is being triggered by a form
- * submit handler, since calling drupal_goto() in a submit handler is a bad
+ * submit handler, since calling redirect() in a submit handler is a bad
* idea, and you should instead set $form_state['redirect'].
*
* Once the SESSION is setup for the operation and the user is redirected to
@@ -1782,7 +1784,7 @@ function system_authorized_init($callback, $file, $arguments = array(), $page_ti
// First, figure out what file transfer backends the site supports, and put
// all of those in the SESSION so that authorize.php has access to all of
// them via the class autoloader, even without a full bootstrap.
- $_SESSION['authorize_filetransfer_info'] = drupal_get_filetransfer_info();
+ $_SESSION['authorize_filetransfer_info'] = get_filetransfer_info();
// Now, define the callback to invoke.
$_SESSION['authorize_operation'] = array(
@@ -1827,7 +1829,7 @@ function system_authorized_batch_processing_url() {
*/
function system_authorized_run($callback, $file, $arguments = array(), $page_title = NULL) {
system_authorized_init($callback, $file, $arguments, $page_title);
- drupal_goto(system_authorized_get_url());
+ redirect(system_authorized_get_url());
}
/**
@@ -1898,14 +1900,14 @@ function system_filetransfer_info() {
* Implements hook_init().
*/
function system_init() {
- $path = drupal_get_path('module', 'system');
+ $path = get_path('module', 'system');
// Add the CSS for this module. These aren't in system.info, because they
// need to be in the CSS_SYSTEM group rather than the CSS_DEFAULT group.
- drupal_add_css($path . '/system.base.css', array('group' => CSS_SYSTEM, 'every_page' => TRUE));
+ add_css($path . '/system.base.css', array('group' => CSS_SYSTEM, 'every_page' => TRUE));
if (path_is_admin(current_path())) {
- drupal_add_css($path . '/system.admin.css', array('group' => CSS_SYSTEM));
+ add_css($path . '/system.admin.css', array('group' => CSS_SYSTEM));
}
- drupal_add_css($path . '/system.theme.css', array('group' => CSS_SYSTEM, 'every_page' => TRUE));
+ add_css($path . '/system.theme.css', array('group' => CSS_SYSTEM, 'every_page' => TRUE));
// Ignore slave database servers for this request.
//
@@ -1941,13 +1943,13 @@ function system_add_module_assets() {
if (!empty($info['stylesheets'])) {
foreach ($info['stylesheets'] as $media => $stylesheets) {
foreach ($stylesheets as $stylesheet) {
- drupal_add_css($stylesheet, array('every_page' => TRUE, 'media' => $media));
+ add_css($stylesheet, array('every_page' => TRUE, 'media' => $media));
}
}
}
if (!empty($info['scripts'])) {
foreach ($info['scripts'] as $script) {
- drupal_add_js($script, array('every_page' => TRUE));
+ add_js($script, array('every_page' => TRUE));
}
}
}
@@ -1976,7 +1978,7 @@ function system_form_user_profile_form_alter(&$form, &$form_state) {
* Implements hook_form_FORM_ID_alter().
*/
function system_form_user_register_form_alter(&$form, &$form_state) {
- if (variable_get('configurable_timezones', 1) && variable_get('user_default_timezone', DRUPAL_USER_TIMEZONE_DEFAULT) == DRUPAL_USER_TIMEZONE_SELECT) {
+ if (variable_get('configurable_timezones', 1) && variable_get('user_default_timezone', USER_TIMEZONE_DEFAULT) == USER_TIMEZONE_SELECT) {
system_user_timezone($form, $form_state);
return $form;
}
@@ -1986,7 +1988,7 @@ function system_form_user_register_form_alter(&$form, &$form_state) {
* Implements hook_user_insert().
*/
function system_user_presave(&$edit, $account) {
- if (variable_get('configurable_timezones', 1) && empty($account->timezone) && !variable_get('user_default_timezone', DRUPAL_USER_TIMEZONE_DEFAULT)) {
+ if (variable_get('configurable_timezones', 1) && empty($account->timezone) && !variable_get('user_default_timezone', USER_TIMEZONE_DEFAULT)) {
$account->timezone = variable_get('date_default_timezone', '');
}
}
@@ -1998,7 +2000,7 @@ function system_user_presave(&$edit, $account) {
function system_user_login(&$edit, $account) {
// If the user has a NULL time zone, notify them to set a time zone.
if (!$account->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) {
- drupal_set_message(t('Configure your
account time zone setting.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ set_message(t('Configure your
account time zone setting.', array('@user-edit' => url("user/$account->uid/edit", array('query' => get_destination(), 'fragment' => 'edit-timezone')))));
}
}
@@ -2025,7 +2027,7 @@ function system_user_timezone(&$form, &$form_state) {
if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) {
$form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Confirm the selection and click save.');
$form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect'));
- drupal_add_js('core/misc/timezone.js');
+ add_js('core/misc/timezone.js');
}
}
@@ -2036,24 +2038,24 @@ function system_block_info() {
$blocks['main'] = array(
'info' => t('Main page content'),
// Cached elsewhere.
- 'cache' => DRUPAL_NO_CACHE,
+ 'cache' => NO_CACHE,
);
$blocks['powered-by'] = array(
'info' => t('Powered by Drupal'),
'weight' => '10',
- 'cache' => DRUPAL_NO_CACHE,
+ 'cache' => NO_CACHE,
);
$blocks['help'] = array(
'info' => t('System help'),
'weight' => '5',
- 'cache' => DRUPAL_NO_CACHE,
+ 'cache' => NO_CACHE,
);
// System-defined menu blocks.
foreach (menu_list_system_menus() as $menu_name => $title) {
$blocks[$menu_name]['info'] = t($title);
// Menu blocks can't be cached because each menu item can have
// a custom access callback. menu.inc manages its own caching.
- $blocks[$menu_name]['cache'] = DRUPAL_NO_CACHE;
+ $blocks[$menu_name]['cache'] = NO_CACHE;
}
return $blocks;
}
@@ -2069,7 +2071,7 @@ function system_block_view($delta = '') {
switch ($delta) {
case 'main':
$block['subject'] = NULL;
- $block['content'] = drupal_set_page_content();
+ $block['content'] = set_page_content();
return $block;
case 'powered-by':
$block['subject'] = NULL;
@@ -2145,7 +2147,7 @@ function system_admin_menu_block($item) {
$query
->fields('ml')
// Weight should be taken from {menu_links}, not {menu_router}.
- ->fields('m', array_diff(drupal_schema_fields_sql('menu_router'), array('weight')))
+ ->fields('m', array_diff(schema_fields_sql('menu_router'), array('weight')))
->condition('ml.plid', $item['mlid'])
->condition('ml.menu_name', $item['menu_name'])
->condition('ml.hidden', 0);
@@ -2367,10 +2369,10 @@ function system_get_info($type, $name = NULL) {
*/
function _system_rebuild_module_data() {
// Find modules
- $modules = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.module$/', 'modules', 'name', 0);
+ $modules = system_listing('/^' . PHP_FUNCTION_PATTERN . '\.module$/', 'modules', 'name', 0);
// Include the install profile in modules that are loaded.
- $profile = drupal_get_profile();
+ $profile = get_profile();
$modules[$profile] = new stdClass();
$modules[$profile]->name = $profile;
$modules[$profile]->uri = 'profiles/' . $profile . '/' . $profile . '.profile';
@@ -2385,7 +2387,7 @@ function _system_rebuild_module_data() {
'description' => '',
'package' => 'Other',
'version' => NULL,
- 'php' => DRUPAL_MINIMUM_PHP,
+ 'php' => MINIMUM_PHP,
'files' => array(),
'bootstrap' => 0,
);
@@ -2397,7 +2399,7 @@ function _system_rebuild_module_data() {
$modules[$key]->filename = $module->uri;
// Look for the info file.
- $module->info = drupal_parse_info_file(dirname($module->uri) . '/' . $module->name . '.info');
+ $module->info = parse_info_file(dirname($module->uri) . '/' . $module->name . '.info');
// Skip modules that don't provide info.
if (empty($module->info)) {
@@ -2426,7 +2428,7 @@ function _system_rebuild_module_data() {
// Invoke hook_system_info_alter() to give installed modules a chance to
// modify the data in the .info files if necessary.
$type = 'module';
- drupal_alter('system_info', $modules[$key]->info, $modules[$key], $type);
+ alter('system_info', $modules[$key]->info, $modules[$key], $type);
}
if (isset($modules[$profile])) {
@@ -2499,7 +2501,7 @@ function _system_update_bootstrap_status() {
*/
function _system_rebuild_theme_data() {
// Find themes
- $themes = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info$/', 'themes');
+ $themes = system_listing('/^' . PHP_FUNCTION_PATTERN . '\.info$/', 'themes');
// Allow modules to add further themes.
if ($module_themes = module_invoke_all('system_theme_info')) {
foreach ($module_themes as $name => $uri) {
@@ -2513,7 +2515,7 @@ function _system_rebuild_theme_data() {
}
// Find theme engines
- $engines = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.engine$/', 'themes/engines');
+ $engines = system_listing('/^' . PHP_FUNCTION_PATTERN . '\.engine$/', 'themes/engines');
// Set defaults for theme info.
$defaults = array(
@@ -2532,7 +2534,7 @@ function _system_rebuild_theme_data() {
'description' => '',
'features' => _system_default_theme_features(),
'screenshot' => 'screenshot.png',
- 'php' => DRUPAL_MINIMUM_PHP,
+ 'php' => MINIMUM_PHP,
'stylesheets' => array(),
'scripts' => array(),
);
@@ -2541,12 +2543,12 @@ function _system_rebuild_theme_data() {
// Read info files for each theme
foreach ($themes as $key => $theme) {
$themes[$key]->filename = $theme->uri;
- $themes[$key]->info = drupal_parse_info_file($theme->uri) + $defaults;
+ $themes[$key]->info = parse_info_file($theme->uri) + $defaults;
// Invoke hook_system_info_alter() to give installed modules a chance to
// modify the data in the .info files if necessary.
$type = 'theme';
- drupal_alter('system_info', $themes[$key]->info, $themes[$key], $type);
+ alter('system_info', $themes[$key]->info, $themes[$key], $type);
if (!empty($themes[$key]->info['base theme'])) {
$sub_themes[] = $key;
@@ -2785,7 +2787,7 @@ function system_settings_form($form) {
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
if (!empty($_POST) && form_get_errors()) {
- drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
+ set_message(t('The settings have not been saved because of the errors.'), 'error');
}
$form['#submit'][] = 'system_settings_form_submit';
// By default, render the form using theme_system_settings_form().
@@ -2812,7 +2814,7 @@ function system_settings_form_submit($form, &$form_state) {
variable_set($key, $value);
}
- drupal_set_message(t('The configuration options have been saved.'));
+ set_message(t('The configuration options have been saved.'));
}
/**
@@ -2886,7 +2888,7 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
$options = array('path' => $path);
}
- drupal_set_title($question, PASS_THROUGH);
+ set_title($question, PASS_THROUGH);
$form['#attributes']['class'][] = 'confirmation';
$form['description'] = array('#markup' => $description);
@@ -2930,7 +2932,7 @@ function system_admin_compact_mode() {
*/
function system_admin_compact_page($mode = 'off') {
user_cookie_save(array('admin_compact_mode' => ($mode == 'on')));
- drupal_goto();
+ redirect();
}
/**
@@ -2954,7 +2956,7 @@ function system_get_module_admin_tasks($module, $info) {
$query
->fields('ml')
// Weight should be taken from {menu_links}, not {menu_router}.
- ->fields('m', array_diff(drupal_schema_fields_sql('menu_router'), array('weight')))
+ ->fields('m', array_diff(schema_fields_sql('menu_router'), array('weight')))
->condition('ml.link_path', 'admin/%', 'LIKE')
->condition('ml.hidden', 0, '>=')
->condition('ml.module', 'system')
@@ -3030,12 +3032,12 @@ function system_cron() {
->condition('expiration', REQUEST_TIME, '<')
->execute();
- // Remove temporary files that are older than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
+ // Remove temporary files that are older than MAXIMUM_TEMP_FILE_AGE.
// Use separate placeholders for the status to avoid a bug in some versions
// of PHP. See http://drupal.org/node/352956.
$result = db_query('SELECT fid FROM {file_managed} WHERE status <> :permanent AND timestamp < :timestamp', array(
':permanent' => FILE_STATUS_PERMANENT,
- ':timestamp' => REQUEST_TIME - DRUPAL_MAXIMUM_TEMP_FILE_AGE
+ ':timestamp' => REQUEST_TIME - MAXIMUM_TEMP_FILE_AGE
));
foreach ($result as $row) {
if ($file = file_load($row->fid)) {
@@ -3110,7 +3112,7 @@ function system_action_info() {
'configurable' => FALSE,
'triggers' => array('any'),
),
- 'system_goto_action' => array(
+ 'system_redirect_action' => array(
'type' => 'system',
'label' => t('Redirect to URL'),
'configurable' => TRUE,
@@ -3232,7 +3234,7 @@ function system_send_email_action($entity, $context) {
}
$params = array('context' => $context);
- if (drupal_mail('system', 'action_send_email', $recipient, $language, $params)) {
+ if (mail('system', 'action_send_email', $recipient, $language, $params)) {
watchdog('action', 'Sent email to %recipient', array('%recipient' => $recipient));
}
else {
@@ -3290,13 +3292,13 @@ function system_message_action(&$entity, $context = array()) {
}
$context['message'] = token_replace(filter_xss_admin($context['message']), $context);
- drupal_set_message($context['message']);
+ set_message($context['message']);
}
/**
- * Settings form for system_goto_action().
+ * Settings form for system_redirect_action().
*/
-function system_goto_action_form($context) {
+function system_redirect_action_form($context) {
$form['url'] = array(
'#type' => 'textfield',
'#title' => t('URL'),
@@ -3307,7 +3309,7 @@ function system_goto_action_form($context) {
return $form;
}
-function system_goto_action_submit($form, $form_state) {
+function system_redirect_action_submit($form, $form_state) {
return array(
'url' => $form_state['values']['url']
);
@@ -3326,8 +3328,8 @@ function system_goto_action_submit($form, $form_state) {
*
* @ingroup actions
*/
-function system_goto_action($entity, $context) {
- drupal_goto(token_replace($context['url'], $context));
+function system_redirect_action($entity, $context) {
+ redirect(token_replace($context['url'], $context));
}
/**
@@ -3368,20 +3370,20 @@ function system_time_zones($blank = NULL) {
/**
* Checks whether the server is capable of issuing HTTP requests.
*
- * The function sets the drupal_http_request_fail system variable to TRUE if
- * drupal_http_request() does not work and then the system status report page
+ * The function sets the http_request_fail system variable to TRUE if
+ * http_request() does not work and then the system status report page
* will contain an error.
*
* @return
* TRUE if this installation can issue HTTP requests.
*/
function system_check_http_request() {
- // Try to get the content of the front page via drupal_http_request().
- $result = drupal_http_request(url('', array('absolute' => TRUE)), array('max_redirects' => 0));
+ // Try to get the content of the front page via http_request().
+ $result = http_request(url('', array('absolute' => TRUE)), array('max_redirects' => 0));
// We only care that we get a http response - this means that Drupal
// can make a http request.
$works = isset($result->code) && ($result->code >= 100) && ($result->code < 600);
- variable_set('drupal_http_request_fails', !$works);
+ variable_set('http_request_fails', !$works);
return $works;
}
@@ -3393,7 +3395,7 @@ function system_timezone($abbreviation = '', $offset = -1, $is_daylight_saving_t
// interpreted as the empty string.
$abbreviation = $abbreviation ? $abbreviation : '';
$timezone = timezone_name_from_abbr($abbreviation, intval($offset), $is_daylight_saving_time);
- drupal_json_output($timezone);
+ json_output($timezone);
}
/**
@@ -3413,10 +3415,10 @@ function theme_system_powered_by() {
function theme_system_compact_link() {
$output = '
';
if (system_admin_compact_mode()) {
- $output .= l(t('Show descriptions'), 'admin/compact/off', array('attributes' => array('title' => t('Expand layout to include descriptions.')), 'query' => drupal_get_destination()));
+ $output .= l(t('Show descriptions'), 'admin/compact/off', array('attributes' => array('title' => t('Expand layout to include descriptions.')), 'query' => get_destination()));
}
else {
- $output .= l(t('Hide descriptions'), 'admin/compact/on', array('attributes' => array('title' => t('Compress layout by hiding descriptions.')), 'query' => drupal_get_destination()));
+ $output .= l(t('Hide descriptions'), 'admin/compact/on', array('attributes' => array('title' => t('Compress layout by hiding descriptions.')), 'query' => get_destination()));
}
$output .= '
';
@@ -3427,17 +3429,17 @@ function theme_system_compact_link() {
* Implements hook_image_toolkits().
*/
function system_image_toolkits() {
- include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'system') . '/' . 'image.gd.inc';
+ include_once ROOT . '/' . get_path('module', 'system') . '/' . 'image.gd.inc';
return array(
'gd' => array(
'title' => t('GD2 image manipulation toolkit'),
- 'available' => function_exists('image_gd_check_settings') && image_gd_check_settings(),
+ 'available' => function_exists('Drupal\image_gd_check_settings') && image_gd_check_settings(),
),
);
}
/**
- * Attempts to get a file using drupal_http_request and to store it locally.
+ * Attempts to get a file using http_request and to store it locally.
*
* @param $url
* The URL of the file to grab.
@@ -3467,25 +3469,25 @@ function system_image_toolkits() {
function system_retrieve_file($url, $destination = NULL, $managed = FALSE, $replace = FILE_EXISTS_RENAME) {
$parsed_url = parse_url($url);
if (!isset($destination)) {
- $path = file_build_uri(drupal_basename($parsed_url['path']));
+ $path = file_build_uri(basename($parsed_url['path']));
}
else {
if (is_dir(drupal_realpath($destination))) {
// Prevent URIs with triple slashes when glueing parts together.
- $path = str_replace('///', '//', "$destination/") . drupal_basename($parsed_url['path']);
+ $path = str_replace('///', '//', "$destination/") . basename($parsed_url['path']);
}
else {
$path = $destination;
}
}
- $result = drupal_http_request($url);
+ $result = http_request($url);
if ($result->code != 200) {
- drupal_set_message(t('HTTP error @errorcode occurred when trying to fetch @remote.', array('@errorcode' => $result->code, '@remote' => $url)), 'error');
+ set_message(t('HTTP error @errorcode occurred when trying to fetch @remote.', array('@errorcode' => $result->code, '@remote' => $url)), 'error');
return FALSE;
}
$local = $managed ? file_save_data($result->data, $path, $replace) : file_unmanaged_save_data($result->data, $path, $replace);
if (!$local) {
- drupal_set_message(t('@remote could not be saved to @path.', array('@remote' => $url, '@path' => $path)), 'error');
+ set_message(t('@remote could not be saved to @path.', array('@remote' => $url, '@path' => $path)), 'error');
}
return $local;
@@ -3513,10 +3515,10 @@ function system_run_automated_cron() {
// If the site is not fully installed, suppress the automated cron run.
// Otherwise it could be triggered prematurely by Ajax requests during
// installation.
- if (($threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD)) > 0 && variable_get('install_task') == 'done') {
+ if (($threshold = variable_get('cron_safe_threshold', CRON_DEFAULT_THRESHOLD)) > 0 && variable_get('install_task') == 'done') {
$cron_last = variable_get('cron_last', NULL);
if (!isset($cron_last) || (REQUEST_TIME - $cron_last > $threshold)) {
- drupal_cron_run();
+ cron_run();
}
}
}
@@ -3567,7 +3569,7 @@ function system_date_format_types() {
* Implements hook_date_formats().
*/
function system_date_formats() {
- include_once DRUPAL_ROOT . '/core/includes/date.inc';
+ include_once ROOT . '/core/includes/date.inc';
return system_default_date_formats();
}
@@ -3627,7 +3629,7 @@ function system_get_date_format($dfid) {
* Resets the database cache of date formats and saves all new date formats.
*/
function system_date_formats_rebuild() {
- drupal_static_reset('system_get_date_formats');
+ drupal_static_reset('Drupal\system_get_date_formats');
$date_formats = system_get_date_formats(NULL);
foreach ($date_formats as $type => $formats) {
@@ -3637,7 +3639,7 @@ function system_date_formats_rebuild() {
}
// Rebuild configured date formats locale list.
- drupal_static_reset('system_date_format_locale');
+ drupal_static_reset('Drupal\system_date_format_locale');
system_date_format_locale();
_system_date_formats_build();
@@ -3738,7 +3740,7 @@ function _system_date_format_types_build() {
}
// Allow other modules to modify these date types.
- drupal_alter('date_format_types', $types);
+ alter('date_format_types', $types);
return $types;
}
@@ -3825,7 +3827,7 @@ function _system_date_formats_build() {
}
// Allow other modules to modify these formats.
- drupal_alter('date_formats', $date_formats);
+ alter('date_formats', $date_formats);
return $date_formats;
}
@@ -3850,10 +3852,10 @@ function system_date_format_type_save($type) {
// Update date_format table.
if (!empty($type['is_new'])) {
- drupal_write_record('date_format_type', $info);
+ write_record('date_format_type', $info);
}
else {
- drupal_write_record('date_format_type', $info, 'type');
+ write_record('date_format_type', $info, 'type');
}
}
@@ -3900,11 +3902,11 @@ function system_date_format_save($date_format, $dfid = 0) {
// Update date_format table.
if (!empty($date_format['is_new'])) {
- drupal_write_record('date_formats', $info);
+ write_record('date_formats', $info);
}
else {
$keys = ($dfid ? array('dfid') : array('format', 'type'));
- drupal_write_record('date_formats', $info, $keys);
+ write_record('date_formats', $info, $keys);
}
// Retrieve an array of language objects for enabled languages.
@@ -3922,7 +3924,7 @@ function system_date_format_save($date_format, $dfid = 0) {
$is_existing = (bool) db_query_range('SELECT 1 FROM {date_format_locale} WHERE type = :type AND language = :language', 0, 1, array(':type' => $date_format['type'], ':language' => $langcode))->fetchField();
if (!$is_existing) {
$locale_format['language'] = $langcode;
- drupal_write_record('date_format_locale', $locale_format);
+ write_record('date_format_locale', $locale_format);
}
}
}
@@ -3971,7 +3973,7 @@ function system_archiver_info() {
* @ingroup themeable
*/
function theme_confirm_form($variables) {
- return drupal_render_children($variables['form']);
+ return render_children($variables['form']);
}
/**
@@ -3987,7 +3989,7 @@ function theme_confirm_form($variables) {
* @ingroup themeable
*/
function theme_system_settings_form($variables) {
- return drupal_render_children($variables['form']);
+ return render_children($variables['form']);
}
/**
@@ -4014,7 +4016,7 @@ function theme_exposed_filters($variables) {
$output .= theme('item_list', array('items' => $items, 'attributes' => array('class' => array('clearfix', 'current-filters'))));
}
- $output .= drupal_render_children($form);
+ $output .= render_children($form);
return '
' . $output . '
';
}
diff --git a/core/modules/system/system.queue.inc b/core/modules/system/system.queue.inc
index 00d3940..9d05505 100644
--- a/core/modules/system/system.queue.inc
+++ b/core/modules/system/system.queue.inc
@@ -1,4 +1,6 @@
fields(array(
'name' => $this->name,
@@ -300,7 +303,7 @@ class SystemQueue implements DrupalReliableQueueInterface {
* interface. The queue data resides in memory. It should only be used for
* items that will be queued and dequeued within a given page request.
*/
-class MemoryQueue implements DrupalQueueInterface {
+class MemoryQueue implements QueueInterface {
/**
* The queue data.
*
diff --git a/core/modules/system/system.tar.inc b/core/modules/system/system.tar.inc
index 32bf7f0..c7735b0 100644
--- a/core/modules/system/system.tar.inc
+++ b/core/modules/system/system.tar.inc
@@ -1,4 +1,6 @@
fields(array(
@@ -792,7 +794,7 @@ class CronRunTestCase extends DrupalWebTestCase {
->execute();
$this->assertTrue(file_exists($temp_old->uri), t('Old temp file was created correctly.'));
- // Temporary file that is less than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
+ // Temporary file that is less than MAXIMUM_TEMP_FILE_AGE.
$temp_new = file_save_data('');
db_update('file_managed')
->fields(array('status' => 0))
@@ -800,7 +802,7 @@ class CronRunTestCase extends DrupalWebTestCase {
->execute();
$this->assertTrue(file_exists($temp_new->uri), t('New temp file was created correctly.'));
- // Permanent file that is older than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
+ // Permanent file that is older than MAXIMUM_TEMP_FILE_AGE.
$perm_old = file_save_data('');
db_update('file_managed')
->fields(array('timestamp' => 1))
@@ -808,7 +810,7 @@ class CronRunTestCase extends DrupalWebTestCase {
->execute();
$this->assertTrue(file_exists($perm_old->uri), t('Old permanent file was created correctly.'));
- // Permanent file that is newer than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
+ // Permanent file that is newer than MAXIMUM_TEMP_FILE_AGE.
$perm_new = file_save_data('');
$this->assertTrue(file_exists($perm_new->uri), t('New permanent file was created correctly.'));
@@ -834,7 +836,7 @@ class CronRunTestCase extends DrupalWebTestCase {
}
}
-class AdminMetaTagTestCase extends DrupalWebTestCase {
+class AdminMetaTagTestCase extends WebTestCase {
/**
* Implement getInfo().
*/
@@ -860,7 +862,7 @@ class AdminMetaTagTestCase extends DrupalWebTestCase {
/**
* Tests custom access denied functionality.
*/
-class AccessDeniedTestCase extends DrupalWebTestCase {
+class AccessDeniedTestCase extends WebTestCase {
protected $admin_user;
public static function getInfo() {
@@ -934,7 +936,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
}
}
-class PageNotFoundTestCase extends DrupalWebTestCase {
+class PageNotFoundTestCase extends WebTestCase {
protected $admin_user;
/**
@@ -980,7 +982,7 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
/**
* Tests site maintenance functionality.
*/
-class SiteMaintenanceTestCase extends DrupalWebTestCase {
+class SiteMaintenanceTestCase extends WebTestCase {
protected $admin_user;
public static function getInfo() {
@@ -1081,7 +1083,7 @@ class SiteMaintenanceTestCase extends DrupalWebTestCase {
/**
* Tests generic date and time handling capabilities of Drupal.
*/
-class DateTimeFunctionalTest extends DrupalWebTestCase {
+class DateTimeFunctionalTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Date and time',
@@ -1274,7 +1276,7 @@ class DateTimeFunctionalTest extends DrupalWebTestCase {
}
}
-class PageTitleFiltering extends DrupalWebTestCase {
+class PageTitleFiltering extends WebTestCase {
protected $content_user;
protected $saved_title;
@@ -1284,7 +1286,7 @@ class PageTitleFiltering extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'HTML in page titles',
- 'description' => 'Tests correct handling or conversion by drupal_set_title() and drupal_get_title() and checks the correct escaping of site name and slogan.',
+ 'description' => 'Tests correct handling or conversion by set_title() and get_title() and checks the correct escaping of site name and slogan.',
'group' => 'System'
);
}
@@ -1297,7 +1299,7 @@ class PageTitleFiltering extends DrupalWebTestCase {
$this->content_user = $this->drupalCreateUser(array('create page content', 'access content', 'administer themes', 'administer site configuration'));
$this->drupalLogin($this->content_user);
- $this->saved_title = drupal_get_title();
+ $this->saved_title = get_title();
}
/**
@@ -1305,24 +1307,24 @@ class PageTitleFiltering extends DrupalWebTestCase {
*/
function tearDown() {
// Restore the page title.
- drupal_set_title($this->saved_title, PASS_THROUGH);
+ set_title($this->saved_title, PASS_THROUGH);
parent::tearDown();
}
/**
- * Tests the handling of HTML by drupal_set_title() and drupal_get_title()
+ * Tests the handling of HTML by set_title() and get_title()
*/
function testTitleTags() {
$title = "string with
HTML";
- // drupal_set_title's $filter is CHECK_PLAIN by default, so the title should be
+ // set_title's $filter is CHECK_PLAIN by default, so the title should be
// returned with check_plain().
- drupal_set_title($title, CHECK_PLAIN);
- $this->assertTrue(strpos(drupal_get_title(), '
') === FALSE, t('Tags in title converted to entities when $output is CHECK_PLAIN.'));
- // drupal_set_title's $filter is passed as PASS_THROUGH, so the title should be
+ set_title($title, CHECK_PLAIN);
+ $this->assertTrue(strpos(get_title(), '') === FALSE, t('Tags in title converted to entities when $output is CHECK_PLAIN.'));
+ // set_title's $filter is passed as PASS_THROUGH, so the title should be
// returned with HTML.
- drupal_set_title($title, PASS_THROUGH);
- $this->assertTrue(strpos(drupal_get_title(), '') !== FALSE, t('Tags in title are not converted to entities when $output is PASS_THROUGH.'));
+ set_title($title, PASS_THROUGH);
+ $this->assertTrue(strpos(get_title(), '') !== FALSE, t('Tags in title are not converted to entities when $output is PASS_THROUGH.'));
// Generate node content.
$langcode = LANGUAGE_NONE;
$edit = array(
@@ -1369,7 +1371,7 @@ class PageTitleFiltering extends DrupalWebTestCase {
// Test the title.
$this->assertNoRaw($title, 'Check for the unfiltered version of the title.');
- // Adding so we do not test the escaped version from drupal_set_title().
+ // Adding so we do not test the escaped version from set_title().
$this->assertRaw($title_filtered . '', 'Check for the filtered version of the title.');
// Test the slogan.
@@ -1381,7 +1383,7 @@ class PageTitleFiltering extends DrupalWebTestCase {
/**
* Test front page functionality and administration.
*/
-class FrontPageTestCase extends DrupalWebTestCase {
+class FrontPageTestCase extends WebTestCase {
public static function getInfo() {
return array(
@@ -1433,7 +1435,7 @@ class FrontPageTestCase extends DrupalWebTestCase {
}
}
-class SystemBlockTestCase extends DrupalWebTestCase {
+class SystemBlockTestCase extends WebTestCase {
protected $profile = 'testing';
public static function getInfo() {
@@ -1502,7 +1504,7 @@ class SystemBlockTestCase extends DrupalWebTestCase {
/**
* Test main content rendering fallback provided by system module.
*/
-class SystemMainContentFallback extends DrupalWebTestCase {
+class SystemMainContentFallback extends WebTestCase {
protected $admin_user;
protected $web_user;
@@ -1586,7 +1588,7 @@ class SystemMainContentFallback extends DrupalWebTestCase {
/**
* Tests for the theme interface functionality.
*/
-class SystemThemeFunctionalTest extends DrupalWebTestCase {
+class SystemThemeFunctionalTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Theme interface functionality',
@@ -1708,7 +1710,7 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
/**
* Test the basic queue functionality.
*/
-class QueueTestCase extends DrupalWebTestCase {
+class QueueTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Queue functionality',
@@ -1722,9 +1724,9 @@ class QueueTestCase extends DrupalWebTestCase {
*/
function testQueue() {
// Create two queues.
- $queue1 = DrupalQueue::get($this->randomName());
+ $queue1 = Queue::get($this->randomName());
$queue1->createQueue();
- $queue2 = DrupalQueue::get($this->randomName());
+ $queue2 = Queue::get($this->randomName());
$queue2->createQueue();
// Create four items.
@@ -1799,7 +1801,7 @@ class QueueTestCase extends DrupalWebTestCase {
/**
* Test token replacement in strings.
*/
-class TokenReplaceTestCase extends DrupalWebTestCase {
+class TokenReplaceTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Token replacement',
@@ -1952,7 +1954,7 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
}
}
-class InfoFileParserTestCase extends DrupalUnitTestCase {
+class InfoFileParserTestCase extends UnitTestCase {
public static function getInfo() {
return array(
'name' => 'Info file format parser',
@@ -1962,7 +1964,7 @@ class InfoFileParserTestCase extends DrupalUnitTestCase {
}
/**
- * Test drupal_parse_info_format().
+ * Test parse_info_format().
*/
function testDrupalParseInfoFormat() {
$config = '
@@ -2009,7 +2011,7 @@ array_space[a b] = Value';
),
);
- $parsed = drupal_parse_info_format($config);
+ $parsed = parse_info_format($config);
$this->assertEqual($parsed['simple'], $expected['simple'], t('Set a simple value.'));
$this->assertEqual($parsed['quoted'], $expected['quoted'], t('Set a simple value in quotes.'));
@@ -2026,7 +2028,7 @@ array_space[a b] = Value';
/**
* Tests the effectiveness of hook_system_info_alter().
*/
-class SystemInfoAlterTestCase extends DrupalWebTestCase {
+class SystemInfoAlterTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'System info alter',
@@ -2044,7 +2046,7 @@ class SystemInfoAlterTestCase extends DrupalWebTestCase {
// Enable our test module. Flush all caches, which we assert is the only
// thing necessary to use the rebuilt {system}.info.
module_enable(array('module_test'), FALSE);
- drupal_flush_all_caches();
+ flush_all_caches();
$this->assertTrue(module_exists('module_test'), t('Test module is enabled.'));
$info = $this->getSystemInfo('seven', 'theme');
@@ -2059,7 +2061,7 @@ class SystemInfoAlterTestCase extends DrupalWebTestCase {
// Disable the module and verify that {system}.info is rebuilt without it.
module_disable(array('module_test'), FALSE);
- drupal_flush_all_caches();
+ flush_all_caches();
$this->assertFalse(module_exists('module_test'), t('Test module is disabled.'));
$info = $this->getSystemInfo('seven', 'theme');
@@ -2093,7 +2095,7 @@ class SystemInfoAlterTestCase extends DrupalWebTestCase {
/**
* Tests for the update system functionality.
*/
-class UpdateScriptFunctionalTest extends DrupalWebTestCase {
+class UpdateScriptFunctionalTest extends WebTestCase {
private $update_url;
private $update_user;
@@ -2134,7 +2136,7 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
// Access the update page as user 1.
$user1 = user_load(1);
$user1->pass_raw = user_password();
- require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc');
+ require_once ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc');
$user1->pass = user_hash_password(trim($user1->pass_raw));
db_query("UPDATE {users} SET pass = :pass WHERE uid = :uid", array(':pass' => $user1->pass, ':uid' => $user1->uid));
$this->drupalLogin($user1);
@@ -2163,7 +2165,7 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
// First, run this test with pending updates to make sure they can be run
// successfully.
variable_set('update_script_test_requirement_type', REQUIREMENT_WARNING);
- drupal_set_installed_schema_version('update_script_test', drupal_get_installed_schema_version('update_script_test') - 1);
+ set_installed_schema_version('update_script_test', get_installed_schema_version('update_script_test') - 1);
$this->drupalGet($this->update_url, array('external' => TRUE));
$this->assertText('This is a requirements warning provided by the update_script_test module.');
$this->clickLink('try again');
@@ -2212,7 +2214,7 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
/**
* Functional tests for the flood control mechanism.
*/
-class FloodFunctionalTest extends DrupalWebTestCase {
+class FloodFunctionalTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Flood control mechanism',
@@ -2250,7 +2252,7 @@ class FloodFunctionalTest extends DrupalWebTestCase {
/**
* Test HTTP file downloading capability.
*/
-class RetrieveFileTestCase extends DrupalWebTestCase {
+class RetrieveFileTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'HTTP file retrieval',
@@ -2299,7 +2301,7 @@ class RetrieveFileTestCase extends DrupalWebTestCase {
/**
* Functional tests shutdown functions.
*/
-class ShutdownFunctionsTest extends DrupalWebTestCase {
+class ShutdownFunctionsTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Shutdown functions',
@@ -2322,7 +2324,7 @@ class ShutdownFunctionsTest extends DrupalWebTestCase {
$this->assertText(t('First shutdown function, arg1 : @arg1, arg2: @arg2', array('@arg1' => $arg1, '@arg2' => $arg2)));
$this->assertText(t('Second shutdown function, arg1 : @arg1, arg2: @arg2', array('@arg1' => $arg1, '@arg2' => $arg2)));
- // Make sure exceptions displayed through _drupal_render_exception_safe()
+ // Make sure exceptions displayed through _render_exception_safe()
// are correctly escaped.
$this->assertRaw('Drupal is <blink>awesome</blink>.');
}
@@ -2331,7 +2333,7 @@ class ShutdownFunctionsTest extends DrupalWebTestCase {
/**
* Tests administrative overview pages.
*/
-class SystemAdminTestCase extends DrupalWebTestCase {
+class SystemAdminTestCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Administrative pages',
@@ -2444,7 +2446,7 @@ class SystemAdminTestCase extends DrupalWebTestCase {
/**
* Tests authorize.php and related hooks.
*/
-class SystemAuthorizeCase extends DrupalWebTestCase {
+class SystemAuthorizeCase extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Authorize API',
@@ -2497,7 +2499,7 @@ class SystemAuthorizeCase extends DrupalWebTestCase {
/**
* Test the handling of requests containing 'index.php'.
*/
-class SystemIndexPhpTest extends DrupalWebTestCase {
+class SystemIndexPhpTest extends WebTestCase {
public static function getInfo() {
return array(
'name' => 'Index.php handling',
@@ -2530,7 +2532,7 @@ class SystemIndexPhpTest extends DrupalWebTestCase {
/**
* Tests uuid.inc and related functions.
*/
-class UuidUnitTestCase extends DrupalUnitTestCase {
+class UuidUnitTestCase extends UnitTestCase {
/**
* The UUID object to be used for generating UUIDs.
diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc
index fa95661..7404994 100644
--- a/core/modules/system/system.tokens.inc
+++ b/core/modules/system/system.tokens.inc
@@ -1,4 +1,5 @@
name)) {
+ if ($relative_path = get_path('module', $this->name)) {
$relative_path = dirname($relative_path);
}
else {
$relative_path = 'sites/all/modules';
}
- return DRUPAL_ROOT . '/' . $relative_path;
+ return ROOT . '/' . $relative_path;
}
public function isInstalled() {
- return (bool) drupal_get_path('module', $this->name);
+ return (bool) get_path('module', $this->name);
}
public static function canUpdateDirectory($directory) {
@@ -45,22 +46,22 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface {
}
public static function canUpdate($project_name) {
- return (bool) drupal_get_path('module', $project_name);
+ return (bool) get_path('module', $project_name);
}
/**
* Return available database schema updates one a new version is installed.
*/
public function getSchemaUpdates() {
- require_once DRUPAL_ROOT . '/core/includes/install.inc';
- require_once DRUPAL_ROOT . '/core/includes/update.inc';
+ require_once ROOT . '/core/includes/install.inc';
+ require_once ROOT . '/core/includes/update.inc';
if (_update_get_project_type($project) != 'module') {
return array();
}
module_load_include('install', $project);
- if (!$updates = drupal_get_schema_versions($project)) {
+ if (!$updates = get_schema_versions($project)) {
return array();
}
$updates_to_run = array();
@@ -90,14 +91,14 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface {
/**
* Class for updating themes using FileTransfer classes via authorize.php.
*/
-class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
+class ThemeUpdater extends Updater implements UpdaterInterface {
/**
* Return the directory where a theme should be installed.
*
- * If the theme is already installed, drupal_get_path() will return
+ * If the theme is already installed, get_path() will return
* a valid path and we should install it there (although we need to use an
- * absolute path, so we prepend DRUPAL_ROOT). If we're installing a new
+ * absolute path, so we prepend ROOT). If we're installing a new
* theme, we always want it to go into sites/all/themes, since that's
* where all the documentation recommends users install their themes, and
* there's no way that can conflict on a multi-site installation, since
@@ -105,17 +106,17 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
* found on your system, and if there was a copy in sites/all, we'd see it.
*/
public function getInstallDirectory() {
- if ($relative_path = drupal_get_path('theme', $this->name)) {
+ if ($relative_path = get_path('theme', $this->name)) {
$relative_path = dirname($relative_path);
}
else {
$relative_path = 'sites/all/themes';
}
- return DRUPAL_ROOT . '/' . $relative_path;
+ return ROOT . '/' . $relative_path;
}
public function isInstalled() {
- return (bool) drupal_get_path('theme', $this->name);
+ return (bool) get_path('theme', $this->name);
}
static function canUpdateDirectory($directory) {
@@ -127,7 +128,7 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
}
public static function canUpdate($project_name) {
- return (bool) drupal_get_path('theme', $project_name);
+ return (bool) get_path('theme', $project_name);
}
public function postInstall() {
diff --git a/core/modules/system/theme.api.php b/core/modules/system/theme.api.php
index 7fee81c..6df4be0 100644
--- a/core/modules/system/theme.api.php
+++ b/core/modules/system/theme.api.php
@@ -1,4 +1,5 @@
t('Operations'), 'colspan' => '3');
- return theme('table', array('header' => $header, 'rows' => $rows, 'empty' => t('No vocabularies available. Add vocabulary.', array('@link' => url('admin/structure/taxonomy/add'))), 'attributes' => array('id' => 'taxonomy'))) . drupal_render_children($form);
+ return theme('table', array('header' => $header, 'rows' => $rows, 'empty' => t('No vocabularies available. Add vocabulary.', array('@link' => url('admin/structure/taxonomy/add'))), 'attributes' => array('id' => 'taxonomy'))) . render_children($form);
}
/**
@@ -220,13 +221,13 @@ function taxonomy_form_vocabulary_submit($form, &$form_state) {
switch (taxonomy_vocabulary_save($vocabulary)) {
case SAVED_NEW:
- drupal_set_message(t('Created new vocabulary %name.', array('%name' => $vocabulary->name)));
+ set_message(t('Created new vocabulary %name.', array('%name' => $vocabulary->name)));
watchdog('taxonomy', 'Created new vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->machine_name . '/edit'));
$form_state['redirect'] = 'admin/structure/taxonomy/' . $vocabulary->machine_name;
break;
case SAVED_UPDATED:
- drupal_set_message(t('Updated vocabulary %name.', array('%name' => $vocabulary->name)));
+ set_message(t('Updated vocabulary %name.', array('%name' => $vocabulary->name)));
watchdog('taxonomy', 'Updated vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->machine_name . '/edit'));
$form_state['redirect'] = 'admin/structure/taxonomy';
break;
@@ -392,7 +393,7 @@ function taxonomy_overview_terms($form, &$form_state, $vocabulary) {
'#default_value' => $term->weight,
);
}
- $form[$key]['edit'] = array('#type' => 'link', '#title' => t('edit'), '#href' => 'taxonomy/term/' . $term->tid . '/edit', '#options' => array('query' => drupal_get_destination()));
+ $form[$key]['edit'] = array('#type' => 'link', '#title' => t('edit'), '#href' => 'taxonomy/term/' . $term->tid . '/edit', '#options' => array('query' => get_destination()));
}
$form['#total_entries'] = $total_entries;
@@ -446,7 +447,7 @@ function taxonomy_overview_terms_submit($form, &$form_state) {
}
// Sort term order based on weight.
- uasort($form_state['values'], 'drupal_sort_weight');
+ uasort($form_state['values'], 'Drupal\sort_weight');
$vocabulary = $form['#vocabulary'];
// Update the current hierarchy type as we go.
@@ -533,7 +534,7 @@ function taxonomy_overview_terms_submit($form, &$form_state) {
$vocabulary->hierarchy = $hierarchy;
taxonomy_vocabulary_save($vocabulary);
}
- drupal_set_message(t('The configuration options have been saved.'));
+ set_message(t('The configuration options have been saved.'));
}
/**
@@ -556,13 +557,13 @@ function theme_taxonomy_overview_terms($variables) {
// Add drag and drop if parent fields are present in the form.
if ($form['#parent_fields']) {
- drupal_add_tabledrag('taxonomy', 'match', 'parent', 'term-parent', 'term-parent', 'term-id', FALSE);
- drupal_add_tabledrag('taxonomy', 'depth', 'group', 'term-depth', NULL, NULL, FALSE);
- drupal_add_js(drupal_get_path('module', 'taxonomy') . '/taxonomy.js');
- drupal_add_js(array('taxonomy' => array('backStep' => $back_step, 'forwardStep' => $forward_step)), 'setting');
- drupal_add_css(drupal_get_path('module', 'taxonomy') . '/taxonomy.css');
+ add_tabledrag('taxonomy', 'match', 'parent', 'term-parent', 'term-parent', 'term-id', FALSE);
+ add_tabledrag('taxonomy', 'depth', 'group', 'term-depth', NULL, NULL, FALSE);
+ add_js(get_path('module', 'taxonomy') . '/taxonomy.js');
+ add_js(array('taxonomy' => array('backStep' => $back_step, 'forwardStep' => $forward_step)), 'setting');
+ add_css(get_path('module', 'taxonomy') . '/taxonomy.css');
}
- drupal_add_tabledrag('taxonomy', 'order', 'sibling', 'term-weight');
+ add_tabledrag('taxonomy', 'order', 'sibling', 'term-weight');
$errors = form_get_errors() != FALSE ? form_get_errors() : array();
$rows = array();
@@ -623,7 +624,7 @@ function theme_taxonomy_overview_terms($variables) {
$header = array(t('Name'), t('Weight'), t('Operations'));
$output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'taxonomy')));
- $output .= drupal_render_children($form);
+ $output .= render_children($form);
$output .= theme('pager');
return $output;
@@ -815,11 +816,11 @@ function taxonomy_form_term_submit($form, &$form_state) {
$status = taxonomy_term_save($term);
switch ($status) {
case SAVED_NEW:
- drupal_set_message(t('Created new term %term.', array('%term' => $term->name)));
+ set_message(t('Created new term %term.', array('%term' => $term->name)));
watchdog('taxonomy', 'Created new term %term.', array('%term' => $term->name), WATCHDOG_NOTICE, l(t('edit'), 'taxonomy/term/' . $term->tid . '/edit'));
break;
case SAVED_UPDATED:
- drupal_set_message(t('Updated term %term.', array('%term' => $term->name)));
+ set_message(t('Updated term %term.', array('%term' => $term->name)));
watchdog('taxonomy', 'Updated term %term.', array('%term' => $term->name), WATCHDOG_NOTICE, l(t('edit'), 'taxonomy/term/' . $term->tid . '/edit'));
// Clear the page and block caches to avoid stale data.
cache_clear_all();
@@ -898,7 +899,7 @@ function taxonomy_term_confirm_delete($form, &$form_state, $tid) {
function taxonomy_term_confirm_delete_submit($form, &$form_state) {
taxonomy_term_delete($form_state['values']['tid']);
taxonomy_check_vocabulary_hierarchy($form['#vocabulary'], $form_state['values']);
- drupal_set_message(t('Deleted term %name.', array('%name' => $form_state['values']['name'])));
+ set_message(t('Deleted term %name.', array('%name' => $form_state['values']['name'])));
watchdog('taxonomy', 'Deleted term %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/structure/taxonomy';
cache_clear_all();
@@ -938,7 +939,7 @@ function taxonomy_vocabulary_confirm_delete($form, &$form_state, $vid) {
*/
function taxonomy_vocabulary_confirm_delete_submit($form, &$form_state) {
$status = taxonomy_vocabulary_delete($form_state['values']['vid']);
- drupal_set_message(t('Deleted vocabulary %name.', array('%name' => $form_state['values']['name'])));
+ set_message(t('Deleted vocabulary %name.', array('%name' => $form_state['values']['name'])));
watchdog('taxonomy', 'Deleted vocabulary %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/structure/taxonomy';
cache_clear_all();
@@ -978,7 +979,7 @@ function taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, &$form_sta
->fields(array('weight' => 0))
->condition('vid', $form_state['values']['vid'])
->execute();
- drupal_set_message(t('Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name'])));
+ set_message(t('Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name'])));
watchdog('taxonomy', 'Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/structure/taxonomy/' . $form_state['values']['machine_name'];
}
diff --git a/core/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php
index 426306d..53eb91b 100644
--- a/core/modules/taxonomy/taxonomy.api.php
+++ b/core/modules/taxonomy/taxonomy.api.php
@@ -1,4 +1,5 @@
'Taxonomy',
'description' => 'Manage tagging, categorization, and classification of your content.',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('taxonomy_overview_vocabularies'),
'access arguments' => array('administer taxonomy'),
'file' => 'taxonomy.admin.inc',
@@ -287,7 +289,7 @@ function taxonomy_menu() {
);
$items['admin/structure/taxonomy/add'] = array(
'title' => 'Add vocabulary',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('taxonomy_form_vocabulary'),
'access arguments' => array('administer taxonomy'),
'type' => MENU_LOCAL_ACTION,
@@ -309,7 +311,7 @@ function taxonomy_menu() {
);
$items['taxonomy/term/%taxonomy_term/edit'] = array(
'title' => 'Edit',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
// Pass a NULL argument to ensure that additional path components are not
// passed to taxonomy_form_term() as the vocabulary machine name argument.
'page arguments' => array('taxonomy_form_term', 2, NULL),
@@ -340,7 +342,7 @@ function taxonomy_menu() {
$items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name'] = array(
'title callback' => 'taxonomy_admin_vocabulary_title_callback',
'title arguments' => array(3),
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('taxonomy_overview_terms', 3),
'access arguments' => array('administer taxonomy'),
'file' => 'taxonomy.admin.inc',
@@ -352,7 +354,7 @@ function taxonomy_menu() {
);
$items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/edit'] = array(
'title' => 'Edit',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('taxonomy_form_vocabulary', 3),
'access arguments' => array('administer taxonomy'),
'type' => MENU_LOCAL_TASK,
@@ -362,7 +364,7 @@ function taxonomy_menu() {
$items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/add'] = array(
'title' => 'Add term',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('taxonomy_form_term', array(), 3),
'access arguments' => array('administer taxonomy'),
'type' => MENU_LOCAL_ACTION,
@@ -438,7 +440,7 @@ function taxonomy_vocabulary_save($vocabulary) {
module_invoke_all('entity_presave', $vocabulary, 'taxonomy_vocabulary');
if (!empty($vocabulary->vid) && !empty($vocabulary->name)) {
- $status = drupal_write_record('taxonomy_vocabulary', $vocabulary, 'vid');
+ $status = write_record('taxonomy_vocabulary', $vocabulary, 'vid');
taxonomy_vocabulary_static_reset(array($vocabulary->vid));
if ($vocabulary->old_machine_name != $vocabulary->machine_name) {
field_attach_rename_bundle('taxonomy_term', $vocabulary->old_machine_name, $vocabulary->machine_name);
@@ -447,7 +449,7 @@ function taxonomy_vocabulary_save($vocabulary) {
module_invoke_all('entity_update', $vocabulary, 'taxonomy_vocabulary');
}
elseif (empty($vocabulary->vid)) {
- $status = drupal_write_record('taxonomy_vocabulary', $vocabulary);
+ $status = write_record('taxonomy_vocabulary', $vocabulary);
taxonomy_vocabulary_static_reset();
field_attach_create_bundle('taxonomy_term', $vocabulary->machine_name);
module_invoke_all('taxonomy_vocabulary_insert', $vocabulary);
@@ -627,7 +629,7 @@ function taxonomy_term_save($term) {
if (empty($term->tid)) {
$op = 'insert';
- $status = drupal_write_record('taxonomy_term_data', $term);
+ $status = write_record('taxonomy_term_data', $term);
field_attach_insert('taxonomy_term', $term);
if (!isset($term->parent)) {
$term->parent = array(0);
@@ -635,7 +637,7 @@ function taxonomy_term_save($term) {
}
else {
$op = 'update';
- $status = drupal_write_record('taxonomy_term_data', $term, 'tid');
+ $status = write_record('taxonomy_term_data', $term, 'tid');
field_attach_update('taxonomy_term', $term);
if (isset($term->parent)) {
db_delete('taxonomy_term_hierarchy')
@@ -784,11 +786,11 @@ function taxonomy_term_view($term, $view_mode = 'full', $langcode = NULL) {
);
}
- $build['#attached']['css'][] = drupal_get_path('module', 'taxonomy') . '/taxonomy.css';
+ $build['#attached']['css'][] = get_path('module', 'taxonomy') . '/taxonomy.css';
// Allow modules to modify the structured term.
$type = 'taxonomy_term';
- drupal_alter(array('taxonomy_term_view', 'entity_view'), $build, $type);
+ alter(array('taxonomy_term_view', 'entity_view'), $build, $type);
return $build;
}
@@ -844,13 +846,13 @@ function taxonomy_term_is_page($term) {
* Clear all static cache variables for terms.
*/
function taxonomy_terms_static_reset() {
- drupal_static_reset('taxonomy_term_count_nodes');
- drupal_static_reset('taxonomy_get_tree');
- drupal_static_reset('taxonomy_get_tree:parents');
- drupal_static_reset('taxonomy_get_tree:terms');
- drupal_static_reset('taxonomy_term_load_parents');
- drupal_static_reset('taxonomy_term_load_parents_all');
- drupal_static_reset('taxonomy_term_load_children');
+ drupal_static_reset('Drupal\taxonomy_term_count_nodes');
+ drupal_static_reset('Drupal\taxonomy_get_tree');
+ drupal_static_reset('Drupal\taxonomy_get_tree:parents');
+ drupal_static_reset('Drupal\taxonomy_get_tree:terms');
+ drupal_static_reset('Drupal\taxonomy_term_load_parents');
+ drupal_static_reset('Drupal\taxonomy_term_load_parents_all');
+ drupal_static_reset('Drupal\taxonomy_term_load_children');
entity_get_controller('taxonomy_term')->resetCache();
}
@@ -861,7 +863,7 @@ function taxonomy_terms_static_reset() {
* An array of ids to reset in entity controller cache.
*/
function taxonomy_vocabulary_static_reset($ids = NULL) {
- drupal_static_reset('taxonomy_vocabulary_get_names');
+ drupal_static_reset('Drupal\taxonomy_vocabulary_get_names');
entity_get_controller('taxonomy_vocabulary')->resetCache($ids);
}
@@ -1117,10 +1119,10 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
/**
* Controller class for taxonomy terms.
*
- * This extends the DrupalDefaultEntityController class. Only alteration is
+ * This extends the DefaultEntityController class. Only alteration is
* that we match the condition on term name case-independently.
*/
-class TaxonomyTermController extends DrupalDefaultEntityController {
+class TaxonomyTermController extends DefaultEntityController {
protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
$query = parent::buildQuery($ids, $conditions, $revision_id);
@@ -1159,10 +1161,10 @@ class TaxonomyTermController extends DrupalDefaultEntityController {
/**
* Controller class for taxonomy vocabularies.
*
- * This extends the DrupalDefaultEntityController class, adding required
+ * This extends the DefaultEntityController class, adding required
* special handling for taxonomy vocabulary objects.
*/
-class TaxonomyVocabularyController extends DrupalDefaultEntityController {
+class TaxonomyVocabularyController extends DefaultEntityController {
protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
$query = parent::buildQuery($ids, $conditions, $revision_id);
@@ -1284,7 +1286,7 @@ function _taxonomy_get_tid_from_term($term) {
/**
* Implodes a list of tags of a certain vocabulary into a string.
*
- * @see drupal_explode_tags()
+ * @see explode_tags()
*/
function taxonomy_implode_tags($tags, $vid = NULL) {
$typed_tags = array();
@@ -1367,7 +1369,7 @@ function taxonomy_field_widget_info_alter(&$info) {
* Implements hook_options_list().
*/
function taxonomy_options_list($field, $instance) {
- $function = !empty($field['settings']['options_list_callback']) ? $field['settings']['options_list_callback'] : 'taxonomy_allowed_values';
+ $function = 'Drupal\\' . (!empty($field['settings']['options_list_callback']) ? $field['settings']['options_list_callback'] : 'taxonomy_allowed_values');
return $function($field);
}
@@ -1624,7 +1626,7 @@ function taxonomy_autocomplete_validate($element, &$form_state) {
}
// Translate term names into actual terms.
- $typed_terms = drupal_explode_tags($tags);
+ $typed_terms = explode_tags($tags);
foreach ($typed_terms as $typed_term) {
// See if the term exists in the chosen vocabulary and return the tid;
// otherwise, create a new 'autocreate' term for insert/update.
diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc
index aeb12d7..7cfa07e 100644
--- a/core/modules/taxonomy/taxonomy.pages.inc
+++ b/core/modules/taxonomy/taxonomy.pages.inc
@@ -1,4 +1,5 @@
name);
+ set_title($term->name);
// Build breadcrumb based on the hierarchy of the term.
$current = (object) array(
@@ -30,8 +31,8 @@ function taxonomy_term_page($term) {
}
$breadcrumb[] = l(t('Home'), NULL);
$breadcrumb = array_reverse($breadcrumb);
- drupal_set_breadcrumb($breadcrumb);
- drupal_add_feed('taxonomy/term/' . $term->tid . '/feed', 'RSS - ' . $term->name);
+ set_breadcrumb($breadcrumb);
+ add_feed('taxonomy/term/' . $term->tid . '/feed', 'RSS - ' . $term->name);
$build = array();
@@ -111,7 +112,7 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
$field = field_info_field($field_name);
// The user enters a comma-separated list of tags. We only autocomplete the last tag.
- $tags_typed = drupal_explode_tags($tags_typed);
+ $tags_typed = explode_tags($tags_typed);
$tag_last = drupal_strtolower(array_pop($tags_typed));
$matches = array();
@@ -141,7 +142,7 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
->execute()
->fetchAllKeyed();
- $prefix = count($tags_typed) ? drupal_implode_tags($tags_typed) . ', ' : '';
+ $prefix = count($tags_typed) ? implode_tags($tags_typed) . ', ' : '';
$term_matches = array();
foreach ($tags_return as $tid => $name) {
@@ -154,5 +155,5 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
}
}
- drupal_json_output($term_matches);
+ json_output($term_matches);
}
diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test
index aa3c209..6acefef 100644
--- a/core/modules/taxonomy/taxonomy.test
+++ b/core/modules/taxonomy/taxonomy.test
@@ -1,4 +1,6 @@
instance);
module_disable(array('taxonomy'));
- drupal_flush_all_caches();
- require_once DRUPAL_ROOT . '/core/includes/install.inc';
- drupal_uninstall_modules(array('taxonomy'));
+ flush_all_caches();
+ require_once ROOT . '/core/includes/install.inc';
+ uninstall_modules(array('taxonomy'));
module_enable(array('taxonomy'));
// Now create a vocabulary with the same name. All field instances
@@ -650,7 +652,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
$edit["body[$langcode][0][value]"] = $this->randomName();
// Insert the terms in a comma separated list. Vocabulary 1 is a
// free-tagging field created by the default profile.
- $edit[$instance['field_name'] . "[$langcode]"] = drupal_implode_tags($terms);
+ $edit[$instance['field_name'] . "[$langcode]"] = implode_tags($terms);
// Preview and verify the terms appear but are not created.
$this->drupalPost('node/add/page', $edit, t('Preview'));
@@ -786,9 +788,9 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
// Fetch the created terms in the default alphabetical order, i.e. term1
// precedes term2 alphabetically, and term2 precedes term3.
- drupal_static_reset('taxonomy_get_tree');
- drupal_static_reset('taxonomy_get_treeparent');
- drupal_static_reset('taxonomy_get_treeterms');
+ drupal_static_reset('Drupal\taxonomy_get_tree');
+ drupal_static_reset('Drupal\taxonomy_get_treeparent');
+ drupal_static_reset('Drupal\taxonomy_get_treeterms');
list($term1, $term2, $term3) = taxonomy_get_tree($this->vocabulary->vid);
$this->drupalGet('admin/structure/taxonomy/' . $this->vocabulary->machine_name);
@@ -813,9 +815,9 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
);
$this->drupalPost(NULL, $edit, t('Save'));
- drupal_static_reset('taxonomy_get_tree');
- drupal_static_reset('taxonomy_get_treeparent');
- drupal_static_reset('taxonomy_get_treeterms');
+ drupal_static_reset('Drupal\taxonomy_get_tree');
+ drupal_static_reset('Drupal\taxonomy_get_treeparent');
+ drupal_static_reset('Drupal\taxonomy_get_treeterms');
$terms = taxonomy_get_tree($this->vocabulary->vid);
$this->assertEqual($terms[0]->tid, $term2->tid, t('Term 2 was moved above term 1.'));
$this->assertEqual($terms[1]->parents, array($term2->tid), t('Term 3 was made a child of term 2.'));
@@ -825,9 +827,9 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
// Submit confirmation form.
$this->drupalPost(NULL, array(), t('Reset to alphabetical'));
- drupal_static_reset('taxonomy_get_tree');
- drupal_static_reset('taxonomy_get_treeparent');
- drupal_static_reset('taxonomy_get_treeterms');
+ drupal_static_reset('Drupal\taxonomy_get_tree');
+ drupal_static_reset('Drupal\taxonomy_get_treeparent');
+ drupal_static_reset('Drupal\taxonomy_get_treeterms');
$terms = taxonomy_get_tree($this->vocabulary->vid);
$this->assertEqual($terms[0]->tid, $term1->tid, t('Term 1 was moved to back above term 2.'));
$this->assertEqual($terms[1]->tid, $term2->tid, t('Term 2 was moved to back below term 1.'));
diff --git a/core/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc
index 24d7bc8..331b926 100644
--- a/core/modules/taxonomy/taxonomy.tokens.inc
+++ b/core/modules/taxonomy/taxonomy.tokens.inc
@@ -1,4 +1,5 @@
'toolbar',
'template' => 'toolbar',
- 'path' => drupal_get_path('module', 'toolbar'),
+ 'path' => get_path('module', 'toolbar'),
);
$items['toolbar_toggle'] = array(
'variables' => array(
@@ -76,7 +77,7 @@ function toolbar_toggle_page() {
// Toggle the value in the cookie.
setcookie('Drupal.toolbar.collapsed', !_toolbar_is_collapsed(), NULL, $base_path);
// Redirect the user from where he used the toggle element.
- drupal_goto();
+ redirect();
}
/**
@@ -100,7 +101,7 @@ function theme_toolbar_toggle($variables) {
$toggle_text = t('Hide shortcuts');
$variables['attributes']['class'][] = 'toggle-active';
}
- return l($toggle_text, 'toolbar/toggle', array('query' => drupal_get_destination(), 'attributes' => array('title' => $toggle_text) + $variables['attributes']));
+ return l($toggle_text, 'toolbar/toggle', array('query' => get_destination(), 'attributes' => array('title' => $toggle_text) + $variables['attributes']));
}
/**
@@ -190,7 +191,7 @@ function toolbar_system_info_alter(&$info, $file, $type) {
function toolbar_view() {
global $user;
- $module_path = drupal_get_path('module', 'toolbar');
+ $module_path = get_path('module', 'toolbar');
$build = array(
'#theme' => 'toolbar',
'#attached'=> array(
diff --git a/core/modules/toolbar/toolbar.tpl.php b/core/modules/toolbar/toolbar.tpl.php
index 342fa60..c14ef39 100644
--- a/core/modules/toolbar/toolbar.tpl.php
+++ b/core/modules/toolbar/toolbar.tpl.php
@@ -1,4 +1,5 @@
type);
diff --git a/core/modules/tracker/tracker.test b/core/modules/tracker/tracker.test
index a559f1b..f2ccd2e 100644
--- a/core/modules/tracker/tracker.test
+++ b/core/modules/tracker/tracker.test
@@ -1,11 +1,12 @@
tnid)) {
$translations = translation_node_get_translations($source_node->tnid);
if (isset($translations[$langcode])) {
- drupal_set_message(t('A translation of %title in %language already exists, a new %type will be created instead of a translation.', array('%title' => $source_node->title, '%language' => $language_list[$langcode]->name, '%type' => $node->type)), 'error');
+ set_message(t('A translation of %title in %language already exists, a new %type will be created instead of a translation.', array('%title' => $source_node->title, '%language' => $language_list[$langcode]->name, '%type' => $node->type)), 'error');
return;
}
}
diff --git a/core/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc
index 8c09850..9368559 100644
--- a/core/modules/translation/translation.pages.inc
+++ b/core/modules/translation/translation.pages.inc
@@ -1,4 +1,5 @@
tnid) {
// Already part of a set, grab that set.
@@ -65,7 +66,7 @@ function translation_node_overview($node) {
$rows[] = array($language_name, $title, $status, implode(" | ", $options));
}
- drupal_set_title(t('Translations of %title', array('%title' => $node->title)), PASS_THROUGH);
+ set_title(t('Translations of %title', array('%title' => $node->title)), PASS_THROUGH);
$build['translation_node_overview'] = array(
'#theme' => 'table',
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index dd00734..bc2fca0 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -1,11 +1,12 @@
drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
// Make sure we are not using a stale list.
- drupal_static_reset('language_list');
+ drupal_static_reset('Drupal\language_list');
$languages = language_list();
$this->assertTrue(array_key_exists($language_code, $languages), t('Language was installed successfully.'));
diff --git a/core/modules/update/tests/aaa_update_test.module b/core/modules/update/tests/aaa_update_test.module
index 4d67b8e..6fb054f 100644
--- a/core/modules/update/tests/aaa_update_test.module
+++ b/core/modules/update/tests/aaa_update_test.module
@@ -1,4 +1,5 @@
t('Preparing to update your site'),
'operations' => $operations,
'finished' => 'update_authorize_update_batch_finished',
- 'file' => drupal_get_path('module', 'update') . '/update.authorize.inc',
+ 'file' => get_path('module', 'update') . '/update.authorize.inc',
);
batch_set($batch);
@@ -81,7 +83,7 @@ function update_authorize_run_install($filetransfer, $project, $updater_name, $l
'operations' => $operations,
// @todo Use a different finished callback for different messages?
'finished' => 'update_authorize_install_batch_finished',
- 'file' => drupal_get_path('module', 'update') . '/update.authorize.inc',
+ 'file' => get_path('module', 'update') . '/update.authorize.inc',
);
batch_set($batch);
diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc
index 2ccd97c..e92c7c9 100644
--- a/core/modules/update/update.compare.inc
+++ b/core/modules/update/update.compare.inc
@@ -1,4 +1,5 @@
t('Checking available update data'),
'progress_message' => t('Trying to check available update data ...'),
'error_message' => t('Error checking available update data.'),
- 'file' => drupal_get_path('module', 'update') . '/update.fetch.inc',
+ 'file' => get_path('module', 'update') . '/update.fetch.inc',
);
batch_set($batch);
batch_process('admin/reports/updates');
@@ -28,7 +30,7 @@ function update_manual_status() {
* Process a step in the batch for fetching available update data.
*/
function update_fetch_data_batch(&$context) {
- $queue = DrupalQueue::get('update_fetch_tasks');
+ $queue = Queue::get('update_fetch_tasks');
if (empty($context['sandbox']['max'])) {
$context['finished'] = 0;
$context['sandbox']['max'] = $queue->numberOfItems();
@@ -83,15 +85,15 @@ function update_fetch_data_finished($success, $results) {
if ($success) {
if (!empty($results)) {
if (!empty($results['updated'])) {
- drupal_set_message(format_plural($results['updated'], 'Checked available update data for one project.', 'Checked available update data for @count projects.'));
+ set_message(format_plural($results['updated'], 'Checked available update data for one project.', 'Checked available update data for @count projects.'));
}
if (!empty($results['failures'])) {
- drupal_set_message(format_plural($results['failures'], 'Failed to get available update data for one project.', 'Failed to get available update data for @count projects.'), 'error');
+ set_message(format_plural($results['failures'], 'Failed to get available update data for one project.', 'Failed to get available update data for @count projects.'), 'error');
}
}
}
else {
- drupal_set_message(t('An error occurred trying to get available update data.'), 'error');
+ set_message(t('An error occurred trying to get available update data.'), 'error');
}
}
@@ -99,7 +101,7 @@ function update_fetch_data_finished($success, $results) {
* Attempt to drain the queue of tasks for release history data to fetch.
*/
function _update_fetch_data() {
- $queue = DrupalQueue::get('update_fetch_tasks');
+ $queue = Queue::get('update_fetch_tasks');
$end = time() + variable_get('update_max_fetch_time', UPDATE_MAX_FETCH_TIME);
while (time() < $end && ($item = $queue->claimItem())) {
_update_process_fetch_task($item->data);
@@ -136,13 +138,13 @@ function _update_process_fetch_task($project) {
$success = FALSE;
$available = array();
- $site_key = drupal_hmac_base64($base_url, drupal_get_private_key());
+ $site_key = hmac_base64($base_url, get_private_key());
$url = _update_build_fetch_url($project, $site_key);
$fetch_url_base = _update_get_fetch_url_base($project);
$project_name = $project['name'];
if (empty($fail[$fetch_url_base]) || $fail[$fetch_url_base] < $max_fetch_attempts) {
- $xml = drupal_http_request($url);
+ $xml = http_request($url);
if (!isset($xml->error) && isset($xml->data)) {
$data = $xml->data;
}
@@ -235,7 +237,7 @@ function _update_create_fetch_task($project) {
}
$cid = 'fetch_task::' . $project['name'];
if (empty($fetch_tasks[$cid])) {
- $queue = DrupalQueue::get('update_fetch_tasks');
+ $queue = Queue::get('update_fetch_tasks');
$queue->createItem($project);
db_insert('cache_update')
->fields(array(
@@ -266,7 +268,7 @@ function _update_create_fetch_task($project) {
function _update_build_fetch_url($project, $site_key = '') {
$name = $project['name'];
$url = _update_get_fetch_url_base($project);
- $url .= '/' . $name . '/' . DRUPAL_CORE_COMPATIBILITY;
+ $url .= '/' . $name . '/' . CORE_COMPATIBILITY;
// Only append a site_key and the version information if we have a site_key
// in the first place, and if this is not a disabled module or theme. We do
// not want to record usage statistics for disabled code.
@@ -330,7 +332,7 @@ function _update_cron_notify() {
else {
$target_language = $default_language;
}
- drupal_mail('update', 'status_notify', $target, $target_language, $params);
+ mail('update', 'status_notify', $target, $target_language, $params);
}
}
}
diff --git a/core/modules/update/update.install b/core/modules/update/update.install
index f0d5499..cc6e79c 100644
--- a/core/modules/update/update.install
+++ b/core/modules/update/update.install
@@ -1,4 +1,5 @@
createQueue();
}
@@ -91,7 +92,7 @@ function update_uninstall() {
foreach ($variables as $variable) {
variable_del($variable);
}
- $queue = DrupalQueue::get('update_fetch_tasks');
+ $queue = Queue::get('update_fetch_tasks');
$queue->deleteQueue();
}
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index d9fd86f..252fe4f 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -1,4 +1,6 @@
$last));
- $output .= drupal_render_children($form);
+ $output .= render_children($form);
return $output;
}
@@ -323,7 +325,7 @@ function update_manager_update_form_submit($form, &$form_state) {
'init_message' => t('Preparing to download selected updates'),
'operations' => $operations,
'finished' => 'update_manager_download_batch_finished',
- 'file' => drupal_get_path('module', 'update') . '/update.manager.inc',
+ 'file' => get_path('module', 'update') . '/update.manager.inc',
);
batch_set($batch);
}
@@ -337,17 +339,17 @@ function update_manager_download_batch_finished($success, $results) {
'title' => t('Downloading updates failed:'),
'items' => $results['errors'],
);
- drupal_set_message(theme('item_list', $error_list), 'error');
+ set_message(theme('item_list', $error_list), 'error');
}
elseif ($success) {
- drupal_set_message(t('Updates downloaded successfully.'));
+ set_message(t('Updates downloaded successfully.'));
$_SESSION['update_manager_update_projects'] = $results['projects'];
- drupal_goto('admin/update/ready');
+ redirect('admin/update/ready');
}
else {
// Ideally we're catching all Exceptions, so they should never see this,
// but just in case, we have to tell them something.
- drupal_set_message(t('Fatal error trying to download.'), 'error');
+ set_message(t('Fatal error trying to download.'), 'error');
}
}
@@ -410,7 +412,7 @@ function update_manager_update_ready_form_submit($form, &$form_state) {
if (!empty($_SESSION['update_manager_update_projects'])) {
// Make sure the Updater registry is loaded.
- drupal_get_updaters();
+ get_updaters();
$updates = array();
$directory = _update_manager_extract_directory();
@@ -436,14 +438,14 @@ function update_manager_update_ready_form_submit($form, &$form_state) {
// update_authorize_run_update() directly.
if (fileowner($project_real_location) == fileowner(conf_path())) {
module_load_include('inc', 'update', 'update.authorize');
- $filetransfer = new FileTransferLocal(DRUPAL_ROOT);
+ $filetransfer = new FileTransferLocal(ROOT);
update_authorize_run_update($filetransfer, $updates);
}
// Otherwise, go through the regular workflow to prompt for FTP/SSH
// credentials and invoke update_authorize_run_update() indirectly with
// whatever FileTransfer object authorize.php creates for us.
else {
- system_authorized_init('update_authorize_run_update', drupal_get_path('module', 'update') . '/update.authorize.inc', array($updates), t('Update manager'));
+ system_authorized_init('update_authorize_run_update', get_path('module', 'update') . '/update.authorize.inc', array($updates), t('Update manager'));
$form_state['redirect'] = system_authorized_get_url();
}
}
@@ -547,7 +549,7 @@ function _update_manager_check_backends(&$form, $operation) {
'#suffix' => '',
);
- $available_backends = drupal_get_filetransfer_info();
+ $available_backends = get_filetransfer_info();
if (empty($available_backends)) {
if ($operation == 'update') {
$form['available_backends']['#markup'] = t('Your server does not support updating modules and themes from this interface. Instead, update modules and themes by uploading the new versions directly to the server, as described in the handbook.', array('@handbook_url' => 'http://drupal.org/getting-started/install-contrib'));
@@ -662,14 +664,14 @@ function update_manager_install_form_submit($form, &$form_state) {
// form element and have all of them appear!
if (!empty($archive_errors)) {
foreach ($archive_errors as $error) {
- drupal_set_message($error, 'error');
+ set_message($error, 'error');
}
}
return;
}
// Make sure the Updater registry is loaded.
- drupal_get_updaters();
+ get_updaters();
$project_location = $directory . '/' . $project;
try {
@@ -711,14 +713,14 @@ function update_manager_install_form_submit($form, &$form_state) {
// update_authorize_run_install() directly.
if (fileowner($project_real_location) == fileowner(conf_path())) {
module_load_include('inc', 'update', 'update.authorize');
- $filetransfer = new FileTransferLocal(DRUPAL_ROOT);
- call_user_func_array('update_authorize_run_install', array_merge(array($filetransfer), $arguments));
+ $filetransfer = new FileTransferLocal(ROOT);
+ call_user_func_array('Drupal\update_authorize_run_install', array_merge(array($filetransfer), $arguments));
}
// Otherwise, go through the regular workflow to prompt for FTP/SSH
// credentials and invoke update_authorize_run_install() indirectly with
// whatever FileTransfer object authorize.php creates for us.
else {
- system_authorized_init('update_authorize_run_install', drupal_get_path('module', 'update') . '/update.authorize.inc', $arguments, t('Update manager'));
+ system_authorized_init('update_authorize_run_install', get_path('module', 'update') . '/update.authorize.inc', $arguments, t('Update manager'));
$form_state['redirect'] = system_authorized_get_url();
}
}
@@ -816,7 +818,7 @@ function update_manager_file_get($url) {
// Check the cache and download the file if needed.
$cache_directory = _update_manager_cache_directory();
- $local = $cache_directory . '/' . drupal_basename($parsed_url['path']);
+ $local = $cache_directory . '/' . basename($parsed_url['path']);
if (!file_exists($local) || update_delete_file_if_stale($local)) {
return system_retrieve_file($url, $local, FALSE, FILE_EXISTS_REPLACE);
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index 6577af7..ef77652 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -1,4 +1,5 @@
'Settings',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('update_settings'),
'access arguments' => array('administer site configuration'),
'file' => 'update.settings.inc',
@@ -205,7 +206,7 @@ function update_menu() {
);
foreach ($paths as $context => $path) {
$items[$path . '/install'] = array(
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('update_manager_install_form', $context),
'access callback' => 'update_manager_access',
'access arguments' => array(),
@@ -214,7 +215,7 @@ function update_menu() {
'file' => 'update.manager.inc',
);
$items[$path . '/update'] = array(
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('update_manager_update_form', $context),
'access callback' => 'update_manager_access',
'access arguments' => array(),
@@ -234,7 +235,7 @@ function update_menu() {
// have been downloaded, asking you to backup before installing updates.
$items['admin/update/ready'] = array(
'title' => 'Ready to update',
- 'page callback' => 'drupal_get_form',
+ 'page callback' => 'get_form',
'page arguments' => array('update_manager_update_ready_form'),
'access callback' => 'update_manager_access',
'access arguments' => array(),
@@ -350,7 +351,7 @@ function update_cache_clear_submit($form, &$form_state) {
* Prints a warning message when there is no data about available updates.
*/
function _update_no_data() {
- $destination = drupal_get_destination();
+ $destination = get_destination();
return t('No update information available. Run cron or check manually.', array(
'@run_cron' => url('admin/reports/status/run-cron', array('query' => $destination)),
'@check_manually' => url('admin/reports/updates/check', array('query' => $destination)),
@@ -493,7 +494,7 @@ function _update_get_cached_available_releases() {
* as the keys, and the status reason constant (UPDATE_NOT_SECURE, etc) for
* the values.
*
- * @see drupal_mail()
+ * @see mail()
* @see _update_cron_notify()
* @see _update_message_text()
*/
@@ -638,7 +639,7 @@ function theme_update_last_check($variables) {
$last = $variables['last'];
$output = '';
$output .= $last ? t('Last checked: @time ago', array('@time' => format_interval(REQUEST_TIME - $last))) : t('Last checked: never');
- $output .= ' (' . l(t('Check manually'), 'admin/reports/updates/check', array('query' => drupal_get_destination())) . ')';
+ $output .= ' (' . l(t('Check manually'), 'admin/reports/updates/check', array('query' => get_destination())) . ')';
$output .= "
\n";
return $output;
}
@@ -653,7 +654,7 @@ function theme_update_last_check($variables) {
* an .info file which claims that the code is compatible with the current
* version of Drupal core.
*
- * @see drupal_system_listing()
+ * @see system_listing()
* @see _system_rebuild_module_data()
*/
function update_verify_update_archive($project, $archive_file, $directory) {
@@ -679,13 +680,13 @@ function update_verify_update_archive($project, $archive_file, $directory) {
// functionality).
$compatible_project = FALSE;
$incompatible = array();
- $files = file_scan_directory("$directory/$project", '/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info$/', array('key' => 'name', 'min_depth' => 0));
+ $files = file_scan_directory("$directory/$project", '/^' . PHP_FUNCTION_PATTERN . '\.info$/', array('key' => 'name', 'min_depth' => 0));
foreach ($files as $key => $file) {
// Get the .info file for the module or theme this file belongs to.
- $info = drupal_parse_info_file($file->uri);
+ $info = parse_info_file($file->uri);
// If the module or theme is incompatible with Drupal core, set an error.
- if (empty($info['core']) || $info['core'] != DRUPAL_CORE_COMPATIBILITY) {
+ if (empty($info['core']) || $info['core'] != CORE_COMPATIBILITY) {
$incompatible[] = !empty($info['name']) ? $info['name'] : t('Unknown');
}
else {
@@ -695,14 +696,14 @@ function update_verify_update_archive($project, $archive_file, $directory) {
}
if (empty($files)) {
- $errors[] = t('%archive_file does not contain any .info files.', array('%archive_file' => drupal_basename($archive_file)));
+ $errors[] = t('%archive_file does not contain any .info files.', array('%archive_file' => basename($archive_file)));
}
elseif (!$compatible_project) {
$errors[] = format_plural(
count($incompatible),
'%archive_file contains a version of %names that is not compatible with Drupal !version.',
'%archive_file contains versions of modules or themes that are not compatible with Drupal !version: %names',
- array('!version' => DRUPAL_CORE_COMPATIBILITY, '%archive_file' => drupal_basename($archive_file), '%names' => implode(', ', $incompatible))
+ array('!version' => CORE_COMPATIBILITY, '%archive_file' => basename($archive_file), '%names' => implode(', ', $incompatible))
);
}
@@ -866,7 +867,7 @@ function update_flush_caches() {
function _update_manager_unique_identifier() {
$id = &drupal_static(__FUNCTION__, '');
if (empty($id)) {
- $id = substr(hash('sha256', drupal_get_hash_salt()), 0, 8);
+ $id = substr(hash('sha256', get_hash_salt()), 0, 8);
}
return $id;
}
@@ -951,7 +952,7 @@ function update_clear_update_disk_cache() {
function update_delete_file_if_stale($path) {
if (file_exists($path)) {
$filectime = filectime($path);
- if (REQUEST_TIME - $filectime > DRUPAL_MAXIMUM_TEMP_FILE_AGE || (preg_match('/.*-dev\.(tar\.gz|zip)/i', $path) && REQUEST_TIME - $filectime > 300)) {
+ if (REQUEST_TIME - $filectime > MAXIMUM_TEMP_FILE_AGE || (preg_match('/.*-dev\.(tar\.gz|zip)/i', $path) && REQUEST_TIME - $filectime > 300)) {
file_unmanaged_delete_recursive($path);
}
}
diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc
index 7703503..f997594 100644
--- a/core/modules/update/update.report.inc
+++ b/core/modules/update/update.report.inc
@@ -1,4 +1,5 @@
$value) {
$row .= '';
$row .= check_plain($value['label']) . ': ';
- $row .= drupal_placeholder($value['data']);
+ $row .= placeholder($value['data']);
$row .= "
\n";
}
$row .= "