opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

55
web/core/includes/common.inc
View file

@ -17,7 +17,6 @@ use Drupal\Core\Cache\Cache;
use Drupal\Core\Render\Element\Link;
use Drupal\Core\Render\Markup;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\PhpStorage\PhpStorageFactory;
use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
use Drupal\Core\Render\BubbleableMetadata;
use Drupal\Core\Render\Element;
@ -47,7 +46,7 @@ use Drupal\Core\Render\Element;
*
* Correct:
* @code
* $my_substring = Unicode::substr($original_string, 0, 5);
* $my_substring = mb_substr($original_string, 0, 5);
* @endcode
*
* @}
@ -148,12 +147,13 @@ const LOCALE_PLURAL_DELIMITER = PluralTranslatableMarkup::DELIMITER;
* If the query parameter isn't present, then the URL of the current
* request is returned.
*
* @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
*
* @ingroup form_api
*
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use the redirect.destination service.
*
* @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
* @see https://www.drupal.org/node/2448603
*/
function drupal_get_destination() {
return \Drupal::destination()->getAsArray();
@ -176,6 +176,8 @@ function drupal_get_destination() {
*
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use \Drupal::service('email.validator')->isValid().
*
* @see https://www.drupal.org/node/2912661
*/
function valid_email_address($mail) {
return \Drupal::service('email.validator')->isValid($mail);
@ -209,17 +211,18 @@ function valid_email_address($mail) {
* Drupal\Core\Template\Attribute, call
* \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols() instead.
*
* @see \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols()
* @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol()
*
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use UrlHelper::stripDangerousProtocols() or UrlHelper::filterBadProtocol()
* instead. UrlHelper::stripDangerousProtocols() can be used in conjunction
* with \Drupal\Component\Utility\SafeMarkup::format() and an @variable
* with \Drupal\Component\Render\FormattableMarkup and an @variable
* placeholder which will perform the necessary escaping.
* UrlHelper::filterBadProtocol() is functionality equivalent to check_url()
* apart from the fact it is protected from double escaping bugs. Note that
* this method no longer marks its output as safe.
*
* @see \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols()
* @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol()
* @see https://www.drupal.org/node/2560027
*/
function check_url($uri) {
return Html::escape(UrlHelper::stripDangerousProtocols($uri));
@ -252,7 +255,8 @@ function format_size($size, $langcode = NULL) {
return \Drupal::translation()->formatPlural($size, '1 byte', '@count bytes', [], ['langcode' => $langcode]);
}
else {
$size = $size / Bytes::KILOBYTE; // Convert bytes to kilobytes.
// Convert bytes to kilobytes.
$size = $size / Bytes::KILOBYTE;
$units = ['KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
foreach ($units as $unit) {
if (round($size, 2) >= Bytes::KILOBYTE) {
@ -314,10 +318,11 @@ function format_size($size, $langcode = NULL) {
* @return
* A translated date string in the requested format.
*
* @see \Drupal\Core\Datetime\DateFormatter::format()
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
* Use \Drupal::service('date.formatter')->format().
*
* @see \Drupal\Core\Datetime\DateFormatter::format()
* @see https://www.drupal.org/node/1876852
*/
function format_date($timestamp, $type = 'medium', $format = '', $timezone = NULL, $langcode = NULL) {
return \Drupal::service('date.formatter')->format($timestamp, $type, $format, $timezone, $langcode);
@ -403,8 +408,8 @@ function drupal_set_time_limit($time_limit) {
/**
* Returns the base URL path (i.e., directory) of the Drupal installation.
*
* base_path() adds a "/" to the beginning and end of the returned path if the
* path is not empty. At the very least, this will return "/".
* Function base_path() adds a "/" to the beginning and end of the returned path
* if the path is not empty. At the very least, this will return "/".
*
* Examples:
* - http://example.com returns "/" because the path is empty.
@ -419,6 +424,8 @@ function base_path() {
*
* @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
* Use \Drupal\Core\Asset\AssetCollectionOptimizerInterface::deleteAll().
*
* @see https://www.drupal.org/node/2317841
*/
function drupal_clear_css_cache() {
\Drupal::service('asset.css.collection_optimizer')->deleteAll();
@ -600,7 +607,7 @@ function drupal_process_states(&$elements) {
* 'id' => 'my-module-table',
* ),
* );
* return drupal_render($table);
* return \Drupal::service('renderer')->render($table);
* @endcode
*
* In the theme function for the form, a special class must be added to each
@ -708,7 +715,7 @@ function drupal_attach_tabledrag(&$element, array $options) {
'subgroup' => NULL,
'source' => NULL,
'hidden' => TRUE,
'limit' => 0
'limit' => 0,
];
$group = $options['group'];
@ -736,6 +743,8 @@ function drupal_attach_tabledrag(&$element, array $options) {
*
* @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
* Use \Drupal\Core\Asset\AssetCollectionOptimizerInterface::deleteAll().
*
* @see https://www.drupal.org/node/2317841
*/
function drupal_clear_js_cache() {
\Drupal::service('asset.js.collection_optimizer')->deleteAll();
@ -853,6 +862,7 @@ function drupal_pre_render_links($element) {
* 'renderer' service instead.
*
* @see \Drupal\Core\Render\RendererInterface::renderRoot()
* @see https://www.drupal.org/node/2912696
*/
function drupal_render_root(&$elements) {
return \Drupal::service('renderer')->renderRoot($elements);
@ -865,6 +875,7 @@ function drupal_render_root(&$elements) {
* 'renderer' service instead.
*
* @see \Drupal\Core\Render\RendererInterface::render()
* @see https://www.drupal.org/node/2912696
*/
function drupal_render(&$elements, $is_recursive_call = FALSE) {
return \Drupal::service('renderer')->render($elements, $is_recursive_call);
@ -887,7 +898,8 @@ function drupal_render(&$elements, $is_recursive_call = FALSE) {
* rendering when possible or loop through the elements and render them as
* they are available.
*
* @see drupal_render()
* @see \Drupal\Core\Render\RendererInterface::render()
* @see https://www.drupal.org/node/2912757
*/
function drupal_render_children(&$element, $children_keys = NULL) {
if ($children_keys === NULL) {
@ -896,7 +908,7 @@ function drupal_render_children(&$element, $children_keys = NULL) {
$output = '';
foreach ($children_keys as $key) {
if (!empty($element[$key])) {
$output .= drupal_render($element[$key]);
$output .= \Drupal::service('renderer')->render($element[$key]);
}
}
return Markup::create($output);
@ -1001,6 +1013,8 @@ function show(&$element) {
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
* Use \Drupal::service('element_info')->getInfo() instead.
*
* @see https://www.drupal.org/node/2235461
*/
function element_info($type) {
return \Drupal::service('element_info')->getInfo($type);
@ -1019,6 +1033,8 @@ function element_info($type) {
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
* Use \Drupal::service('element_info')->getInfoProperty() instead.
*
* @see https://www.drupal.org/node/2235461
*/
function element_info_property($type, $property_name, $default = NULL) {
return \Drupal::service('element_info')->getInfoProperty($type, $property_name, $default);
@ -1100,7 +1116,7 @@ function drupal_flush_all_caches() {
\Drupal::service('kernel')->invalidateContainer();
// Wipe the Twig PHP Storage cache.
PhpStorageFactory::get('twig')->deleteAll();
\Drupal::service('twig')->invalidate();
// Rebuild module and theme data.
$module_data = system_rebuild_module_data();
@ -1111,7 +1127,6 @@ function drupal_flush_all_caches() {
// to reset the theme manager.
\Drupal::theme()->resetActiveTheme();
// Rebuild and reboot a new kernel. A simple DrupalKernel reboot is not
// sufficient, since the list of enabled modules might have been adjusted
// above due to changed code.
@ -1244,7 +1259,7 @@ function archiver_get_extensions() {
*/
function archiver_get_archiver($file) {
// Archivers can only work on local paths
$filepath = drupal_realpath($file);
$filepath = \Drupal::service('file_system')->realpath($file);
if (!is_file($filepath)) {
throw new Exception(t('Archivers can only operate on local files: %file not supported', ['%file' => $file]));
}