Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\BootstrapConfigStorageFactory.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Database\Database;

core/lib/Drupal/Core/Config/CachedStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\CachedStorage.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Cache\CacheBackendInterface;

core/lib/Drupal/Core/Config/Config.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Config.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\NestedArray;

core/lib/Drupal/Core/Config/ConfigBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigBase.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\NestedArray;
@@ -55,7 +50,7 @@ abstract class ConfigBase implements RefinableCacheableDependencyInterface {
    * incompatible with this limitation are created, we enforce a maximum name
    * length of 250 characters (leaving 5 characters for the file extension).
    *
-   * @see http://en.wikipedia.org/wiki/Comparison_of_file_systems
+   * @see http://wikipedia.org/wiki/Comparison_of_file_systems
    *
    * Configuration objects not stored on the filesystem should still be
    * restricted in name length so name can be used as a cache key.
@@ -76,7 +71,7 @@ abstract class ConfigBase implements RefinableCacheableDependencyInterface {
    * Sets the name of this configuration object.
    *
    * @param string $name
-   *  The name of the configuration object.
+   *   The name of the configuration object.
    *
    * @return $this
    *   The configuration object.
@@ -90,7 +85,7 @@ abstract class ConfigBase implements RefinableCacheableDependencyInterface {
    * Validates the configuration object name.
    *
    * @param string $name
-   *  The name of the configuration object.
+   *   The name of the configuration object.
    *
    * @throws \Drupal\Core\Config\ConfigNameException
    *

core/lib/Drupal/Core/Config/ConfigCollectionInfo.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigCollectionInfo.
- */
-
 namespace Drupal\Core\Config;
 
 use Symfony\Component\EventDispatcher\Event;

core/lib/Drupal/Core/Config/ConfigCrudEvent.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigCrudEvent.
- */
-
 namespace Drupal\Core\Config;
 
 use Symfony\Component\EventDispatcher\Event;

core/lib/Drupal/Core/Config/ConfigDuplicateUUIDException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigDuplicateUUIDException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigEvents.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigEvents.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigFactory.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigFactory.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\NestedArray;

core/lib/Drupal/Core/Config/ConfigFactoryInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigFactoryInterface.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigFactoryOverrideBase.
- */
-
 namespace Drupal\Core\Config;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigFactoryOverrideInterface.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigImportValidateEventSubscriberBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigImportValidateEventSubscriberBase.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;

core/lib/Drupal/Core/Config/ConfigImporter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigImporter.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Config\Importer\MissingContentEvent;
@@ -544,10 +539,10 @@ class ConfigImporter {
   /**
    * Processes extensions as a batch operation.
    *
-   * @param array $context.
+   * @param array|\ArrayAccess $context.
    *   The batch context.
    */
-  protected function processExtensions(array &$context) {
+  protected function processExtensions(&$context) {
     $operation = $this->getNextExtensionOperation();
     if (!empty($operation)) {
       $this->processExtension($operation['type'], $operation['op'], $operation['name']);
@@ -564,10 +559,10 @@ class ConfigImporter {
   /**
    * Processes configuration as a batch operation.
    *
-   * @param array $context.
+   * @param array|\ArrayAccess $context.
    *   The batch context.
    */
-  protected function processConfigurations(array &$context) {
+  protected function processConfigurations(&$context) {
     // The first time this is called we need to calculate the total to process.
     // This involves recalculating the changelist which will ensure that if
     // extensions have been processed any configuration affected will be taken
@@ -607,10 +602,10 @@ class ConfigImporter {
   /**
    * Handles processing of missing content.
    *
-   * @param array $context
+   * @param array|\ArrayAccess $context.
    *   Standard batch context.
    */
-  protected function processMissingContent(array &$context) {
+  protected function processMissingContent(&$context) {
     $sandbox = &$context['sandbox']['config'];
     if (!isset($sandbox['missing_content'])) {
       $missing_content = $this->configManager->findMissingContentDependencies();
@@ -639,10 +634,10 @@ class ConfigImporter {
   /**
    * Finishes the batch.
    *
-   * @param array $context.
+   * @param array|\ArrayAccess $context.
    *   The batch context.
    */
-  protected function finish(array &$context) {
+  protected function finish(&$context) {
     $this->eventDispatcher->dispatch(ConfigEvents::IMPORT, new ConfigImporterEvent($this));
     // The import is now complete.
     $this->lock->release(static::LOCK_NAME);

core/lib/Drupal/Core/Config/ConfigImporterEvent.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigImporterEvent.
- */
-
 namespace Drupal\Core\Config;
 
 use Symfony\Component\EventDispatcher\Event;

core/lib/Drupal/Core/Config/ConfigImporterException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigImporterException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigInstaller.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigInstaller.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\Crypt;
@@ -232,7 +227,7 @@ class ConfigInstaller implements ConfigInstallerInterface {
    * @param StorageInterface $storage
    *   The configuration storage to read configuration from.
    * @param string $collection
-   *  The configuration collection to use.
+   *   The configuration collection to use.
    * @param string $prefix
    *   (optional) Limit to configuration starting with the provided string.
    * @param \Drupal\Core\Config\StorageInterface[] $profile_storages

core/lib/Drupal/Core/Config/ConfigInstallerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigInstallerInterface.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigManager.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Diff\Diff;

core/lib/Drupal/Core/Config/ConfigManagerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigManagerInterface.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigModuleOverridesEvent.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\NestedArray;

core/lib/Drupal/Core/Config/ConfigNameException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigNameException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigPrefixLengthException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigPrefixLengthException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigRenameEvent.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigRenameEvent.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ConfigValueException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigValueException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/DatabaseStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\DatabaseStorage.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Database\Database;

core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php

@@ -1,11 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigDependencyDeleteFormTrait.
- */
-
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Config\ConfigManagerInterface;

core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigDependencyManager.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Component\Graph\Graph;

core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityBase.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Component\Utility\NestedArray;

core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityBundleBase.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Config\ConfigNameException;

core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityDependency.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Component\Utility\NestedArray;

core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityInterface.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\EntityInterface;

core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityListBuilder.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\EntityInterface;

core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityStorage.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Cache\CacheableMetadata;

core/lib/Drupal/Core/Config/Entity/ConfigEntityStorageInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityStorageInterface.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\EntityStorageInterface;

core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityType.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException;

core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ConfigEntityTypeInterface.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\EntityTypeInterface;

core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\DraggableListBuilder.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\EntityInterface;

core/lib/Drupal/Core/Config/Entity/Exception/ConfigEntityIdLengthException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\Exception\ConfigEntityIdLengthException.
- */
-
 namespace Drupal\Core\Config\Entity\Exception;
 
 use Drupal\Core\Config\ConfigException;

core/lib/Drupal/Core/Config/Entity/Exception/ConfigEntityStorageClassException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException.
- */
-
 namespace Drupal\Core\Config\Entity\Exception;
 
 use Drupal\Core\Config\ConfigException;

core/lib/Drupal/Core/Config/Entity/ImportableEntityStorageInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ImportableEntityStorageInterface.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Config\Config;

core/lib/Drupal/Core/Config/Entity/Query/Condition.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\Query\Condition.
- */
-
 namespace Drupal\Core\Config\Entity\Query;
 
 use Drupal\Component\Utility\Unicode;

core/lib/Drupal/Core/Config/Entity/Query/InvalidLookupKeyException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\Query\InvalidLookupKeyException.
- */
-
 namespace Drupal\Core\Config\Entity\Query;
 
 /**

core/lib/Drupal/Core/Config/Entity/Query/Query.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\Query\Query.
- */
-
 namespace Drupal\Core\Config\Entity\Query;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\Query\QueryFactory.
- */
-
 namespace Drupal\Core\Config\Entity\Query;
 
 use Drupal\Core\Config\Config;

core/lib/Drupal/Core/Config/Entity/ThirdPartySettingsInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Entity\ThirdPartySettingsInterface.
- */
-
 namespace Drupal\Core\Config\Entity;
 
 /**

core/lib/Drupal/Core/Config/ExtensionInstallStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ExtensionInstallStorage.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Site\Settings;

core/lib/Drupal/Core/Config/FileStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\FileStorage.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Serialization\Yaml;

core/lib/Drupal/Core/Config/FileStorageFactory.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\FileStorageFactory.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ImmutableConfig.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ImmutableConfig.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/ImmutableConfigException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ImmutableConfigException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/Importer/FinalMissingContentSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Importer\FinalMissingContentSubscriber.
- */
-
 namespace Drupal\Core\Config\Importer;
 
 use Drupal\Core\Config\ConfigEvents;

core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Importer\MissingContentEvent.
- */
-
 namespace Drupal\Core\Config\Importer;
 
 use Symfony\Component\EventDispatcher\Event;

core/lib/Drupal/Core/Config/InstallStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\InstallStorage.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Extension\ExtensionDiscovery;

core/lib/Drupal/Core/Config/NullStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\NullStorage.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/PreExistingConfigException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\PreExistingConfigException.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\SafeMarkup;

core/lib/Drupal/Core/Config/Schema/ArrayElement.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\ArrayElement.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 /**

core/lib/Drupal/Core/Config/Schema/ConfigSchemaAlterException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\ConfigSchemaAlterException.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 /**

core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\ConfigSchemaDiscovery.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 use Drupal\Component\Plugin\Discovery\DiscoveryInterface;

core/lib/Drupal/Core/Config/Schema/Element.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\Element.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 use Drupal\Core\Config\TypedConfigManagerInterface;

core/lib/Drupal/Core/Config/Schema/Ignore.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\Ignore.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 /**

core/lib/Drupal/Core/Config/Schema/Mapping.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\Mapping.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 /**

core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\SchemaCheckTrait.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 use Drupal\Core\Config\TypedConfigManagerInterface;

core/lib/Drupal/Core/Config/Schema/SchemaIncompleteException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\SchemaIncompleteException.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 /**

core/lib/Drupal/Core/Config/Schema/Sequence.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\Sequence.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 /**

core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\TypedConfigInterface.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 use Drupal\Core\TypedData\TraversableTypedDataInterface;

core/lib/Drupal/Core/Config/Schema/Undefined.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Schema\Undefined.
- */
-
 namespace Drupal\Core\Config\Schema;
 
 /**

core/lib/Drupal/Core/Config/StorableConfigBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\StorableConfigBase.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Config\Schema\Ignore;

core/lib/Drupal/Core/Config/StorageCacheInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\StorageCacheInterface.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/StorageComparer.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\StorageComparer.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\Cache\MemoryBackend;

core/lib/Drupal/Core/Config/StorageComparerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\StorageComparerInterface.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/StorageException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\StorageException.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/StorageInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\StorageInterface.
- */
-
 namespace Drupal\Core\Config;
 
 /**

core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\Testing\ConfigSchemaChecker.
- */
-
 namespace Drupal\Core\Config\Testing;
 
 use Drupal\Component\Utility\SafeMarkup;
@@ -24,7 +19,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  * is invalid.
  *
  * @see \Drupal\simpletest\WebTestBase::setUp()
- * @see \Drupal\simpletest\KernelTestBase::containerBuild()
+ * @see \Drupal\KernelTests\KernelTestBase::register()
  */
 class ConfigSchemaChecker implements EventSubscriberInterface {
   use SchemaCheckTrait;

core/lib/Drupal/Core/Config/TypedConfigManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\TypedConfigManager.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\NestedArray;
@@ -103,7 +98,7 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
       unset($definition['type']);
     }
     // Add default values from type definition.
-    $definition += $this->_getDefinitionWithReplacements($type, $replace);
+    $definition += $this->getDefinitionWithReplacements($type, $replace);
 
     $data_definition = $this->createDataDefinition($definition['type']);
 
@@ -127,7 +122,7 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
    * @return string
    *   The typed config type for the given plugin ID.
    */
-  protected function _determineType($base_plugin_id, array $definitions) {
+  protected function determineType($base_plugin_id, array $definitions) {
     if (isset($definitions[$base_plugin_id])) {
       $type = $base_plugin_id;
     }
@@ -157,9 +152,9 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
    * @return array
    *   A schema definition array.
    */
-  protected function _getDefinitionWithReplacements($base_plugin_id, array $replacements, $exception_on_invalid = TRUE) {
+  protected function getDefinitionWithReplacements($base_plugin_id, array $replacements, $exception_on_invalid = TRUE) {
     $definitions = $this->getDefinitions();
-    $type = $this->_determineType($base_plugin_id, $definitions);
+    $type = $this->determineType($base_plugin_id, $definitions);
     $definition = $definitions[$type];
     // Check whether this type is an extension of another one and compile it.
     if (isset($definition['type'])) {
@@ -170,12 +165,12 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
 
       // Replace dynamic portions of the definition type.
       if (!empty($replacements) && strpos($definition['type'], ']')) {
-        $sub_type = $this->_determineType($this->replaceName($definition['type'], $replacements), $definitions);
+        $sub_type = $this->determineType($this->replaceName($definition['type'], $replacements), $definitions);
         // Merge the newly determined subtype definition with the original
         // definition.
         $definition = NestedArray::mergeDeepArray([$definitions[$sub_type], $definition], TRUE);
+        $type = "$type||$sub_type";
       }
-
       // Unset type so we try the merge only once per type.
       unset($definition['type']);
       $this->definitions[$type] = $definition;
@@ -192,7 +187,7 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
    * {@inheritdoc}
    */
   public function getDefinition($base_plugin_id, $exception_on_invalid = TRUE) {
-    return $this->_getDefinitionWithReplacements($base_plugin_id, [], $exception_on_invalid);
+    return $this->getDefinitionWithReplacements($base_plugin_id, [], $exception_on_invalid);
   }
 
   /**

core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\TypedConfigManagerInterface.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Core\TypedData\TypedDataManagerInterface;
@@ -17,7 +12,7 @@ use Drupal\Core\TypedData\TypedDataManagerInterface;
  * @see hook_config_schema_info_alter()
  * @see https://www.drupal.org/node/1905070
  */
-Interface TypedConfigManagerInterface extends TypedDataManagerInterface {
+interface TypedConfigManagerInterface extends TypedDataManagerInterface {
 
   /**
    * Gets typed configuration data.

core/lib/Drupal/Core/Config/UnmetDependenciesException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\UnmetDependenciesException.
- */
-
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\SafeMarkup;

core/lib/Drupal/Core/Config/UnsupportedDataTypeConfigException.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\UnsupportedDataTypeConfigException.
- */
-
 namespace Drupal\Core\Config;
 
 /**