diff -u b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php --- b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php @@ -7,8 +7,10 @@ namespace Drupal\config\Tests; -use Drupal\Core\Config\InstallStorage; +use Drupal\config_test\TestInstallStorage; +use Drupal\config_test\TestSchemaStorage; use Drupal\Core\Config\Schema\Property; +use Drupal\Core\Config\TypedConfigManager; use Drupal\Core\TypedData\Type\BooleanInterface; use Drupal\Core\TypedData\Type\StringInterface; use Drupal\simpletest\DrupalUnitTestBase; @@ -24,6 +26,13 @@ class DefaultConfigTest extends DrupalUnitTestBase { /** + * Modules to enable. + * + * @var array + */ + public static $modules = array('config_test'); + + /** * The config schema wrapper object for the configuration object under test. * * @var \Drupal\Core\Config\Schema\Element @@ -57,10 +66,18 @@ * Tests default configuration data type. */ public function testDefaultConfig() { - /** @var \Drupal\Core\Config\TypedConfigManager $typed_config */ - $typed_config = $this->container->get('config.typed'); + // Create a typed config manager with access to configuration schema in + // every module, profile and theme. + $typed_config = new TypedConfigManager( + \Drupal::service('config.storage'), + new TestSchemaStorage(), + \Drupal::service('cache.config') + ); + + // Create a configuration storage with access to default configuration in + // every module, profile and theme. + $default_config_storage = new TestInstallStorage(); - $default_config_storage = new InstallStorage(); foreach ($default_config_storage->listAll() as $config_name) { // @todo: remove once migration and // translation (https://drupal.org/node/2168609) schemas are in. diff -u b/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml --- b/core/modules/system/config/schema/system.schema.yml +++ b/core/modules/system/config/schema/system.schema.yml @@ -362,16 +362,6 @@ allow_insecure_uploads: type: boolean label: 'Allow insecure uploads' - chmod: - type: mapping - label: 'Permission mode settings' - mapping: - directory: - type: integer - label: 'Directory permission mode' - file: - type: integer - label: 'File permission mode' default_scheme: type: string label: 'Default download method' only in patch2: unchanged: --- /dev/null +++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/TestInstallStorage.php @@ -0,0 +1,30 @@ +folders)) { + $this->folders = $this->getComponentNames('profile', array_keys(drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.profile$/', 'profiles'))); + $this->folders += $this->getComponentNames('module', array_keys(drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.module$/', 'modules', 'name', 0))); + $this->folders += $this->getComponentNames('theme', array_keys(drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info.yml$/', 'themes'))); + } + return $this->folders; + } + +} only in patch2: unchanged: --- /dev/null +++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/TestSchemaStorage.php @@ -0,0 +1,31 @@ +folders)) { + $this->folders = $this->getComponentNames('profile', array_keys(drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.profile$/', 'profiles'))); + $this->folders += $this->getComponentNames('module', array_keys(drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.module$/', 'modules', 'name', 0))); + $this->folders += $this->getComponentNames('theme', array_keys(drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info.yml$/', 'themes'))); + } + return $this->folders; + } + +}