diff --git a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php index 0fcd077..81fb547 100644 --- a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php +++ b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php @@ -205,7 +205,7 @@ public function scan($type, $include_tests = NULL) { $searchdirs[static::ORIGIN_SITE] = \Drupal::service('site.path'); } else { - $searchdirs[static::ORIGIN_SITE] = $this->sitePath ? : DrupalKernel::findSitePath(Request::createFromGlobals()); + $searchdirs[static::ORIGIN_SITE] = $this->sitePath ?: DrupalKernel::findSitePath(Request::createFromGlobals()); } // Unless an explicit value has been passed, manually check whether we are @@ -216,7 +216,6 @@ public function scan($type, $include_tests = NULL) { $include_tests = Settings::get('extension_discovery_scan_tests') || drupal_valid_test_ua(); } - // Scan for extensions. $files = array(); foreach ($searchdirs as $dir) { // Discover all extensions in the directory, unless we did already. @@ -293,7 +292,7 @@ public function setProfileDirectories(array $paths = NULL) { /** * Filters out extensions not belonging to the scanned installation profiles. * - * @param \Drupal\Core\Extension\Extension[] $all_files. + * @param \Drupal\Core\Extension\Extension[] $all_files * The list of all extensions. * * @return \Drupal\Core\Extension\Extension[] @@ -326,7 +325,7 @@ protected function filterByProfileDirectories(array $all_files) { /** * Sorts the discovered extensions. * - * @param \Drupal\Core\Extension\Extension[] $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.