diff --git a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php index f3afb38..d77a11f 100644 --- a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php +++ b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php @@ -237,7 +237,7 @@ public function setProfileDirectories(array $paths = NULL) { } /** - * Filters out extensions not belonging to the current installation profiles. + * Filters out extensions not belonging to the scanned installation profiles. * * @param \Drupal\Core\Extension\Extension[] $all_files. * The list of all extensions. @@ -245,12 +245,12 @@ public function setProfileDirectories(array $paths = NULL) { * @return \Drupal\Core\Extension\Extension[] * The filtered list of extensions. */ - protected function filter(array $all_files) { + protected function filterByProfileDirectories(array $all_files) { if (empty($this->profileDirectories)) { return $all_files; } - $all_files = array_filter($all_files, function($file) { + $all_files = array_filter($all_files, function ($file) { if (strpos($file->subpath, 'profiles') !== 0) { // This extension doesn't belong to a profile, ignore it. return TRUE; @@ -274,11 +274,13 @@ protected function filter(array $all_files) { * * @param \Drupal\Core\Extension\Extension[] $all_files. * The list of all extensions. + * @param array $weights + * An array of weights, keyed by originating directory. * * @return \Drupal\Core\Extension\Extension[] * The sorted list of extensions. */ - protected function sort(array $all_files, $weights) { + protected function sort(array $all_files, array $weights) { $origins = array(); $profiles = array(); foreach ($all_files as $key => $file) {