diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php index c57bbffe28746a3eeb18bc6758b9ab21f2292ba7..6f477d19f68eb9728c38da6be6c0f440f5266831 100644 --- a/core/lib/Drupal/Core/Asset/AssetResolver.php +++ b/core/lib/Drupal/Core/Asset/AssetResolver.php @@ -155,7 +155,7 @@ public function getCssAssets(AttachedAssetsInterface $assets, $optimize) { $this->themeManager->alter('css', $css, $assets); // Sort CSS items, so that they appear in the correct order. - uasort($css, 'static::sort'); + uasort($css, [static::class, 'sort']); if ($optimize) { $css = \Drupal::service('asset.css.collection_optimizer')->optimize($css); @@ -262,7 +262,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) { $this->themeManager->alter('js', $javascript, $assets); // Sort JavaScript assets, so that they appear in the correct order. - uasort($javascript, 'static::sort'); + uasort($javascript, [static::class, 'sort']); // Prepare the return value: filter JavaScript assets per scope. $js_assets_header = []; diff --git a/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/core/lib/Drupal/Core/Mail/MailFormatHelper.php index 42468cbbf8b3aa956ca89086222c0b075c5692a7..4d7a1ae7ae95ffb3ac927ccf4830f2a734b071e9 100644 --- a/core/lib/Drupal/Core/Mail/MailFormatHelper.php +++ b/core/lib/Drupal/Core/Mail/MailFormatHelper.php @@ -125,7 +125,7 @@ public static function htmlToText($string, $allowed_tags = NULL) { // 'See the Drupal site [1]' with the URL included as a footnote. static::htmlToMailUrls(NULL, TRUE); $pattern = '@(<a[^>]+?href="([^"]*)"[^>]*?>(.+?)</a>)@i'; - $string = preg_replace_callback($pattern, 'static::htmlToMailUrls', $string); + $string = preg_replace_callback($pattern, [static::class, 'htmlToMailUrls'], $string); $urls = static::htmlToMailUrls(); $footnotes = ''; if (count($urls)) { diff --git a/core/lib/Drupal/Core/Render/Element.php b/core/lib/Drupal/Core/Render/Element.php index dbd0804119ae2ece7b8f1a4ef4579064d5487d0e..27e4d1ab05c291fc688c065dea9eb5cb969c4df1 100644 --- a/core/lib/Drupal/Core/Render/Element.php +++ b/core/lib/Drupal/Core/Render/Element.php @@ -37,7 +37,7 @@ public static function property($key) { * An array of property keys for the element. */ public static function properties(array $element) { - return array_filter(array_keys($element), 'static::property'); + return array_filter(array_keys($element), [static::class, 'property']); } /** diff --git a/core/modules/user/src/Entity/Role.php b/core/modules/user/src/Entity/Role.php index f65af5108854de11e20bc50260d381a228f26ef7..af05336658b2438d1939fda287ce4dd7e025ffd9 100644 --- a/core/modules/user/src/Entity/Role.php +++ b/core/modules/user/src/Entity/Role.php @@ -169,7 +169,7 @@ public static function postLoad(EntityStorageInterface $storage, array &$entitie parent::postLoad($storage, $entities); // Sort the queried roles by their weight. // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort(). - uasort($entities, 'static::sort'); + uasort($entities, [static::class, 'sort']); } /** diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php index 9aa8168f0878f6f0495b8145e8ff11c01d1e8d2f..e15f0b249392e95df909119193e197302ecce3cf 100644 --- a/core/modules/views/src/Plugin/views/filter/Date.php +++ b/core/modules/views/src/Plugin/views/filter/Date.php @@ -111,7 +111,7 @@ protected function hasValidGroupedValue(array $group) { // one greater. $operators = $this->operators(); $expected = $operators[$group['operator']]['values'] + 1; - $actual = count(array_filter($group['value'], 'static::arrayFilterZero')); + $actual = count(array_filter($group['value'], [static::class, 'arrayFilterZero'])); return $actual == $expected; } diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php index 6401fe01435ffef5a659cf8bdfa033bec3a2be44..1da612333e082bc94fd6383e72b746526247d509 100644 --- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php @@ -704,7 +704,7 @@ protected function hasValidGroupedValue(array $group) { // types). Ensure at least the minimum number of values is present for // this entry to be considered valid. $min_values = $operators[$group['operator']]['values']; - $actual_values = count(array_filter($group['value'], 'static::arrayFilterZero')); + $actual_values = count(array_filter($group['value'], [static::class, 'arrayFilterZero'])); return $actual_values >= $min_values; } } diff --git a/core/modules/views/src/Plugin/views/filter/ManyToOne.php b/core/modules/views/src/Plugin/views/filter/ManyToOne.php index 1b3810cfe6f214ceee246ac0372e7a9d4ac22a16..9fd8a42fe8a9eb9a3f2a4596797ee9a639ab439e 100644 --- a/core/modules/views/src/Plugin/views/filter/ManyToOne.php +++ b/core/modules/views/src/Plugin/views/filter/ManyToOne.php @@ -132,7 +132,7 @@ protected function opHelper() { } // Form API returns unchecked options in the form of option_id => 0. This // breaks the generated query for "is all of" filters so we remove them. - $this->value = array_filter($this->value, 'static::arrayFilterZero'); + $this->value = array_filter($this->value, [static::class, 'arrayFilterZero']); $this->helper->addFilter(); } diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php index c977882d9b47f4525634f5ed0b6b7dcb4e662fd6..f6522e46ca3a44b066a76c6f4900c17e6961298e 100644 --- a/core/modules/views/src/ViewsDataHelper.php +++ b/core/modules/views/src/ViewsDataHelper.php @@ -148,7 +148,7 @@ public function fetchFields($base, $type, $grouping = FALSE, $sub_type = NULL) { $strings += $this->fields[$base_table][$type]; } } - uasort($strings, ['self', 'fetchedFieldSort']); + uasort($strings, [self::class, 'fetchedFieldSort']); return $strings; }