Commit eb53ecc5 authored by alexpott's avatar alexpott
Browse files

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) {
......
......@@ -426,7 +426,8 @@ function drupal_get_feeds($delimiter = "\n") {
* @return
* An array containing query parameters, which can be used for url().
*
* @deprecated as of Drupal 8.0. Use Url::filterQueryParameters() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Url::filterQueryParameters().
*/
function drupal_get_query_parameters(array $query = NULL, array $exclude = array(), $parent = '') {
if (!isset($query)) {
......@@ -439,10 +440,10 @@ function drupal_get_query_parameters(array $query = NULL, array $exclude = array
* Parses an array into a valid, rawurlencoded query string.
*
* @see drupal_get_query_parameters()
* @deprecated as of Drupal 8.0. Use Url::buildQuery() instead.
* @ingroup php_wrappers
*
* @deprecated as of Drupal 8.0. Use Url::buildQuery() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Url::buildQuery().
*/
function drupal_http_build_query(array $query, $parent = '') {
return Url::buildQuery($query, $parent);
......@@ -518,7 +519,8 @@ function drupal_get_destination() {
* @see url()
* @ingroup php_wrappers
*
* @deprecated as of Drupal 8.0. Use Url::parse() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Url::parse().
*/
function drupal_parse_url($url) {
return Url::parse($url);
......@@ -535,7 +537,8 @@ function drupal_parse_url($url) {
* @param $path
* The Drupal path to encode.
*
* @deprecated as of Drupal 8.0. Use Url::encodePath() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Url::encodePath().
*/
function drupal_encode_path($path) {
return Url::encodePath($path);
......@@ -550,7 +553,8 @@ function drupal_encode_path($path) {
* @return
* TRUE if the URL has the same domain and base path.
*
* @deprecated as of Drupal 8.0. Use Url::externalIsLocal() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Url::externalIsLocal().
*/
function _external_url_is_local($url) {
return Url::externalIsLocal($url, base_path());
......@@ -609,7 +613,8 @@ function valid_email_address($mail) {
*
* @see \Drupal\Component\Utility\Url::isValid()
*
* @deprecated as of Drupal 8.0. Use Url::isValid() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Url::isValid().
*/
function valid_url($url, $absolute = FALSE) {
return Url::isValid($url, $absolute);
......@@ -631,8 +636,8 @@ function valid_url($url, $absolute = FALSE) {
* @return bool
* TRUE if no step mismatch has occurred, or FALSE otherwise.
*
* @deprecated as of Drupal 8.0. Use
* \Drupal\Component\Utility\Number::validStep() directly instead
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Number::validStep().
*/
function valid_number_step($value, $step, $offset = 0.0) {
return Number::validStep($value, $step, $offset);
......@@ -901,8 +906,10 @@ function format_xml_elements($array) {
*
* @see t()
* @see format_string()
* @see \Drupal\Core\StringTranslation\TranslationManager->formatPlural()
*
* @deprecated as of Drupal 8.0. Use \Drupal::translation()->formatPlural()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::translation()->formatPlural().
*/
function format_plural($count, $singular, $plural, array $args = array(), array $options = array()) {
return \Drupal::translation()->formatPlural($count, $singular, $plural, $args, $options);
......@@ -984,7 +991,10 @@ function format_size($size, $langcode = NULL) {
* @return
* A translated string representation of the interval.
*
* @deprecated as of Drupal 8.0. Use \Drupal::service('date')->formatInterval().
* @see \Drupal\Core\Datetime\Date::formatInterval()
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('date')->formatInterval().
*/
function format_interval($interval, $granularity = 2, $langcode = NULL) {
return \Drupal::service('date')->formatInterval($interval, $granularity, $langcode);
......@@ -2977,9 +2987,11 @@ function drupal_clear_js_cache() {
* We use HTML-safe strings, with several characters escaped.
*
* @see drupal_json_decode()
*
* @ingroup php_wrappers
* @deprecated as of Drupal 8.0. Use Drupal\Component\Utility\Json::encode()
* directly instead.
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Json::encode().
*/
function drupal_json_encode($var) {
return Json::encode($var);
......@@ -2989,9 +3001,11 @@ function drupal_json_encode($var) {
* Converts an HTML-safe JSON string into its PHP equivalent.
*
* @see drupal_json_encode()
*
* @ingroup php_wrappers
* @deprecated as of Drupal 8.0. Use Drupal\Component\Utility\Json::decode()
* directly instead.
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Json::decode().
*/
function drupal_json_decode($var) {
return Json::decode($var);
......@@ -3003,9 +3017,10 @@ function drupal_json_decode($var) {
* @return string
* The private key.
*
* @see \Drupal\Core\Access\CsrfTokenManager
* @see \Drupal\Core\Access\CsrfTokenGenerator
*
* @deprecated as of Drupal 8.0. Use the 'private_key' service instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('private_key')->get().
*/
function drupal_get_private_key() {
return \Drupal::service('private_key')->get();
......@@ -3028,10 +3043,11 @@ function drupal_get_private_key() {
* 'drupal_private_key' configuration variable.
*
* @see drupal_get_hash_salt()
* @see \Drupal\Core\Access\CsrfTokenManager
* @see \Drupal\Core\Access\CsrfTokenGenerator
* @see drupal_session_start()
*
* @deprecated as of Drupal 8.0. Use the csrf_token service instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::csrfToken()->get().
*/
function drupal_get_token($value = '') {
return \Drupal::csrfToken()->get($value);
......@@ -3051,9 +3067,10 @@ function drupal_get_token($value = '') {
* True for a valid token, false for an invalid token. When $skip_anonymous
* is true, the return value will always be true for anonymous users.
*
* @see \Drupal\Core\Access\CsrfTokenManager
* @see \Drupal\Core\Access\CsrfTokenGenerator
*
* @deprecated as of Drupal 8.0. Use the csrf_token service instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use return \Drupal::csrfToken()->validate().
*/
function drupal_valid_token($token, $value = '', $skip_anonymous = FALSE) {
return \Drupal::csrfToken()->validate($token, $value, $skip_anonymous);
......@@ -4528,9 +4545,8 @@ function drupal_render_cid_create($elements) {
* @return int
* The comparison result for uasort().
*
* @see \Drupal\Component\Utility\SortArray::sortByWeightProperty()
*
* @deprecated as of Drupal 8.0. Use SortArray::sortByWeightProperty() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\SortArray::sortByWeightProperty().
*/
function element_sort($a, $b) {
return SortArray::sortByWeightProperty($a, $b);
......@@ -4552,9 +4568,8 @@ function element_sort($a, $b) {
* @return int
* The comparison result for uasort().
*
* @see \Drupal\Component\Utility\SortArray::sortByTitleProperty()
*
* @deprecated as of Drupal 8.0. Use SortArray::sortByTitleProperty() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\SortArray::sortByTitleProperty().
*/
function element_sort_by_title($a, $b) {
return SortArray::sortByTitleProperty($a, $b);
......@@ -4615,9 +4630,8 @@ function element_info_property($type, $property_name, $default = NULL) {
* @return int
* The comparison result for uasort().
*
* @see \Drupal\Component\Utility\SortArray::sortByTitleElement()
*
* @deprecated as of Drupal 8.0. Use SortArray::sortByTitleElement() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\SortArray::sortByTitleElement().
*/
function drupal_sort_title($a, $b) {
return SortArray::sortByTitleElement($a, $b);
......@@ -4626,9 +4640,8 @@ function drupal_sort_title($a, $b) {
/**
* Checks if the key is a property.
*
* @see \Drupal\Core\Render\Element::property()
*
* @deprecated as of Drupal 8.0. Use Element::property() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Render\Element::property().
*/
function element_property($key) {
return Element::property($key);
......@@ -4637,9 +4650,8 @@ function element_property($key) {
/**
* Gets properties of a structured array element (keys beginning with '#').
*
* @see \Drupal\Core\Render\Element::properties()
*
* @deprecated as of Drupal 8.0. Use Element::properties() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Render\Element::properties().
*/
function element_properties($element) {
return Element::properties($element);
......@@ -4648,9 +4660,8 @@ function element_properties($element) {
/**
* Checks if the key is a child.
*
* @see \Drupal\Core\Render\Element::child()
*
* @deprecated as of Drupal 8.0. Use Element::child() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Render\Element::child().
*/
function element_child($key) {
return Element::child($key);
......@@ -4670,9 +4681,8 @@ function element_child($key) {
* @return
* The array keys of the element's children.
*
* @see \Drupal\Core\Render\Element::children()
*
* @deprecated as of Drupal 8.0. Use Element::children() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Render\Element::children().
*/
function element_children(&$elements, $sort = FALSE) {
return Element::children($elements, $sort);
......@@ -4687,9 +4697,8 @@ function element_children(&$elements, $sort = FALSE) {
* @return
* The array keys of the element's visible children.
*
* @see \Drupal\Core\Render\Element::getVisibleChildren()
*
* @deprecated as of Drupal 8.0. Use Element::getVisibleChildren() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Render\Element::getVisibleChildren().
*/
function element_get_visible_children(array $elements) {
return Element::getVisibleChildren($elements);
......@@ -4707,9 +4716,8 @@ function element_get_visible_children(array $elements) {
* except for the leading '#', then an attribute name value is sufficient and
* no property name needs to be specified.
*
* @see \Drupal\Core\Render\Element::setAttributes()
*
* @deprecated as of Drupal 8.0. Use Element::setAttributes() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Render\Element::setAttributes().
*/
function element_set_attributes(array &$element, array $map) {
Element::setAttributes($element, $map);
......@@ -4726,8 +4734,8 @@ function element_set_attributes(array &$element, array $map) {
*
* @see \Drupal\Core\Extension\InfoParser::parse().
*
* @deprecated as of Drupal 8.0. Use \Drupal::service('info_parser')->parse()
* instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::service('info_parser')->parse().
*/
function drupal_parse_info_file($filename) {
return \Drupal::service('info_parser')->parse($filename);
......@@ -4761,9 +4769,9 @@ function watchdog_severity_levels() {
* Explodes a string of tags into an array.
*
* @see drupal_implode_tags()
* @see \Drupal\Component\Utility\String::explodeTags().
*
* @deprecated as of Drupal 8.0. Use Tags::explode() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Tags::explode().
*/
function drupal_explode_tags($tags) {
return Tags::explode($tags);
......@@ -4773,9 +4781,9 @@ function drupal_explode_tags($tags) {
* Implodes an array of tags into a string.
*
* @see drupal_explode_tags()
* @see \Drupal\Component\Utility\String::implodeTags().
*
* @deprecated as of Drupal 8.0. Use Tags::implode() instead.
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Component\Utility\Tags::implode().
*/
function drupal_implode_tags($tags) {
return Tags::implode($tags);
......
......@@ -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);
......
......@@ -106,7 +106,10 @@
/**
* Returns a renderable form array for a given form ID.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getForm()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->getForm().
*
* @see \Drupal\Core\Form\FormBuilderInterface::getForm().
*/
function drupal_get_form($form_arg) {
return call_user_func_array(array(\Drupal::formBuilder(), 'getForm'), func_get_args());
......@@ -115,7 +118,10 @@ function drupal_get_form($form_arg) {
/**
* Builds and processes a form for a given form ID.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->buildForm()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->buildForm().
*
* @see \Drupal\Core\Form\FormBuilderInterface::buildForm().
*/
function drupal_build_form($form_id, &$form_state) {
return \Drupal::formBuilder()->buildForm($form_id, $form_state);
......@@ -124,7 +130,10 @@ function drupal_build_form($form_id, &$form_state) {
/**
* Retrieves default values for the $form_state array.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getFormStateDefaults()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->getFormStateDefaults().
*
* @see \Drupal\Core\Form\FormBuilderInterface::getFormStateDefaults().
*/
function form_state_defaults() {
return \Drupal::formBuilder()->getFormStateDefaults();
......@@ -133,7 +142,10 @@ function form_state_defaults() {
/**
* Constructs a new $form from the information in $form_state.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->rebuildForm()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->rebuildForm().
*
* @see \Drupal\Core\Form\FormBuilderInterface::rebuildForm().
*/
function drupal_rebuild_form($form_id, &$form_state, $old_form = NULL) {
return \Drupal::formBuilder()->rebuildForm($form_id, $form_state, $old_form);
......@@ -142,7 +154,10 @@ function drupal_rebuild_form($form_id, &$form_state, $old_form = NULL) {
/**
* Fetches a form from the cache.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getCache()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->getCache().
*
* @see \Drupal\Core\Form\FormBuilderInterface::getCache().
*/
function form_get_cache($form_build_id, &$form_state) {
return \Drupal::formBuilder()->getCache($form_build_id, $form_state);
......@@ -151,7 +166,10 @@ function form_get_cache($form_build_id, &$form_state) {
/**
* Stores a form in the cache.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setCache()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->setCache().
*
* @see \Drupal\Core\Form\FormBuilderInterface::setCache().
*/
function form_set_cache($form_build_id, $form, $form_state) {
\Drupal::formBuilder()->setCache($form_build_id, $form, $form_state);
......@@ -209,7 +227,10 @@ function form_load_include(&$form_state, $type, $module, $name = NULL) {
/**
* Retrieves, populates, and processes a form.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->submitForm()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->submitForm().
*
* @see \Drupal\Core\Form\FormBuilderInterface::submitForm().
*/
function drupal_form_submit($form_arg, &$form_state) {
\Drupal::formBuilder()->submitForm($form_arg, $form_state);
......@@ -218,7 +239,10 @@ function drupal_form_submit($form_arg, &$form_state) {
/**
* Retrieves the structured array that defines a given form.
*
* @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->retrieveForm()
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::formBuilder()->retrieveForm().
*
* @see \Drupal\Core\Form\FormBuilderInterface::retrieveForm().
*/