summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2013-11-20 20:52:18 (GMT)
committerwebchick2013-11-20 20:52:18 (GMT)
commit76e6e2a92083f52d66f4581e6b95308b3658c91e (patch)
tree983281f56f912c824c201f928ad7ce811a8e37da
parent843d7d66141f086e2ab6fb4c291d874582895fe6 (diff)
Revert "Issue #2138239 by damiankloip, tim.plunkett, amateescu: Use GlobIterator instead of glob."
Bah. Wrong commit message. This reverts commit 843d7d66141f086e2ab6fb4c291d874582895fe6.
-rw-r--r--core/lib/Drupal/Core/Config/FileStorage.php13
-rw-r--r--core/lib/Drupal/Core/Config/InstallStorage.php7
-rw-r--r--core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php6
3 files changed, 14 insertions, 12 deletions
diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php
index bf178c5..52c9aa5 100644
--- a/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/core/lib/Drupal/Core/Config/FileStorage.php
@@ -204,11 +204,14 @@ class FileStorage implements StorageInterface {
throw new StorageException($this->directory . '/ not found.');
}
$extension = '.' . static::getFileExtension();
- $files = glob($this->directory . '/' . $prefix . '*' . $extension);
- $clean_name = function ($value) use ($extension) {
- return basename($value, $extension);
- };
- return array_map($clean_name, $files);
+ $files = new \GlobIterator(DRUPAL_ROOT . '/' . $this->directory . '/' . $prefix . '*' . $extension);
+
+ $names = array();
+ foreach ($files as $file) {
+ $names[] = $file->getBasename($extension);
+ }
+
+ return $names;
}
/**
diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php
index e8442ea..16bcc1c 100644
--- a/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -134,10 +134,9 @@ class InstallStorage extends FileStorage {
foreach ($list as $name) {
$directory = $this->getComponentFolder($type, $name);
if (file_exists($directory)) {
- $files = glob($directory . '/*' . $extension);
- foreach ($files as $filename) {
- $name = basename($filename, $extension);
- $folders[$name] = $directory;
+ $files = new \GlobIterator(DRUPAL_ROOT . '/' . $directory . '/*' . $extension);
+ foreach ($files as $file) {
+ $folders[$file->getBasename($extension)] = $directory;
}
}
}
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
index bc0dc61..3eefd37 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -320,9 +320,9 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
if (empty($langcodes)) {
$langcodes = array();
// Collect languages included with CKEditor based on file listing.
- $ckeditor_languages = glob(DRUPAL_ROOT . '/core/assets/vendor/ckeditor/lang/*.js');
- foreach ($ckeditor_languages as $language_filename) {
- $langcode = basename($language_filename, '.js');
+ $ckeditor_languages = new \GlobIterator(DRUPAL_ROOT . '/core/assets/vendor/ckeditor/lang/*.js');
+ foreach ($ckeditor_languages as $language_file) {
+ $langcode = $language_file->getBasename('.js');
$langcodes[$langcode] = $langcode;
}
cache('ckeditor.languages')->set('langcodes', $langcodes);