diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index d92e27c..0c581fd 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -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); @@ -1843,8 +1849,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() */ @@ -1856,8 +1862,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() */ @@ -1871,8 +1877,8 @@ function module_implements($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()->invoke($module, $hook, $args = array()). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::moduleHandler()->invoke($module, $hook, $args = array()). * * @see drupal_alter() * @see \Drupal\Core\Extension\ModuleHandler::invoke() @@ -1890,8 +1896,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() @@ -1906,8 +1912,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() */ @@ -1918,8 +1924,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() */ @@ -1930,8 +1936,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() */ @@ -2070,8 +2076,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); @@ -2089,8 +2095,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); @@ -2107,8 +2113,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); @@ -2120,8 +2126,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(); @@ -2620,8 +2628,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 */ diff --git a/core/includes/cache.inc b/core/includes/cache.inc index b39b7ff..4a3305a 100644 --- a/core/includes/cache.inc +++ b/core/includes/cache.inc @@ -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) { diff --git a/core/includes/common.inc b/core/includes/common.inc index 170e941..20b516e 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -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); @@ -2970,9 +2980,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); @@ -2982,9 +2994,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); @@ -2996,9 +3010,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(); @@ -3016,9 +3031,10 @@ 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 * - * @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); @@ -3038,9 +3054,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); @@ -4501,9 +4518,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); @@ -4525,9 +4541,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); @@ -4588,9 +4603,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); @@ -4599,9 +4613,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); @@ -4610,9 +4623,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); @@ -4621,9 +4633,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); @@ -4643,9 +4654,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); @@ -4660,9 +4670,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); @@ -4680,9 +4689,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); @@ -4699,8 +4707,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); @@ -4734,9 +4742,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); @@ -4746,9 +4754,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); diff --git a/core/includes/config.inc b/core/includes/config.inc index 9604ee5..c673744 100644 --- a/core/includes/config.inc +++ b/core/includes/config.inc @@ -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 diff --git a/core/includes/entity.inc b/core/includes/entity.inc index c2054c2..8f546a6 100644 --- a/core/includes/entity.inc +++ b/core/includes/entity.inc @@ -23,10 +23,13 @@ * associative array of all entity type definitions keyed by entity type is * returned. * - * @see \Drupal\Core\Entity\EntityManagerInterface + * @see \Drupal\Core\Entity\EntityManagerInterface::getDefinition() + * @see \Drupal\Core\Entity\EntityManagerInterface::getDefinitions() * @see hook_entity_info_alter() * - * @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getDefinitions() directly. + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use + * \Drupal::entityManager()->getDefinitions() or + * \Drupal::entityManager()->getDefinition($entity_type). */ function entity_get_info($entity_type = NULL) { if (empty($entity_type)) { @@ -397,7 +400,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() @@ -435,7 +441,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() @@ -451,7 +460,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() diff --git a/core/includes/errors.inc b/core/includes/errors.inc index 208a679..d71adbe 100644 --- a/core/includes/errors.inc +++ b/core/includes/errors.inc @@ -289,7 +289,8 @@ function _drupal_get_error_level() { * @return string * A plain-text line-wrapped string ready to be put inside
. * - * @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); diff --git a/core/includes/form.inc b/core/includes/form.inc index ce5779c..6146029 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -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(). */ function drupal_retrieve_form($form_id, &$form_state) { return \Drupal::formBuilder()->retrieveForm($form_id, $form_state); @@ -227,7 +251,10 @@ function drupal_retrieve_form($form_id, &$form_state) { /** * Processes a form submission. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->processForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->processForm(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::processForm(). */ function drupal_process_form($form_id, &$form, &$form_state) { \Drupal::formBuilder()->processForm($form_id, $form, $form_state); @@ -236,7 +263,10 @@ function drupal_process_form($form_id, &$form, &$form_state) { /** * Prepares a structured form array. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->prepareForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->prepareForm(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::prepareForm(). */ function drupal_prepare_form($form_id, &$form, &$form_state) { \Drupal::formBuilder()->prepareForm($form_id, $form, $form_state); @@ -245,7 +275,10 @@ function drupal_prepare_form($form_id, &$form, &$form_state) { /** * Validates user-submitted form data in the $form_state array. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->validateForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->validateForm(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::validateForm(). */ function drupal_validate_form($form_id, &$form, &$form_state) { \Drupal::formBuilder()->validateForm($form_id, $form, $form_state); @@ -254,7 +287,10 @@ function drupal_validate_form($form_id, &$form, &$form_state) { /** * Redirects the user to a URL after a form has been processed. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->redirectForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->redirectForm(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::redirectForm(). */ function drupal_redirect_form($form_state) { return \Drupal::formBuilder()->redirectForm($form_state); @@ -263,7 +299,10 @@ function drupal_redirect_form($form_state) { /** * Executes custom validation and submission handlers for a given form. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->executeHandlers() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->executeHandlers(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::executeHandlers(). */ function form_execute_handlers($type, &$form, &$form_state) { \Drupal::formBuilder()->executeHandlers($type, $form, $form_state); @@ -272,7 +311,10 @@ function form_execute_handlers($type, &$form, &$form_state) { /** * Files an error against a form element. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setErrorByName() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->setErrorByName(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::setErrorByName(). */ function form_set_error($name, array &$form_state, $message = '') { \Drupal::formBuilder()->setErrorByName($name, $form_state, $message); @@ -281,7 +323,10 @@ function form_set_error($name, array &$form_state, $message = '') { /** * Clears all errors against all form elements made by form_set_error(). * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->clearErrors() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->clearErrors(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::clearErrors(). */ function form_clear_error(array &$form_state) { \Drupal::formBuilder()->clearErrors($form_state); @@ -290,7 +335,10 @@ function form_clear_error(array &$form_state) { /** * Returns an associative array of all errors. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getErrors() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->getErrors(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::getErrors(). */ function form_get_errors(array &$form_state) { return \Drupal::formBuilder()->getErrors($form_state); @@ -299,7 +347,10 @@ function form_get_errors(array &$form_state) { /** * Returns the error message filed against the given form element. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getError() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->getError(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::getError(). */ function form_get_error($element, array &$form_state) { return \Drupal::formBuilder()->getError($element, $form_state); @@ -308,7 +359,10 @@ function form_get_error($element, array &$form_state) { /** * Flags an element as having an error. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setError() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->setError(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::setError(). */ function form_error(&$element, array &$form_state, $message = '') { \Drupal::formBuilder()->setError($element, $form_state, $message); @@ -317,7 +371,10 @@ function form_error(&$element, array &$form_state, $message = '') { /** * Builds and processes all elements in the structured form array. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->doBuildForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->doBuildForm(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::doBuildForm(). */ function form_builder($form_id, &$element, &$form_state) { return \Drupal::formBuilder()->doBuildForm($form_id, $element, $form_state); @@ -718,7 +775,10 @@ function form_type_token_value($element, $input = FALSE) { /** * Changes submitted form values during form validation. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setValue() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->setValue(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::setValue(). */ function form_set_value($element, $value, &$form_state) { \Drupal::formBuilder()->setValue($element, $value, $form_state); @@ -737,7 +797,10 @@ function form_set_value($element, $value, &$form_state) { * @return * An array with all hierarchical elements flattened to a single array. * - * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->flattenOptions() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::formBuilder()->flattenOptions(). + * + * @see \Drupal\Core\Form\FormBuilderInterface::flattenOptions(). */ function form_options_flatten($array) { return \Drupal::formBuilder()->flattenOptions($array); diff --git a/core/includes/module.inc b/core/includes/module.inc index 429f5db..b818213 100644 --- a/core/includes/module.inc +++ b/core/includes/module.inc @@ -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); diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 4ebe08a..2cd71ca 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -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); diff --git a/core/includes/utility.inc b/core/includes/utility.inc index 023ecb0..b18c941 100644 --- a/core/includes/utility.inc +++ b/core/includes/utility.inc @@ -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); diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php index a2ce7d1..5c42a81 100644 --- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php +++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php @@ -77,7 +77,7 @@ * * @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()); diff --git a/core/lib/Drupal/Core/Utility/CacheArray.php b/core/lib/Drupal/Core/Utility/CacheArray.php index 2323756..3d1a33c 100644 --- a/core/lib/Drupal/Core/Utility/CacheArray.php +++ b/core/lib/Drupal/Core/Utility/CacheArray.php @@ -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 */ diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc index 010a9d7..b9b957f 100644 --- a/core/modules/aggregator/aggregator.pages.inc +++ b/core/modules/aggregator/aggregator.pages.inc @@ -24,8 +24,9 @@ * @param int $limit * (optional) The number of records to return. Defaults to 20. * - * @deprecated Use \Drupal\aggregator\ItemStorageController::loadAll() for - * loading all feed items, \Drupal\aggregator\ItemStorageController::loadByFeed() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use + * \Drupal\aggregator\ItemStorageController::loadAll() for all feed items, or + * \Drupal\aggregator\ItemStorageController::loadByFeed() for a single source. * * @return \Drupal\aggregator\ItemInterface[] * An array of the feed items. diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index dbf72b1..9b2b8d7 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -1116,7 +1116,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. diff --git a/core/modules/content_translation/content_translation.pages.inc b/core/modules/content_translation/content_translation.pages.inc index 3272296..0b6a4dc 100644 --- a/core/modules/content_translation/content_translation.pages.inc +++ b/core/modules/content_translation/content_translation.pages.inc @@ -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); diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php index e50152b..58f374a 100644 --- a/core/modules/field/field.api.php +++ b/core/modules/field/field.api.php @@ -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 diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc index 6bdc8b2..e74d8bd 100644 --- a/core/modules/field/field.deprecated.inc +++ b/core/modules/field/field.deprecated.inc @@ -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. diff --git a/core/modules/field/tests/modules/field_test/field_test.entity.inc b/core/modules/field/tests/modules/field_test/field_test.entity.inc index af13590..8324566 100644 --- a/core/modules/field/tests/modules/field_test/field_test.entity.inc +++ b/core/modules/field/tests/modules/field_test/field_test.entity.inc @@ -43,7 +43,8 @@ function field_test_entity_info_translatable($entity_type = NULL, $translatable /** * Form combining two separate entities. * - * @deprecated Use \Drupal\field_test\Form\FieldTestForm::testEntityNestedForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\field_test\Form\FieldTestForm::testEntityNestedForm(). */ function field_test_entity_nested_form($form, &$form_state, EntityInterface $entity_1, EntityInterface $entity_2) { // First entity. diff --git a/core/modules/file/file.module b/core/modules/file/file.module index f4e0f62..bf5b035 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -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. */ diff --git a/core/modules/file/tests/file_module_test/file_module_test.module b/core/modules/file/tests/file_module_test/file_module_test.module index 8d7015a..c0e6cc3 100644 --- a/core/modules/file/tests/file_module_test/file_module_test.module +++ b/core/modules/file/tests/file_module_test/file_module_test.module @@ -16,7 +16,8 @@ * @see file_module_test_form_submit() * @ingroup forms * - * @deprecated Use \Drupal\file_module_test\Form\FileModuleTestForm::managedFileTest() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\file_module_test\Form\FileModuleTestForm::managedFileTest(). */ function file_module_test_form($form, &$form_state, $tree = TRUE, $extended = TRUE, $multiple = FALSE, $default_fids = NULL) { $form['#tree'] = (bool) $tree; diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index 3bd73f9..84e82f0 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -152,7 +152,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()); diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 5a7218b..0f0c97e 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -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'); diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc index c0e7bbe..bb8da40 100644 --- a/core/modules/locale/locale.bulk.inc +++ b/core/modules/locale/locale.bulk.inc @@ -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(); diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index 462f6fa..98f4db9 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -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'); diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc index 3f4fbd2..a72a7d4 100644 --- a/core/modules/node/node.pages.inc +++ b/core/modules/node/node.pages.inc @@ -120,7 +120,8 @@ function theme_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())); diff --git a/core/modules/path/path.admin.inc b/core/modules/path/path.admin.inc index 6574208..fe8d542 100644 --- a/core/modules/path/path.admin.inc +++ b/core/modules/path/path.admin.inc @@ -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()) { diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc index 876c9f8..8e8b721 100644 --- a/core/modules/shortcut/shortcut.admin.inc +++ b/core/modules/shortcut/shortcut.admin.inc @@ -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(); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 1657f9f..ff9848f 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2708,7 +2708,10 @@ function system_rebuild_module_data() { * @return * An associative array of themes information. * - * @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->rebuildThemeData(). + * @see \Drupal\Core\Extension\ThemeHandlerInterface::rebuildThemeData() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('theme_handler')->rebuildThemeData(). */ function _system_rebuild_theme_data() { return \Drupal::service('theme_handler')->rebuildThemeData(); diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module index 1521436..d135532 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module +++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module @@ -12,7 +12,8 @@ /** * Tests form_state['values'] during callback. * - * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::getForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::getForm(). */ function ajax_forms_test_simple_form($form, &$form_state) { $object = new Callbacks(); @@ -66,7 +67,8 @@ function ajax_forms_test_simple_form($form, &$form_state) { /** * Form constructor for the Ajax Command display form. * - * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::commandsForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::commandsForm(). */ function ajax_forms_test_ajax_commands_form($form, &$form_state) { $form = array(); @@ -448,7 +450,8 @@ function ajax_forms_test_advanced_commands_settings_with_merging_callback($form, * * @see ajax_forms_test_validation_form_submit() * - * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::validationForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::validationForm(). */ function ajax_forms_test_validation_form($form, &$form_state) { @@ -522,7 +525,8 @@ function ajax_forms_test_validation_number_form_callback($form, $form_state) { /** * Form builder: Builds a form that triggers a simple AJAX callback. * - * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::lazyLoadForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::lazyLoadForm(). */ function ajax_forms_test_lazy_load_form($form, &$form_state) { // We attach a JavaScript setting, so that one of the generated AJAX commands diff --git a/core/modules/system/tests/modules/ajax_test/ajax_test.module b/core/modules/system/tests/modules/ajax_test/ajax_test.module index bca7d69..39037e0 100644 --- a/core/modules/system/tests/modules/ajax_test/ajax_test.module +++ b/core/modules/system/tests/modules/ajax_test/ajax_test.module @@ -28,7 +28,8 @@ function ajax_test_system_theme_info() { * incorporates JavaScript settings generated during the page request by * invoking _drupal_add_js() with a dummy setting. * - * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::render() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_test\Controller\AjaxTestController::render(). */ function ajax_test_render() { $attached = array( @@ -51,7 +52,8 @@ function ajax_test_render() { * * Helps verifying AjaxResponse reorders commands to ensure correct execution. * - * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::order() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_test\Controller\AjaxTestController::order(). */ function ajax_test_order() { $response = new AjaxResponse(); @@ -84,7 +86,8 @@ function ajax_test_order() { /** * Menu callback: Returns AJAX element with #error property set. * - * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::renderError() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_test\Controller\AjaxTestController::renderError(). */ function ajax_test_error() { $message = ''; @@ -124,7 +127,8 @@ function ajax_test_dialog_contents() { /** * Menu callback: Close the ajax dialog. * - * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::dialogClose() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\ajax_test\Controller\AjaxTestController::dialogClose(). */ function ajax_test_dialog_close() { $response = new AjaxResponse(); diff --git a/core/modules/system/tests/modules/batch_test/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module index ba8b273..0fd4b32 100644 --- a/core/modules/system/tests/modules/batch_test/batch_test.module +++ b/core/modules/system/tests/modules/batch_test/batch_test.module @@ -24,7 +24,8 @@ function batch_test_menu() { * * @see batch_test_simple_form_submit() * - * @deprecated Use \Drupal\batch_test\Form\BatchTestForm::testForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\batch_test\Form\BatchTestForm::testForm(). */ function batch_test_simple_form() { $form['batch'] = array( @@ -66,7 +67,8 @@ function batch_test_simple_form_submit($form, &$form_state) { * * @see batch_test_multistep_form_submit() * - * @deprecated Use \Drupal\batch_test\Form\BatchTestForm::testMultistepForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\batch_test\Form\BatchTestForm::testMultistepForm(). */ function batch_test_multistep_form($form, &$form_state) { if (empty($form_state['storage']['step'])) { @@ -118,7 +120,8 @@ function batch_test_multistep_form_submit($form, &$form_state) { * @see batch_test_chained_form_submit_3() * @see batch_test_chained_form_submit_4() * - * @deprecated Use \Drupal\batch_test\Form\BatchTestForm::testChainedForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\batch_test\Form\BatchTestForm::testChainedForm(). */ function batch_test_chained_form() { // This value is used to test that $form_state persists through batched diff --git a/core/modules/system/tests/modules/database_test/database_test.module b/core/modules/system/tests/modules/database_test/database_test.module index f41ad30..2da1408 100644 --- a/core/modules/system/tests/modules/database_test/database_test.module +++ b/core/modules/system/tests/modules/database_test/database_test.module @@ -52,7 +52,8 @@ function database_test_query_database_test_alter_remove_range_alter(AlterableInt * separate menu callback request; After this request is done, the temporary * table should automatically dropped. * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::dbQueryTemporary() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\database_test\Controller\DatabaseTestController::dbQueryTemporary(). */ function database_test_db_query_temporary() { $table_name = db_query_temporary('SELECT age FROM {test}', array()); @@ -68,7 +69,8 @@ function database_test_db_query_temporary() { * This function does care about the page GET parameter, as set by the * simpletest HTTP call. * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::pagerQueryEven() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\database_test\Controller\DatabaseTestController::pagerQueryEven(). */ function database_test_even_pager_query($limit) { @@ -95,7 +97,8 @@ function database_test_even_pager_query($limit) { * This function does care about the page GET parameter, as set by the * simpletest HTTP call. * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::pagerQueryOdd() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\database_test\Controller\DatabaseTestController::pagerQueryOdd(). */ function database_test_odd_pager_query($limit) { @@ -122,7 +125,8 @@ function database_test_odd_pager_query($limit) { * This function does care about the page GET parameter, as set by the * simpletest HTTP call. * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::testTablesort() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\database_test\Controller\DatabaseTestController::testTablesort(). */ function database_test_tablesort() { $header = array( @@ -154,7 +158,8 @@ function database_test_tablesort() { * This function does care about the page GET parameter, as set by the * simpletest HTTP call. * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::testTablesortFirst() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\database_test\Controller\DatabaseTestController::testTablesortFirst(). */ function database_test_tablesort_first() { $header = array( @@ -184,7 +189,8 @@ function database_test_tablesort_first() { /** * Outputs a form without setting a header sort. * - * @deprecated \Drupal\database_test\Form\DatabaseTestForm::testTablesortDefaultSort() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\database_test\Form\DatabaseTestForm::testTablesortDefaultSort(). */ function database_test_theme_tablesort($form, &$form_state) { $header = array( diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module index a46a1e7..0a19120 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.module +++ b/core/modules/system/tests/modules/entity_test/entity_test.module @@ -282,7 +282,8 @@ function entity_test_form_node_form_alter(&$form, &$form_state, $form_id) { * * @see entity_test_menu() * - * @deprecated \Drupal\entity_test\Controller\EntityTestController::testAdd() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\entity_test\Controller\EntityTestController::testAdd(). */ function entity_test_add($entity_type) { drupal_set_title(t('Create an @type', array('@type' => $entity_type))); @@ -301,7 +302,8 @@ function entity_test_add($entity_type) { * * @see entity_test_menu() * - * @deprecated \Drupal\entity_test\Controller\EntityTestController::testEdit() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\entity_test\Controller\EntityTestController::testEdit(). */ function entity_test_edit(EntityInterface $entity) { drupal_set_title($entity->label(), PASS_THROUGH); diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module index c176144..a3b54ce 100644 --- a/core/modules/system/tests/modules/form_test/form_test.module +++ b/core/modules/system/tests/modules/form_test/form_test.module @@ -42,7 +42,8 @@ function _form_test_submit_values_json($form, &$form_state) { /** * Form builder for testing hook_form_alter() and hook_form_FORM_ID_alter(). * - * @deprecated Use \Drupal\form_test\alterForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\alterForm(). */ function form_test_alter_form($form, &$form_state) { // Elements can be added as needed for future testing needs, but for now, @@ -93,7 +94,8 @@ function system_form_form_test_alter_form_alter(&$form, &$form_state) { * - #validate handlers should be able to alter the $form and the alterations * should be contained in the rebuilt form. * - * @deprecated Use \Drupal\form_test\validateForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\validateForm(). */ function form_test_validate_form($form, &$form_state) { $object = new Callbacks(); @@ -136,7 +138,8 @@ function form_test_validate_form_validate(&$form, &$form_state) { /** * Form constructor to test the #required property. * - * @deprecated Use \Drupal\form_test\validateRequiredForm() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\validateRequiredForm(). */ function form_test_validate_required_form($form, &$form_state) { $options = drupal_map_assoc(array('foo', 'bar')); @@ -206,7 +209,8 @@ function form_test_validate_required_form_submit($form, &$form_state) { /** * Form constructor to test the #required property without #title. * - * @deprecated Use \Drupal\form_test\validateRequiredFormNoTitle() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\validateRequiredFormNoTitle(). */ function form_test_validate_required_form_no_title($form, &$form_state) { $form['textfield'] = array( @@ -228,7 +232,8 @@ function form_test_validate_required_form_no_title_submit($form, &$form_state) { /** * Builds a simple form with a button triggering partial validation. * - * @deprecated Use \Drupal\form_test\validateFormWithErrorSuppression() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\validateFormWithErrorSuppression(). */ function form_test_limit_validation_errors_form($form, &$form_state) { $form['title'] = array( @@ -313,7 +318,8 @@ function form_test_limit_validation_errors_form_partial_submit($form, $form_stat /** * Builds a simple form using the FAPI #pattern proterty. * - * @deprecated Use \Drupal\form_test\validatePattern() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\validatePattern(). */ function form_test_pattern_form($form, &$form_state) { $form['textfield'] = array( @@ -420,7 +426,8 @@ function _form_test_tableselect_form_builder($form, $form_state, $element_proper /** * Test the tableselect #multiple = TRUE functionality. * - * @deprecated Use \Drupal\form_test\testTableSelectCheckboxes() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testTableSelectCheckboxes(). */ function _form_test_tableselect_multiple_true_form($form, $form_state) { return _form_test_tableselect_form_builder($form, $form_state, array('#multiple' => TRUE)); @@ -439,7 +446,8 @@ function _form_test_tableselect_multiple_true_form_submit($form, &$form_state) { /** * Test the tableselect #multiple = FALSE functionality. * - * @deprecated Use \Drupal\form_test\testTableSelectRadios() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testTableSelectRadios(). */ function _form_test_tableselect_multiple_false_form($form, $form_state) { return _form_test_tableselect_form_builder($form, $form_state, array('#multiple' => FALSE)); @@ -448,7 +456,8 @@ function _form_test_tableselect_multiple_false_form($form, $form_state) { /** * Test the tableselect #colspan functionality. * - * @deprecated Use \Drupal\form_test\testTableSelectColspan() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testTableSelectColspan(). */ function _form_test_tableselect_colspan_form($form, $form_state) { list($header, $options) = _form_test_tableselect_get_data(); @@ -480,7 +489,8 @@ function _form_test_tableselect_multiple_false_form_submit($form, &$form_state) /** * Test functionality of the tableselect #empty property. * - * @deprecated Use \Drupal\form_test\testTableSelectEmptyText() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testTableSelectEmptyText(). */ function _form_test_tableselect_empty_form($form, $form_state) { return _form_test_tableselect_form_builder($form, $form_state, array('#options' => array())); @@ -489,7 +499,8 @@ function _form_test_tableselect_empty_form($form, $form_state) { /** * Test functionality of the tableselect #js_select property. * - * @deprecated Use \Drupal\form_test\testTableSelectJS() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testTableSelectJS(). */ function _form_test_tableselect_js_select_form($form, $form_state, $action) { switch ($action) { @@ -516,7 +527,8 @@ function _form_test_tableselect_js_select_form($form, $form_state, $action) { /** * Tests functionality of vertical tabs. * - * @deprecated Use \Drupal\form_test\testVerticalTabs() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testVerticalTabs(). */ function _form_test_vertical_tabs_form($form, &$form_state) { $form['vertical_tabs'] = array( @@ -555,7 +567,8 @@ function _form_test_vertical_tabs_form($form, &$form_state) { * * @see form_test_storage_form_submit() * - * @deprecated Use \Drupal\form_test\testStorage() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testStorage(). */ function form_test_storage_form($form, &$form_state) { if ($form_state['rebuild']) { @@ -653,7 +666,8 @@ function form_test_storage_form_submit($form, &$form_state) { /** * A form for testing form labels and required marks. * - * @deprecated Use \Drupal\form_test\testLabel() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testLabel(). */ function form_label_test_form() { $form['form_checkboxes_test'] = array( @@ -745,7 +759,8 @@ function form_label_test_form() { /** * Form builder for form_state_values_clean() test. * - * @deprecated Use \Drupal\form_test\testFormStateClean() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testFormStateClean(). */ function form_test_form_state_values_clean_form($form, &$form_state) { // Build an example form containing multiple submit and button elements; not @@ -774,7 +789,8 @@ function form_test_form_state_values_clean_form_submit($form, &$form_state) { /** * Form constructor for the form_state_values_clean() test. * - * @deprecated Use \Drupal\form_test\testFormStateCleanAdvanced() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testFormStateCleanAdvanced(). */ function form_test_form_state_values_clean_advanced_form($form, &$form_state) { // Build an example form containing a managed file and a submit form element. @@ -803,7 +819,8 @@ function form_test_form_state_values_clean_advanced_form_submit($form, &$form_st /** * Build a form to test a checkbox. * - * @deprecated Use \Drupal\form_test\testCheckbox() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testCheckbox(). */ function _form_test_checkbox($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -874,7 +891,8 @@ function _form_test_checkbox($form, &$form_state) { /** * Builds a form to test #type 'select' validation. * - * @deprecated Use \Drupal\form_test\testSelect() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testSelect(). */ function form_test_select($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -979,7 +997,8 @@ function form_test_select($form, &$form_state) { /** * Builds a form to test select elements when #options is not an array. * - * @deprecated Use \Drupal\form_test\testEmptySelect() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testEmptySelect(). */ function form_test_empty_select($form, &$form_state) { $form['empty_select'] = array( @@ -994,7 +1013,8 @@ function form_test_empty_select($form, &$form_state) { /** * Builds a form to test the language select form element. * - * @deprecated Use \Drupal\form_test\testLanguageSelect() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testLanguageSelect(). */ function form_test_language_select() { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1040,9 +1060,8 @@ function form_test_language_select() { * @param $element * The element type to test. Can be 'number' or 'range'. Defaults to 'number'. * - * @deprecated Use \Drupal\form_test\testNumber() - * - * @deprecated Use \Drupal\form_test\testNumberRange() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testNumber() or \Drupal\form_test\testNumberRange(). */ function form_test_number($form, &$form_state, $element = 'number') { $base = array( @@ -1162,7 +1181,8 @@ function form_test_number($form, &$form_state, $element = 'number') { * @see form_test_range_submit() * @ingroup forms * - * @deprecated Use \Drupal\form_test\testRange() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testRange(). */ function form_test_range($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1211,7 +1231,8 @@ function form_test_range($form, &$form_state) { * * @ingroup forms * - * @deprecated Use \Drupal\form_test\testRangeInvalid() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testRangeInvalid(). */ function form_test_range_invalid($form, &$form_state) { $form['minmax'] = array( @@ -1234,7 +1255,8 @@ function form_test_range_invalid($form, &$form_state) { * @see form_test_color_submit() * @ingroup forms * - * @deprecated Use \Drupal\form_test\testColor() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testColor(). */ function form_test_color($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1253,7 +1275,8 @@ function form_test_color($form, &$form_state) { /** * Builds a form to test the placeholder attribute. * - * @deprecated Use \Drupal\form_test\testPlaceholder() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testPlaceholder(). */ function form_test_placeholder_test($form, &$form_state) { foreach (array('textfield', 'textarea', 'url', 'password', 'search', 'tel', 'email', 'number') as $type) { @@ -1270,7 +1293,8 @@ function form_test_placeholder_test($form, &$form_state) { /** * Form constructor to test expansion of #type checkboxes and radios. * - * @deprecated Use \Drupal\form_test\testCheckboxesRadios() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testCheckboxesRadios(). */ function form_test_checkboxes_radios($form, &$form_state, $customize = FALSE) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1334,7 +1358,8 @@ function form_test_checkboxes_radios($form, &$form_state, $customize = FALSE) { * @see form_test_email_submit() * @ingroup forms * - * @deprecated Use \Drupal\form_test\testEmail() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testEmail(). */ function form_test_email($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1362,7 +1387,8 @@ function form_test_email($form, &$form_state) { * @see form_test_url_submit() * @ingroup forms * - * @deprecated Use \Drupal\form_test\testUrl() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testUrl(). */ function form_test_url($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1387,7 +1413,8 @@ function form_test_url($form, &$form_state) { /** * Build a form to test disabled elements. * - * @deprecated Use \Drupal\form_test\testDisabledElements() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testDisabledElements(). */ function _form_test_disabled_elements($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1588,7 +1615,8 @@ function _form_test_disabled_elements($form, &$form_state) { /** * Build a form to test input forgery of enabled elements. * - * @deprecated Use \Drupal\form_test\testInputForgery() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testInputForgery(). */ function _form_test_input_forgery($form, &$form_state) { $form['#submit'] = array('_form_test_submit_values_json'); @@ -1613,7 +1641,8 @@ function _form_test_input_forgery($form, &$form_state) { /** * Form builder for testing preservation of values during a rebuild. * - * @deprecated Use \Drupal\form_test\testRebuildPreservation() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testRebuildPreservation(). */ function form_test_form_rebuild_preserve_values_form($form, &$form_state) { // Start the form with two checkboxes, to test different defaults, and a @@ -1693,7 +1722,8 @@ function form_test_form_rebuild_preserve_values_form_submit($form, &$form_state) /** * Form constructor for testing form state persistence. * - * @deprecated Use \Drupal\form_test\testStatePersistence() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testStatePersistence(). */ function form_test_state_persist($form, &$form_state) { $form['title'] = array( @@ -1816,7 +1846,8 @@ function form_test_programmatic_form_submit($form, &$form_state) { /** * Form builder to test button click detection. * - * @deprecated Use \Drupal\form_test\testClickedButton() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testClickedButton(). */ function form_test_clicked_button($form, &$form_state, $first, $second, $third) { // A single text field. In IE, when a form has only one non-button input field @@ -1896,7 +1927,8 @@ function form_test_clicked_button_submit($form, &$form_state) { /** * Form builder to detect form redirect. * - * @deprecated Use \Drupal\form_test\testRedirect() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testRedirect(). */ function form_test_redirect($form, &$form_state) { $form['redirection'] = array( @@ -1971,7 +2003,8 @@ function form_test_checkbox_type_juggling($form, $form_state, $default_value, $r /** * Tests checkboxes zero. * - * @deprecated Use \Drupal\form_test\testCheckboxesZero() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testCheckboxesZero(). */ function form_test_checkboxes_zero($form, &$form_state, $json = TRUE) { $form['checkbox_off'] = array( @@ -2011,7 +2044,8 @@ function _form_test_checkboxes_zero_no_redirect($form, &$form_state) { /** * Builds a form to test the required attribute. * - * @deprecated Use \Drupal\form_test\testRequired() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testRequired(). */ function form_test_required_attribute($form, &$form_state) { foreach (array('textfield', 'textarea', 'password') as $type) { @@ -2028,7 +2062,8 @@ function form_test_required_attribute($form, &$form_state) { /** * Builds a simple form to test form button classes. * - * @deprecated Use \Drupal\form_test\testButtonClass() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testButtonClass(). */ function form_test_button_class($form, &$form_state) { $form['button'] = array( @@ -2047,7 +2082,8 @@ function form_test_button_class($form, &$form_state) { /** * Builds a simple form to test the #group property on #type 'details'. * - * @deprecated Use \Drupal\form_test\testGroupDetails() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testGroupDetails(). */ function form_test_group_details() { $form['details'] = array( @@ -2069,7 +2105,8 @@ function form_test_group_details() { /** * Builds a simple form to test the #group property on #type 'container'. * - * @deprecated Use \Drupal\form_test\testGroupContainer() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testGroupContainer(). */ function form_test_group_container() { $form['container'] = array( @@ -2090,7 +2127,8 @@ function form_test_group_container() { /** * Builds a simple form to test the #group property on #type 'fieldset'. * - * @deprecated Use \Drupal\form_test\testGroupFieldset() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testGroupFieldset(). */ function form_test_group_fieldset() { $form['fieldset'] = array( @@ -2112,7 +2150,8 @@ function form_test_group_fieldset() { /** * Builds a simple form to test the #group property on #type 'vertical_tabs'. * - * @deprecated Use \Drupal\form_test\testGroupVerticalTabs() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testGroupVerticalTabs(). */ function form_test_group_vertical_tabs() { $form['vertical_tabs'] = array( @@ -2142,7 +2181,8 @@ function form_test_group_vertical_tabs() { /** * Builds a form which gets the database connection stored in the form state. * - * @deprecated Use \Drupal\form_test\testFormStateDatabase() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\form_test\testFormStateDatabase(). */ function form_test_form_state_database($form, &$form_state) { $form['text'] = array( diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module index 5eb3098..009c18a 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.module +++ b/core/modules/system/tests/modules/menu_test/menu_test.module @@ -508,7 +508,8 @@ function menu_test_other_argument_load($arg1) { * * @see menu_test_menu(). * - * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::menuTestCallback() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\menu_test\Controller\MenuTestController::menuTestCallback(). */ function menu_test_callback() { return 'This is menu_test_callback().'; @@ -525,7 +526,8 @@ function menu_test_callback() { * * @see menu_test_menu(). * - * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::menuTrail() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\menu_test\Controller\MenuTestController::menuTrail(). */ function menu_test_menu_trail_callback() { $menu_path = \Drupal::state()->get('menu_test.menu_tree_set_path') ?: array(); @@ -543,7 +545,8 @@ function menu_test_menu_trail_callback() { * * @see menu_test_menu(). * - * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::custom403404() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\menu_test\Controller\MenuTestController::custom403404(). */ function menu_test_custom_403_404_callback() { // When requested by one of the TrailTest tests, record the final @@ -569,7 +572,8 @@ function menu_test_custom_403_404_callback() { * * @see menu_test_menu(). * - * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::themePage() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\menu_test\Controller\MenuTestController::themePage(). */ function menu_test_theme_page_callback($inherited = FALSE) { global $theme_key; diff --git a/core/modules/system/tests/modules/module_test/module_test.module b/core/modules/system/tests/modules/module_test/module_test.module index 6bb9a78..17357b1 100644 --- a/core/modules/system/tests/modules/module_test/module_test.module +++ b/core/modules/system/tests/modules/module_test/module_test.module @@ -93,7 +93,8 @@ function module_test_menu() { * If the hook is dynamically loaded correctly, the menu callback should * return 'success!'. * - * @deprecated \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvoke() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvoke(). */ function module_test_hook_dynamic_loading_invoke() { $result = module_invoke('module_test', 'test_hook'); @@ -106,7 +107,8 @@ function module_test_hook_dynamic_loading_invoke() { * If the hook is dynamically loaded correctly, the menu callback should * return 'success!'. * - * @deprecated \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvokeAll() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvokeAll(). */ function module_test_hook_dynamic_loading_invoke_all() { $result = \Drupal::moduleHandler()->invokeAll('test_hook'); @@ -131,7 +133,8 @@ function module_test_load($param) { * 'Drupal\\module_autoload_test\\SomeClass::testMethod() was invoked.'. If * that module is not enabled, this function should return nothing. * - * @deprecated \Drupal\module_test\Controller\ModuleTestController::testClassLoading() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\module_test\Controller\ModuleTestController::testClassLoading(). */ function module_test_class_loading() { if (class_exists('Drupal\module_autoload_test\SomeClass')) { diff --git a/core/modules/system/tests/modules/system_test/system_test.module b/core/modules/system/tests/modules/system_test/system_test.module index 1eda491..d42ee53 100644 --- a/core/modules/system/tests/modules/system_test/system_test.module +++ b/core/modules/system/tests/modules/system_test/system_test.module @@ -5,7 +5,8 @@ /** * Sets a header. * - * @deprecated \Drupal\system_test\Controller\SystemTestController::setHeader() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\system_test\Controller\SystemTestController::setHeader(). */ function system_test_set_header() { $query = \Drupal::request()->query->all(); @@ -74,7 +75,8 @@ function system_test_system_info_alter(&$info, $file, $type) { /** * Try to acquire a named lock and report the outcome. * - * @deprecated \Drupal\system_test\Controller\SystemTestController::lockAcquire() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\system_test\Controller\SystemTestController::lockAcquire(). */ function system_test_lock_acquire() { if (lock()->acquire('system_test_lock_acquire')) { @@ -89,7 +91,8 @@ function system_test_lock_acquire() { /** * Try to acquire a specific lock, and then exit. * - * @deprecated \Drupal\system_test\Controller\SystemTestController::lockExit() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\system_test\Controller\SystemTestController::lockExit(). */ function system_test_lock_exit() { if (lock()->acquire('system_test_lock_exit', 900)) { @@ -130,7 +133,8 @@ function system_test_page_build(&$page) { /** * A simple page callback which adds a register shutdown function. * - * @deprecated \Drupal\system_test\Controller\SystemTestController::shutdownFunctions() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\system_test\Controller\SystemTestController::shutdownFunctions(). */ function system_test_page_shutdown_functions($arg1, $arg2) { drupal_register_shutdown_function('_system_test_first_shutdown_function', $arg1, $arg2); @@ -177,7 +181,8 @@ function system_test_filetransfer_info() { * * @see system_authorized_init(). * - * @deprecated \Drupal\system_test\Controller\SystemTestController::authorizeInit() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\system_test\Controller\SystemTestController::authorizeInit(). */ function system_test_authorize_init_page($page_title) { $authorize_url = $GLOBALS['base_url'] . '/core/authorize.php'; diff --git a/core/modules/system/tests/modules/test_page_test/test_page_test.module b/core/modules/system/tests/modules/test_page_test/test_page_test.module index 7933a85..7e93103 100644 --- a/core/modules/system/tests/modules/test_page_test/test_page_test.module +++ b/core/modules/system/tests/modules/test_page_test/test_page_test.module @@ -15,7 +15,8 @@ function test_page_test_menu() { /** * Page callback: Returns a test page and sets the title. * - * @deprecated Use \Drupal\test_page_test\Controller\TestPageTestController::testPage() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\test_page_test\Controller\TestPageTestController::testPage(). */ function test_page_test_page() { $attached['js'][] = array( diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index f2fe6fe..8ee9656 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -688,7 +688,8 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) { * @see entity_load_multiple() * @see \Drupal\Core\Entity\Query\EntityQueryInterface * - * @deprecated use entity_load_multiple('taxonomy_term', $tids) instead. + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use entity_load_multiple('taxonomy_term', $tids). * * @param array $tids * (optional) An array of entity IDs. If omitted, all entities are loaded. @@ -710,7 +711,8 @@ function taxonomy_term_load_multiple(array $tids = NULL) { * * @see entity_load_multiple() * - * @deprecated use entity_load_multiple('taxonomy_vocabulary', $vids) instead. + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use entity_load_multiple('taxonomy_vocabulary', $vids). * * @param array $vids * (optional) An array of entity IDs. If omitted, all entities are loaded. @@ -725,7 +727,8 @@ function taxonomy_vocabulary_load_multiple(array $vids = NULL) { /** * Return the taxonomy vocabulary entity matching a vocabulary ID. * - * @deprecated use entity_load('taxonomy_vocabulary', $vid) instead. + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use entity_load('taxonomy_vocabulary', $vid). * * @param int $vid * The vocabulary's ID. @@ -741,7 +744,8 @@ function taxonomy_vocabulary_load($vid) { /** * Return the taxonomy term entity matching a term ID. * - * @deprecated use entity_load('taxonomy_term', $tid) instead. + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use entity_load('taxonomy_term', $tid). * * @param $tid * A term's ID diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc index d177e1c..99e406d 100644 --- a/core/modules/taxonomy/taxonomy.pages.inc +++ b/core/modules/taxonomy/taxonomy.pages.inc @@ -13,7 +13,8 @@ * @param \Drupal\taxonomy\Entity\Term $term * The taxonomy term entity. * - * @deprecated Use \Drupal\taxonomy\Controller\TaxonomyController::termPage() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\taxonomy\Controller\TaxonomyController::termPage(). */ function taxonomy_term_page(Term $term) { $build['#attached']['drupal_add_feed'][] = array('taxonomy/term/' . $term->id() . '/feed', 'RSS - ' . $term->label()); @@ -65,7 +66,8 @@ function taxonomy_term_page(Term $term) { * @param \Drupal\taxonomy\Entity\Term $term * The taxonomy term entity. * - * @deprecated Use \Drupal\taxonomy\Controller\TaxonomyController::termFeed() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\taxonomy\Controller\TaxonomyController::termFeed(). */ function taxonomy_term_feed(Term $term) { $channel['link'] = url('taxonomy/term/' . $term->id(), array('absolute' => TRUE)); diff --git a/core/modules/update/tests/modules/update_test/update_test.module b/core/modules/update/tests/modules/update_test/update_test.module index 249ad83..5c3a835 100644 --- a/core/modules/update/tests/modules/update_test/update_test.module +++ b/core/modules/update/tests/modules/update_test/update_test.module @@ -86,7 +86,8 @@ function update_test_update_status_alter(&$projects) { * * @see update_test_menu() * - * @deprecated \Drupal\update_test\Controller\UpdateTestController::updateTest() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\update_test\Controller\UpdateTestController::updateTest(). */ function update_test_mock_page($project_name) { $xml_map = \Drupal::config('update_test.settings')->get('xml_map'); diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc index 492e650..528672f 100644 --- a/core/modules/update/update.compare.inc +++ b/core/modules/update/update.compare.inc @@ -48,10 +48,10 @@ * - base_themes: If the project is a theme it contains an associative array * of all base-themes. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\update\UpdateManager::getProjects() - * * @see \Drupal\update\UpdateManager::getProjects() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('update.manager')->getProjects(). */ function update_get_projects() { return \Drupal::service('update.manager')->getProjects(); @@ -572,10 +572,10 @@ function update_calculate_project_update_status(&$project_data, $available) { * update_calculate_project_data() or update_get_projects(), or an empty array * when the storage is cleared. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\update\UpdateManager::projectStorage() - * * @see \Drupal\update\UpdateManager::projectStorage() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('update.manager')->projectStorage(). */ function update_project_storage($key) { return \Drupal::service('update.manager')->projectStorage($key); diff --git a/core/modules/update/update.fetch.inc b/core/modules/update/update.fetch.inc index be7d84d..55ef13d 100644 --- a/core/modules/update/update.fetch.inc +++ b/core/modules/update/update.fetch.inc @@ -11,10 +11,10 @@ * @param $context * Reference to an array used for Batch API storage. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\update\UpdateManager::fetchDataBatch() - * * @see \Drupal\update\UpdateManager::fetchDataBatch() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('update.manager')->fetchDataBatch(). */ function update_fetch_data_batch(&$context) { \Drupal::service('update.manager')->fetchDataBatch($context); @@ -23,10 +23,10 @@ function update_fetch_data_batch(&$context) { /** * Attempts to drain the queue of tasks for release history data to fetch. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\update\UpdateFetcher::fetchData() - * * @see \Drupal\update\UpdateFetcher::fetchData() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('update.processor')->fetchData(). */ function _update_fetch_data() { \Drupal::service('update.processor')->fetchData(); @@ -44,10 +44,10 @@ function _update_fetch_data() { * @return * TRUE if we fetched parsable XML, otherwise FALSE. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\update\UpdateFetcher::processFetchTask() - * * @see \Drupal\update\UpdateFetcher::processFetchTask() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('update.processor')->processFetchTask(). */ function _update_process_fetch_task($project) { return \Drupal::service('update.processor')->processFetchTask($project); @@ -56,10 +56,10 @@ function _update_process_fetch_task($project) { /** * Clears out all the available update data and initiates re-fetching. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\update\UpdateManager::refreshUpdateData() - * * @see \Drupal\update\UpdateManager::refreshUpdateData() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('update.manager')->refreshUpdateData(). */ function _update_refresh() { \Drupal::service('update.manager')->refreshUpdateData(); @@ -76,10 +76,10 @@ function _update_refresh() { * update_get_projects(), including keys such as 'name' (short name), and the * 'info' array with data from a .info.yml file for the project. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\update\UpdateFetcher::createFetchTask() - * * @see \Drupal\update\UpdateFetcher::createFetchTask() + * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal::service('update.processor')->createFetchTask(). */ function _update_create_fetch_task($project) { \Drupal::service('update.processor')->createFetchTask($project); diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index 19c0dc1..e5b1cb2 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -63,9 +63,9 @@ * @see update_menu() * @ingroup forms * - * @deprecated Use \Drupal\update\Form\UpdateForm::reportUpdate(), - * \Drupal\update\Form\UpdateForm::moduleUpdate(), or - * \Drupal\update\Form\UpdateForm::moduleUpdate() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use + * \Drupal\update\Form\UpdateForm::reportUpdate() or + * \Drupal\update\Form\UpdateForm::moduleUpdate(). */ function update_manager_update_form($form, $form_state = array(), $context) { if (!_update_manager_check_backends($form, 'update')) { @@ -512,9 +512,9 @@ function update_manager_update_ready_form_submit($form, &$form_state) { * @see update_menu() * @ingroup forms * - * @deprecated Use \Drupal\update\Form\UpdateForm::reportInstall(), - * \Drupal\update\Form\UpdateForm::moduleInstall(), or - * \Drupal\update\Form\UpdateForm::moduleInstall() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use + * \Drupal\update\Form\UpdateForm::reportInstall() or + * \Drupal\update\Form\UpdateForm::moduleInstall(). */ function update_manager_install_form($form, &$form_state, $context) { if (!_update_manager_check_backends($form, 'install')) { diff --git a/core/modules/user/user.module b/core/modules/user/user.module index dab582d..10409b3 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -425,8 +425,8 @@ function _user_role_permissions_update($roles) { * @return bool * Boolean TRUE if the current user has the requested permission. * - * @deprecated as of Drupal 8.0. Use - * \Drupal\Core\Session\AccountInterface::hasPermission() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\Core\Session\AccountInterface::hasPermission(). */ function user_access($string, AccountInterface $account = NULL) { global $user; @@ -563,7 +563,8 @@ function user_preprocess_block(&$variables) { * this result must ensure that check_plain() is called on it before it is * printed to the page. * - * @deprecated Use \Drupal\Core\Session\Interface::getUsername() instead. + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\Core\Session\Interface::getUsername(). */ function user_format_name(AccountInterface $account) { return $account->getUsername(); @@ -692,7 +693,8 @@ function user_is_anonymous() { * @return bool * TRUE if the user is logged in, FALSE if the user is anonymous. * - * @deprecated Use \Drupal\Core\Session\UserSession::isAuthenticated(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\Core\Session\UserSession::isAuthenticated(). */ function user_is_logged_in() { return $GLOBALS['user']->isAuthenticated(); diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc index f9b5a91..e093781 100644 --- a/core/modules/user/user.pages.inc +++ b/core/modules/user/user.pages.inc @@ -14,7 +14,8 @@ /** * Menu callback; process one time login link and redirects to the user page on success. * - * @deprecated Use \Drupal\user\Form\UserForm::resetPass() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\user\Form\UserForm::resetPass(). */ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $action = NULL) { global $user; @@ -123,7 +124,8 @@ function template_preprocess_user(&$variables) { * @see user_cancel_confirm_form() * @see user_cancel_url() * - * @deprecated Use \Drupal\user\Controller\UserController::confirmCancel() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\user\Controller\UserController::confirmCancel(). */ function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') { // Time out in seconds until cancel URL expires; 24 hours = 86400 seconds. diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 1959cd8..c90e5f4 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -739,7 +739,8 @@ function views_library_info() { * @return * A keyed array of in the form of 'base_table' => 'Description'. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::fetchPluginNames(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::fetchPluginNames(). */ function views_fetch_plugin_names($type, $key = NULL, $base = array()) { return Views::fetchPluginNames($type, $key, $base); @@ -751,7 +752,8 @@ function views_fetch_plugin_names($type, $key = NULL, $base = array()) { * @return array * An array of plugin definitions for all types. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getPluginDefinitions(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getPluginDefinitions(). */ function views_get_plugin_definitions() { return Views::getPluginDefinitions(); @@ -769,7 +771,8 @@ function views_get_plugin_definitions() { * - views: An array of enabled Views that are currently using this plugin, * keyed by machine name. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::pluginList(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::pluginList(). */ function views_plugin_list() { return Views::pluginList(); @@ -778,7 +781,8 @@ function views_plugin_list() { /** * Get enabled display extenders. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getEnabledDisplayExtenders(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getEnabledDisplayExtenders(). */ function views_get_enabled_display_extenders() { return Views::getEnabledDisplayExtenders(); @@ -800,7 +804,8 @@ function views_get_enabled_display_extenders() { * ); * @endcode * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getApplicableViews(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getApplicableViews(). */ function views_get_applicable_views($type) { return Views::getApplicableViews($type); @@ -809,7 +814,8 @@ function views_get_applicable_views($type) { /** * Returns an array of all views as fully loaded $view objects. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getAllViews(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getAllViews(). */ function views_get_all_views() { return Views::getAllViews(); @@ -818,7 +824,8 @@ function views_get_all_views() { /** * Returns an array of all enabled views, as fully loaded $view objects. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getEnabledViews(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getEnabledViews(). */ function views_get_enabled_views() { return Views::getEnabledViews(); @@ -827,7 +834,8 @@ function views_get_enabled_views() { /** * Returns an array of all disabled views, as fully loaded $view objects. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getDisabledViews(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getDisabledViews(). */ function views_get_disabled_views() { return Views::getDisabledViews(); @@ -858,7 +866,8 @@ function views_get_disabled_views() { * an associative array for use in select. * - key: view name and display id separated by ':', or the view name only * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getViewsAsOptions(). + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getViewsAsOptions(). */ function views_get_views_as_options($views_only = FALSE, $filter = 'all', $exclude_view = NULL, $optgroup = FALSE, $sort = FALSE) { return Views::getViewsAsOptions($views_only, $filter, $exclude_view, $optgroup, $sort); @@ -919,8 +928,8 @@ function views_disable_view(View $view) { * @return \Drupal\views\ViewExecutable * A reference to the $view object. * - * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getView(). - * + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\views\Views::getView(). */ function views_get_view($name) { return Views::getView($name); diff --git a/core/modules/xmlrpc/xmlrpc.server.inc b/core/modules/xmlrpc/xmlrpc.server.inc index 9a5d825..3e1d2a9 100644 --- a/core/modules/xmlrpc/xmlrpc.server.inc +++ b/core/modules/xmlrpc/xmlrpc.server.inc @@ -14,7 +14,8 @@ * @return \Symfony\Component\HttpFoundation\Response * A Response object. * - * @deprecated Use \Drupal\xmlrpc\Controller\XmlrpcController::php() + * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. + * Use \Drupal\xmlrpc\Controller\XmlrpcController::php(). */ function xmlrpc_server_page() { module_load_include('inc', 'xmlrpc');