diff --git a/core/includes/batch.inc b/core/includes/batch.inc index 72742c6..52e8889 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -201,9 +201,6 @@ function _batch_progress_page() { * * @return array * An array containing a completion value (in percent) and a status message. - * - * @deprecated as of Drupal 8.2.x, will be removed in Drupal 9.0.0. Use - * \Drupal\Core\Batch\BatchQueueController::processQueue() instead. */ function _batch_process() { return BatchQueueController::processQueue(); @@ -211,9 +208,6 @@ function _batch_process() { /** * Returns the batch set being currently processed. - * - * @deprecated as of Drupal 8.2.x, will be removed in Drupal 9.0.0. Use - * \Drupal\Core\Batch\BatchQueueController::getCurrentSet() instead. */ function &_batch_current_set() { return BatchQueueController::getCurrentSet(); @@ -229,9 +223,6 @@ function &_batch_current_set() { * @return true|null * TRUE if a subsequent set was found in the batch; no value will be returned * if no subsequent set was found. - * - * @deprecated as of Drupal 8.2.x, will be removed in Drupal 9.0.0. Use - * \Drupal\Core\Batch\BatchQueueController::hasNextSet() instead. */ function _batch_next_set() { return BatchQueueController::nextSet(); @@ -242,9 +233,6 @@ function _batch_next_set() { * * Call the 'finished' callback of each batch set to allow custom handling of * the results and resolve page redirection. - * - * @deprecated as of Drupal 8.2.x, will be removed in Drupal 9.0.0. Use - * \Drupal\Core\Batch\BatchQueueController::finishedProcessing() instead. */ function _batch_finished() { return BatchQueueController::finishedProcessing(); diff --git a/core/lib/Drupal/Core/Batch/BatchQueueController.php b/core/lib/Drupal/Core/Batch/BatchQueueController.php index 223559a..ce104bc 100644 --- a/core/lib/Drupal/Core/Batch/BatchQueueController.php +++ b/core/lib/Drupal/Core/Batch/BatchQueueController.php @@ -241,6 +241,9 @@ public static function getQueueForBatch($batch) { * * @return array * The current batch set. + * + * @deprecated This is an internal function and will be removed. Use + * _batch_current_set() instead. */ public static function &getCurrentSet() { return self::$batches['sets'][self::$batches['current_set']]; @@ -256,6 +259,9 @@ public static function &getCurrentSet() { * @return bool * TRUE if a subsequent set was found in the batch; FALSE will be returned * if no subsequent set was found. + * + * @deprecated This is an internal function and will be removed. Use + * _batch_next_set() instead. */ public static function nextSet() { if (isset(self::$batches['sets'][self::$batches['current_set'] + 1])) { @@ -282,6 +288,9 @@ public static function nextSet() { * * @return array * An array containing a completion value (in percent) and a status message. + * + * @deprecated This is an internal function and will be removed. Use + * _batch_process() instead. */ public static function processQueue() { $current_set = &self::getCurrentSet(); @@ -419,6 +428,9 @@ public static function processQueue() { * @return \Symfony\Component\HttpFoundation\RedirectResponse|false * A redirect response to the completed page or NULL to stay at the current * URL. + * + * @deprecated This is an internal function and will be removed. Use + * _batch_finished() instead. */ public static function finishedProcessing() { self::$batches = &batch_get();