Commit eb53ecc5 authored by alexpott's avatar alexpott

Issue #2187735 by ianthomas_uk, Sutharsan, andypost: Add removal information...

Issue #2187735 by ianthomas_uk, Sutharsan, andypost: Add removal information to docblock of all @deprecated functions.
parent aabf9945
......@@ -827,7 +827,9 @@ function drupal_page_is_cacheable($allow_caching = NULL) {
* @param $append
* Whether to append the value to an existing header or to replace it.
*
* @deprecated Header handling is being shifted to a Symfony response object.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Symfony\Component\HttpFoundation\Response->headers->set().
* See https://drupal.org/node/2181523.
*/
function drupal_add_http_header($name, $value, $append = FALSE) {
// The headers as name/value pairs.
......@@ -860,7 +862,9 @@ function drupal_add_http_header($name, $value, $append = FALSE) {
* A string containing the header value, or FALSE if the header has been set,
* or NULL if the header has not been set.
*
* @deprecated Header handling is being shifted to a Symfony response object.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Symfony\Component\HttpFoundation\Response->headers->get().
* See https://drupal.org/node/2181523.
*/
function drupal_get_http_header($name = NULL) {
$headers = &drupal_static('drupal_http_headers', array());
......@@ -879,7 +883,8 @@ function drupal_get_http_header($name = NULL) {
* Header names are case-insensitive, but for maximum compatibility they should
* follow "common form" (see RFC 2616, section 4.2).
*
* @deprecated Header handling is being shifted to a Symfony response object.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* See https://drupal.org/node/2181523.
*/
function _drupal_set_preferred_header_name($name = NULL) {
static $header_names = array();
......@@ -902,7 +907,8 @@ function _drupal_set_preferred_header_name($name = NULL) {
* (optional) If TRUE and headers have already been sent, send only the
* specified headers.
*
* @deprecated Header handling is being shifted to a Symfony response object.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* See https://drupal.org/node/2181523.
*/
function drupal_send_headers($default_headers = array(), $only_default = FALSE) {
$headers_sent = &drupal_static(__FUNCTION__, FALSE);
......@@ -958,7 +964,8 @@ function drupal_send_headers($default_headers = array(), $only_default = FALSE)
*
* @see drupal_page_set_cache()
*
* @deprecated Header handling is being shifted to a Symfony response object.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* See https://drupal.org/node/2181523.
*/
function drupal_page_header() {
$headers_sent = &drupal_static(__FUNCTION__, FALSE);
......@@ -1148,12 +1155,11 @@ function format_string($string, array $args = array()) {
/**
* Encodes special characters in a plain-text string for display as HTML.
*
* @see \Drupal\Component\Utility\String::checkPlain()
* @see drupal_validate_utf8()
* @ingroup sanitization
*
* @deprecated as of Drupal 8.0. Use
* Drupal\Component\Utility\String::checkPlain() directly instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\String::checkPlain().
*/
function check_plain($text) {
return String::checkPlain($text);
......@@ -1846,8 +1852,8 @@ function drupal_get_bootstrap_phase() {
/**
* Returns the list of enabled modules.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->getModuleList().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::moduleHandler()->getModuleList().
*
* @see \Drupal\Core\Extension\ModuleHandler::getModuleList()
*/
......@@ -1859,8 +1865,8 @@ function module_list() {
/**
* Determines which modules are implementing a hook.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->getImplementations($hook).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::moduleHandler()->getImplementations($hook).
*
* @see \Drupal\Core\Extension\ModuleHandler::getImplementations()
*/
......@@ -1893,8 +1899,8 @@ function module_invoke($module, $hook) {
* All arguments are passed by value. Use drupal_alter() if you need to pass
* arguments by reference.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->invokeAll($hook).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::moduleHandler()->invokeAll($hook).
*
* @see drupal_alter()
* @see \Drupal\Core\Extension\ModuleHandler::invokeAll()
......@@ -1909,8 +1915,8 @@ function module_invoke_all($hook) {
/**
* Passes alterable variables to specific hook_TYPE_alter() implementations.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->alter($hook).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::moduleHandler()->alter($hook).
*
* @see \Drupal\Core\Extension\ModuleHandler::alter()
*/
......@@ -1921,8 +1927,8 @@ function drupal_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) {
/**
* Determines whether a given module exists.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->moduleExists($module).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::moduleHandler()->moduleExists($module).
*
* @see \Drupal\Core\Extension\ModuleHandler::moduleExists()
*/
......@@ -1933,8 +1939,8 @@ function module_exists($module) {
/**
* Determines whether a module implements a hook.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->implementsHook($module, $hook).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::moduleHandler()->implementsHook($module, $hook).
*
* @see \Drupal\Core\Extension\ModuleHandler::implementsHook()
*/
......@@ -2073,8 +2079,8 @@ function drupal_language_initialize() {
* @param string $type
* The type of language object needed, e.g. Language::TYPE_INTERFACE.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::languageManager()->getCurrentLanguage().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::languageManager()->getCurrentLanguage().
*/
function language($type) {
return \Drupal::languageManager()->getCurrentLanguage($type);
......@@ -2092,8 +2098,8 @@ function language($type) {
* An associative array of languages, keyed by the language code, ordered by
* weight ascending and name ascending.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::languageManager()->getLanguages() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::languageManager()->getLanguages().
*/
function language_list($flags = Language::STATE_CONFIGURABLE) {
return \Drupal::languageManager()->getLanguages($flags);
......@@ -2110,8 +2116,8 @@ function language_list($flags = Language::STATE_CONFIGURABLE) {
*
* @see \Drupal\Core\Language\LanguageManager::getLanguage()
*
* @deprecated as of Drupal 8.0. Use \Drupal::languageManager()->getLanguage()
* instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::languageManager()->getLanguage().
*/
function language_load($langcode) {
return \Drupal::languageManager()->getLanguage($langcode);
......@@ -2123,8 +2129,10 @@ function language_load($langcode) {
* @return \Drupal\Core\Language\Language
* A language object.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::languageManager()->getDefaultLanguage() instead.
* @see \Drupal\Core\Language\LanguageManager::getLanguage()
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::languageManager()->getDefaultLanguage().
*/
function language_default() {
return \Drupal::languageManager()->getDefaultLanguage();
......@@ -2624,8 +2632,8 @@ function drupal_check_memory_limit($required, $memory_limit = NULL) {
/**
* Get locking layer instance.
*
* @deprecated Use \Drupal::lock() instead, or even better have the lock service
* injected into your object.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::lock().
*
* @return \Drupal\Core\Lock\LockBackendInterface
*/
......
......@@ -42,7 +42,7 @@ function cache($bin = 'cache') {
* @param array $tags
* The list of tags to invalidate cache items for.
*
* @deprecated 8.x
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Cache\Cache::invalidateTags().
*/
function cache_invalidate_tags(array $tags) {
......
This diff is collapsed.
......@@ -22,13 +22,13 @@ function config_get_storage_names_with_prefix($prefix = '') {
* @code \Drupal::config('book.admin') @endcode will return a configuration
* object in which the book module can store its administrative settings.
*
* @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
* Use \Drupal::config() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::config().
*
* @param string $name
* The name of the configuration object to retrieve. The name corresponds to
* a configuration file. For @code \Drupal::config('book.admin') @endcode, the
* config object returned will contain the contents of book.admin
* a configuration file. For @code \Drupal::config('book.admin') @endcode,
* the config object returned will contain the contents of book.admin
* configuration file.
*
* @return \Drupal\Core\Config\Config
......
......@@ -370,7 +370,10 @@ function entity_create($entity_type, array $values = array()) {
*
* @return \Drupal\Core\Entity\EntityStorageControllerInterface
*
* @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getStorageController().
* @see \Drupal\Core\Entity\EntityManagerInterface::getStorageController().
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::entityManager()->getStorageController().
*/
function entity_get_controller($entity_type) {
return \Drupal::entityManager()
......@@ -408,7 +411,10 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) {
* @return \Drupal\Core\Entity\EntityAccessControllerInterface
* An entity access controller instance.
*
* @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getAccessController().
* @see \Drupal\Core\Entity\EntityManagerInterface::getAccessController().
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::entityManager()->getAccessController().
*/
function entity_access_controller($entity_type) {
return \Drupal::entityManager()
......@@ -424,7 +430,10 @@ function entity_access_controller($entity_type) {
* @return \Drupal\Core\Entity\EntityListControllerInterface
* An entity list controller.
*
* @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getFormController().
* @see \Drupal\Core\Entity\EntityManagerInterface::getListController().
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::entityManager()->getListController().
*/
function entity_list_controller($entity_type) {
return \Drupal::entityManager()
......
......@@ -289,7 +289,8 @@ function _drupal_get_error_level() {
* @return string
* A plain-text line-wrapped string ready to be put inside <pre>.
*
* @deprecated Use \Drupal\Core\Utility\Error::formatBacktrace() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Utility\Error::formatBacktrace().
*/
function format_backtrace(array $backtrace) {
return Error::formatBacktrace($backtrace);
......
This diff is collapsed.
......@@ -204,8 +204,10 @@ function module_load_include($type, $module, $name = NULL) {
/**
* Installs a given list of modules.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->install($module_list, $enable_dependencies = TRUE)
* @see \Drupal\Core\Extension\ModuleHandlerInterface::install()
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
* \Drupal::moduleHandler()->install($module_list, $enable_dependencies = TRUE).
*/
function module_install($module_list, $enable_dependencies = TRUE) {
return \Drupal::moduleHandler()->install($module_list, $enable_dependencies);
......@@ -214,8 +216,10 @@ function module_install($module_list, $enable_dependencies = TRUE) {
/**
* Installs a given list of modules.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal::moduleHandler()->install($module_list, $enable_dependencies = TRUE).
* @see \Drupal\Core\Extension\ModuleHandlerInterface::module_install()
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
* \Drupal::moduleHandler()->uninstall($module_list, $enable_dependencies = TRUE).
*/
function module_uninstall($module_list = array(), $uninstall_dependents = TRUE) {
return \Drupal::moduleHandler()->uninstall($module_list, $uninstall_dependents);
......
......@@ -72,7 +72,10 @@
* Boolean TRUE if the theme is enabled or is the site administration theme;
* FALSE otherwise.
*
* @deprecated Use \Drupal::service('access_check.theme')->checkAccess().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('access_check.theme')->checkAccess().
*
* @see \Drupal\Core\Theme\ThemeAccessCheck::checkAccess().
*/
function drupal_theme_access($theme) {
if (is_object($theme)) {
......@@ -362,7 +365,10 @@ function drupal_theme_rebuild() {
* names. This element is not set if there are no themes on the system that
* declare this theme as their base theme.
*
* @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->listInfo().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('theme_handler')->listInfo().
*
* @see \Drupal\Core\Extension\ThemeHandler::listInfo().
*/
function list_themes($refresh = FALSE) {
/** @var \Drupal\Core\Extension\ThemeHandler $theme_handler */
......@@ -391,7 +397,10 @@ function list_themes($refresh = FALSE) {
* Returns an array of all of the theme's ancestors; the first element's value
* will be NULL if an error occurred.
*
* @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->getBaseThemes().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('theme_handler')->getBaseThemes().
*
* @see \Drupal\Core\Extension\ThemeHandler::getBaseThemes().
*/
function drupal_find_base_themes($themes, $key) {
return \Drupal::service('theme_handler')->getBaseThemes($themes, $key);
......@@ -1089,7 +1098,10 @@ function theme_settings_convert_to_config(array $theme_settings, Config $config)
* @param $theme_list
* An array of theme names.
*
* @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->enable().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('theme_handler')->enable().
*
* @see \Drupal\Core\Extension\ThemeHandler::enable().
*/
function theme_enable($theme_list) {
\Drupal::service('theme_handler')->enable($theme_list);
......@@ -1101,7 +1113,10 @@ function theme_enable($theme_list) {
* @param $theme_list
* An array of theme names.
*
* @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->disable().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('theme_handler')->disable().
*
* @see \Drupal\Core\Extension\ThemeHandler::disable().
*/
function theme_disable($theme_list) {
\Drupal::service('theme_handler')->disable($theme_list);
......
......@@ -20,7 +20,8 @@
* @return string
* The variable exported in a way compatible to Drupal's coding standards.
*
* @deprecated Use \Drupal\Component\Utility\Variable::export().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Variable::export().
*/
function drupal_var_export($var, $prefix = '') {
return Variable::export($var, $prefix);
......
......@@ -77,7 +77,7 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
*
* @throws \Drupal\Core\Routing\GeneratorNotInitializedException.
*
* @deprecated since version 8.0
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* System paths should not be used - use route names and parameters.
*/
public function generateFromPath($path = NULL, $options = array());
......@@ -94,7 +94,7 @@ public function generateFromPath($path = NULL, $options = array());
* @return string
* The internal Drupal path corresponding to the route.
*
* @deprecated since version 8.0
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* System paths should not be used - use route names and parameters.
*/
public function getPathFromRoute($name, $parameters = array());
......
......@@ -61,7 +61,8 @@
* procedural code. Extending classes may wish to alter this behavior, for
* example by overriding offsetSet() and adding an automatic call to persist().
*
* @deprecated as of Drupal 8.0. Use \Drupal\Core\Cache\CacheCollector instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Cache\CacheCollector.
*
* @see SchemaCache
*/
......
......@@ -1121,7 +1121,8 @@ function comment_user_predelete($account) {
/**
* Loads comment entities from the database.
*
* @deprecated Use entity_load_multiple('comment', $cids) instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use entity_load_multiple('comment', $cids).
*
* @param array $cids
* (optional) An array of entity IDs. If omitted, all entities are loaded.
......
......@@ -15,7 +15,8 @@
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity whose translation overview should be displayed.
*
* @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::overview()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\content_translation\Controller\ContentTranslationController::overview().
*/
function content_translation_overview(EntityInterface $entity) {
$controller = content_translation_controller($entity->getEntityTypeId());
......@@ -178,7 +179,8 @@ function _content_translation_get_switch_links($path) {
* @return array
* A processed form array ready to be rendered.
*
* @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::add()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\content_translation\Controller\ContentTranslationController::add().
*/
function content_translation_add_page(EntityInterface $entity, Language $source = NULL, Language $target = NULL) {
$source = !empty($source) ? $source : $entity->language();
......@@ -204,7 +206,8 @@ function content_translation_add_page(EntityInterface $entity, Language $source
* @return array
* A processed form array ready to be rendered.
*
* @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::edit()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\content_translation\Controller\ContentTranslationController::edit().
*/
function content_translation_edit_page(EntityInterface $entity, Language $language = NULL) {
$language = !empty($language) ? $language : language(Language::TYPE_CONTENT);
......
......@@ -318,7 +318,8 @@ function hook_field_formatter_info_alter(array &$info) {
* The language the field values are going to be entered in. If no language is
* provided the default site language will be used.
*
* @deprecated as of Drupal 8.0. Use the entity system instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use the entity system instead, see https://drupal.org/developing/api/entity
*/
function hook_field_attach_form(\Drupal\Core\Entity\EntityInterface $entity, &$form, &$form_state, $langcode) {
// Add a checkbox allowing a given field to be emptied.
......@@ -346,7 +347,8 @@ function hook_field_attach_form(\Drupal\Core\Entity\EntityInterface $entity, &$f
* @param $form_state
* An associative array containing the current state of the form.
*
* @deprecated as of Drupal 8.0. Use the entity system instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use the entity system instead, see https://drupal.org/developing/api/entity
*/
function hook_field_attach_extract_form_values(\Drupal\Core\Entity\EntityInterface $entity, $form, &$form_state) {
// Sample case of an 'Empty the field' checkbox added on the form, allowing
......
......@@ -35,8 +35,8 @@
* );
* @endcode
*
* @deprecated as of Drupal 8.0. Use
* Field::fieldInfo()->getFieldMap().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\field\Field::fieldInfo()->getFieldMap().
*/
function field_info_field_map() {
return Field::fieldInfo()->getFieldMap();
......@@ -56,9 +56,9 @@ function field_info_field_map() {
* entity_load_multiple_by_properties(), NULL if the field was not found.
*
* @see field_info_field_by_id()
* @deprecated as of Drupal 8.0. Use
* Field::fieldInfo()->getField($field_name).
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\field\Field::fieldInfo()->getField($field_name).
*/
function field_info_field($entity_type, $field_name) {
return Field::fieldInfo()->getField($entity_type, $field_name);
......@@ -76,8 +76,8 @@ function field_info_field($entity_type, $field_name) {
*
* @see field_info_field()
*
* @deprecated as of Drupal 8.0. Use
* Field::fieldInfo()->getFieldById($field_id).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\field\Field::fieldInfo()->getFieldById($field_id).
*/
function field_info_field_by_id($field_id) {
return Field::fieldInfo()->getFieldById($field_id);
......@@ -99,8 +99,8 @@ function field_info_field_by_id($field_id) {
* @see field_info_field()
* @see field_info_field_by_id()
*
* @deprecated as of Drupal 8.0. Use
* Field::fieldInfo()->getFields().
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\field\Field::fieldInfo()->getFields().
*/
function field_info_field_by_ids() {
return Field::fieldInfo()->getFields();
......@@ -131,10 +131,10 @@ function field_info_field_by_ids() {
* type, keyed by bundle name. If $entity_type and $bundle_name are set,
* return all instances for that bundle.
*
* @deprecated as of Drupal 8.0. Use
* Field::fieldInfo()->getInstances(),
* Field::fieldInfo()->getInstances($entity_type) or
* Field::fieldInfo()->getBundleInstances($entity_type, $bundle_name).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
* \Drupal\field\Field::fieldInfo()->getInstances(),
* \Drupal\field\Field::fieldInfo()->getInstances($entity_type) or
* \Drupal\field\Field::fieldInfo()->getBundleInstances($entity_type, $bundle_name).
*/
function field_info_instances($entity_type = NULL, $bundle_name = NULL) {
$cache = Field::fieldInfo();
......@@ -168,8 +168,8 @@ function field_info_instances($entity_type = NULL, $bundle_name = NULL) {
* An associative array of instance data for the specific field and bundle;
* NULL if the instance does not exist.
*
* @deprecated as of Drupal 8.0. Use
* Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name).
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\field\Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name).
*/
function field_info_instance($entity_type, $field_name, $bundle_name) {
return Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name);
......@@ -273,7 +273,8 @@ function field_info_instance($entity_type, $field_name, $bundle_name) {
* An associative array of additional options. See field_invoke_method() for
* details.
*
* @deprecated as of Drupal 8.0. Use the entity system instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use the entity system instead, see https://drupal.org/developing/api/entity
*
* @see field_form_get_state()
* @see field_form_set_state()
......@@ -328,7 +329,8 @@ function field_attach_form(EntityInterface $entity, &$form, &$form_state, $langc
* An associative array of additional options. See field_invoke_method() for
* details.
*
* @deprecated as of Drupal 8.0. Use the entity system instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use the entity system instead, see https://drupal.org/developing/api/entity
*/
function field_attach_form_validate(ContentEntityInterface $entity, $form, &$form_state, array $options = array()) {
$has_violations = FALSE;
......@@ -372,7 +374,8 @@ function field_attach_form_validate(ContentEntityInterface $entity, $form, &$for
* An associative array of additional options. See field_invoke_method() for
* details.
*
* @deprecated as of Drupal 8.0. Use the entity system instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use the entity system instead, see https://drupal.org/developing/api/entity
*/
function field_attach_extract_form_values(EntityInterface $entity, $form, &$form_state, array $options = array()) {
// Extract field values from submitted values.
......
......@@ -110,8 +110,8 @@ function file_load($fid, $reset = FALSE) {
/**
* Returns the file usage service.
*
* @deprecated as of Drupal 8.0. Use \Drupal::service('file.usage') instead, or
* even better have the file usage service injected into your object.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('file.usage').
*
* @return \Drupal\file\FileUsage\FileUsageInterface.
*/
......
......@@ -153,7 +153,8 @@ function theme_language_negotiation_configure_browser_form_table($variables) {
/**
* Returns the content language settings form.
*
* @deprecated Use \Drupal\language\Controller\LanguageController::contentSettings()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\language\Controller\LanguageController::contentSettings().
*/
function language_content_settings_page() {
return drupal_get_form('language_content_settings_form', language_entity_supported());
......
......@@ -117,7 +117,8 @@ function language_menu_link_defaults() {
/**
* Editing or deleting locked languages should not be possible.
*
* @deprecated Use \Drupal\language\LanguageAccessController instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\language\LanguageAccessController.
*/
function language_access_language_edit_or_delete($language) {
return !$language->locked && \Drupal::currentUser()->hasPermission('administer languages');
......
......@@ -18,7 +18,8 @@
* @see locale_translate_import_form_submit()
* @ingroup forms
*
* @deprecated Use \Drupal\locale\Form\LocaleForm::import()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\locale\Form\LocaleForm::import().
*/
function locale_translate_import_form($form, &$form_state) {
Drupal::languageManager()->reset();
......@@ -153,7 +154,8 @@ function locale_translate_import_form_submit($form, &$form_state) {
* @see locale_translate_export_form_submit()
* @ingroup forms
*
* @deprecated Use \Drupal\locale\Form\LocaleForm::export()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\locale\Form\LocaleForm::export().
*/
function locale_translate_export_form($form, &$form_state) {
$languages = language_list();
......
......@@ -41,7 +41,8 @@ function locale_translation_manual_status() {
*
* @see locale_menu()
*
* @deprecated Use \Drupal\locale\Form\LocaleForm::status()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\locale\Form\LocaleForm::status().
*/
function locale_translation_status_form($form, &$form_state) {
module_load_include('translation.inc', 'locale');
......
......@@ -112,7 +112,8 @@ function template_preprocess_node_preview(&$variables) {
*
* @see node_menu()
*
* @deprecated Use \Drupal\node\Controller\NodeController::revisionOverview()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\node\Controller\NodeController::revisionOverview().
*/
function node_revision_overview($node) {
$build['#title'] = t('Revisions for %title', array('%title' => $node->label()));
......
......@@ -14,7 +14,8 @@
* When filter key passed, perform a standard search on the given key,
* and return the list of matching URL aliases.
*
* @deprecated Use \Drupal\path\Controller\PathController::adminOverview()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\path\Controller\PathController::adminOverview().
*/
function path_admin_overview($keys = NULL) {
// Add the filter form above the overview table.
......@@ -109,7 +110,8 @@ function path_admin_overview($keys = NULL) {
*
* @see path_menu()
*
* @deprecated Use \Drupal\path\Controller\PathController::adminEdit() or
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
* \Drupal\path\Controller\PathController::adminAdd() or
* \Drupal\path\Controller\PathController::adminEdit()
*/
function path_admin_edit($path = array()) {
......
......@@ -23,7 +23,8 @@
* @see shortcut_set_switch_validate()
* @see shortcut_set_switch_submit()
*
* @deprecated Use \Drupal\shortcut\Form\ShortcutForm::overview()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\shortcut\Form\ShortcutForm::overview().
*/
function shortcut_set_switch($form, &$form_state, $account = NULL) {
$user = \Drupal::currentUser();
......
......@@ -2711,7 +2711,10 @@ function system_rebuild_module_data() {
* @return