diff -u b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php --- b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php +++ b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\Schema\ArrayElement. + * Contains \Drupal\Core\Config\Schema\ArrayElement. */ namespace Drupal\Core\Config\Schema; diff -u b/core/lib/Drupal/Core/Config/Schema/Element.php b/core/lib/Drupal/Core/Config/Schema/Element.php --- b/core/lib/Drupal/Core/Config/Schema/Element.php +++ b/core/lib/Drupal/Core/Config/Schema/Element.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\Schema\Element. + * Contains \Drupal\Core\Config\Schema\Element. */ namespace Drupal\Core\Config\Schema; diff -u b/core/lib/Drupal/Core/Config/Schema/Mapping.php b/core/lib/Drupal/Core/Config/Schema/Mapping.php --- b/core/lib/Drupal/Core/Config/Schema/Mapping.php +++ b/core/lib/Drupal/Core/Config/Schema/Mapping.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\Schema\Mapping. + * Contains \Drupal\Core\Config\Schema\Mapping. */ namespace Drupal\Core\Config\Schema; diff -u b/core/lib/Drupal/Core/Config/Schema/Parser.php b/core/lib/Drupal/Core/Config/Schema/Parser.php --- b/core/lib/Drupal/Core/Config/Schema/Parser.php +++ b/core/lib/Drupal/Core/Config/Schema/Parser.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\Schema\Parser. + * Contains \Drupal\Core\Config\Schema\Parser. */ namespace Drupal\Core\Config\Schema; diff -u b/core/lib/Drupal/Core/Config/Schema/Property.php b/core/lib/Drupal/Core/Config/Schema/Property.php --- b/core/lib/Drupal/Core/Config/Schema/Property.php +++ b/core/lib/Drupal/Core/Config/Schema/Property.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\Schema\Sequence. + * Contains \Drupal\Core\Config\Schema\Sequence. */ namespace Drupal\Core\Config\Schema; diff -u b/core/lib/Drupal/Core/Config/Schema/SchemaDiscovery.php b/core/lib/Drupal/Core/Config/Schema/SchemaDiscovery.php --- b/core/lib/Drupal/Core/Config/Schema/SchemaDiscovery.php +++ b/core/lib/Drupal/Core/Config/Schema/SchemaDiscovery.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Config\Schema\SchemaDiscovery. + * Contains \Drupal\Config\Schema\SchemaDiscovery. */ namespace Drupal\Core\Config\Schema; diff -u b/core/lib/Drupal/Core/Config/Schema/Sequence.php b/core/lib/Drupal/Core/Config/Schema/Sequence.php --- b/core/lib/Drupal/Core/Config/Schema/Sequence.php +++ b/core/lib/Drupal/Core/Config/Schema/Sequence.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\Schema\Sequence. + * Contains \Drupal\Core\Config\Schema\Sequence. */ namespace Drupal\Core\Config\Schema; diff -u b/core/lib/Drupal/Core/Config/TypedConfigElementFactory.php b/core/lib/Drupal/Core/Config/TypedConfigElementFactory.php --- b/core/lib/Drupal/Core/Config/TypedConfigElementFactory.php +++ b/core/lib/Drupal/Core/Config/TypedConfigElementFactory.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\TypedConfigElementFactory. + * Contains \Drupal\Core\Config\TypedConfigElementFactory. */ namespace Drupal\Core\Config; diff -u b/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php --- b/core/lib/Drupal/Core/Config/TypedConfigManager.php +++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Config\TypedConfigManager. + * Contains \Drupal\Core\Config\TypedConfigManager. */ namespace Drupal\Core\Config; diff -u b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php --- b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php @@ -2,25 +2,25 @@ /** * @file - * Definition of Drupal\config\Tests\ConfigMetadataTest. + * Contains \Drupal\config\Tests\ConfigSchemaTest. */ namespace Drupal\config\Tests; use Drupal\Core\Config\TypedConfig; -use Drupal\simpletest\WebTestBase; +use Drupal\simpletest\DrupalUnitTestBase; /** * Tests schema for configuration objects. */ -class ConfigSchemaTest extends WebTestBase { +class ConfigSchemaTest extends DrupalUnitTestBase { /** * Modules to enable. * * @var array */ - public static $modules = array('locale', 'image'); + public static $modules = array('system', 'locale', 'image'); public static function getInfo() { return array( @@ -30,6 +30,12 @@ ); } + public function setUp() { + parent::setUp(); + config_install_default_config('module', 'system'); + config_install_default_config('module', 'image'); + } + /** * Tests the basic metadata retrieval layer. */ @@ -141 +146,0 @@ - diff -u b/core/modules/contact/config/contact.schema.yml b/core/modules/contact/config/contact.schema.yml --- b/core/modules/contact/config/contact.schema.yml +++ b/core/modules/contact/config/contact.schema.yml @@ -16,7 +16,7 @@ type: string "weight": type: integer - + # Module settings contact.settings: type: mapping diff -u b/core/modules/image/config/image.schema.yml b/core/modules/image/config/image.schema.yml --- b/core/modules/image/config/image.schema.yml +++ b/core/modules/image/config/image.schema.yml @@ -43,11 +43,11 @@ mapping: "anchor": label: "Anchor" - + image.effect.image_resize: type: image.size label: "Image resize" - + image.effect.image_rotate: type: mapping label: "Image rotate" diff -u b/core/modules/system/config/system.schema.yml b/core/modules/system/config/system.schema.yml --- b/core/modules/system/config/system.schema.yml +++ b/core/modules/system/config/system.schema.yml @@ -51,7 +51,7 @@ # Complex extended data types: # Mail text with subject and body parts. -mail: +mail: type: mapping label: "Mail" mapping: @@ -61,7 +61,7 @@ "body": type: text label: "Body" - + # Schema for configuration files of system module: system.site: @@ -105 +104,0 @@ - \ No newline at end of file diff -u b/core/modules/views/config/views.schema.yml b/core/modules/views/config/views.schema.yml --- b/core/modules/views/config/views.schema.yml +++ b/core/modules/views/config/views.schema.yml @@ -27,14 +27,14 @@ core: label: 'Drupal version' uuid: - label: 'UUID' + label: 'UUID' display: type: sequence label: 'Displays' sequence: - type: mapping label: 'Display settings' - mapping: + mapping: id: label: 'Machine name' display_title: @@ -77,13 +77,13 @@ offset: type: integer label: 'Offset' - + exposed_form: type: mapping label: 'Exposed form' mapping: type: - label: 'Exposed form type' + label: 'Exposed form type' access: type: mapping label: 'Access' @@ -102,7 +102,7 @@ type: sequence label: 'Sorts' sequence: - - type: 'views.sort.[table]-[field]' + - type: 'views.sort.[table]-[field]' arguments: type: sequence label: 'Arguments' @@ -156,7 +156,7 @@ type: sequence label: 'Relationships' sequence: - - type: 'views.relationship.[table]-[field]' + - type: 'views.relationship.[table]-[field]' # Options for Drupal\views\Plugin\views\display\PathPluginBase views.display.PathPluginBase: @@ -208,7 +208,7 @@ label: 'Weight' name: label: 'Menu name' - + # Views display plugin: Drupal\views\Plugin\views\display\Block views.display.block: type: 'views.display.%' @@ -219,7 +219,7 @@ label: 'Block name' block_caching: label: 'Block caching' - + # Views display plugin: Drupal\views\Plugin\views\display\Feed views.display.feed: type: 'views.display.PathPluginBase'