Update to Drupal 8.0.0-rc3. For more information, see https://www.drupal.org/node/2608078

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

@@ -55,7 +55,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::exists().
+   * {@inheritdoc}
    */
   public function exists($name) {
     // The cache would read in the entire data (instead of only checking whether
@@ -65,7 +65,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::read().
+   * {@inheritdoc}
    */
   public function read($name) {
     $cache_key = $this->getCacheKey($name);
@@ -123,7 +123,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::write().
+   * {@inheritdoc}
    */
   public function write($name, array $data) {
     if ($this->storage->write($name, $data)) {
@@ -137,7 +137,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::delete().
+   * {@inheritdoc}
    */
   public function delete($name) {
     // If the cache was the first to be deleted, another process might start
@@ -151,7 +151,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::rename().
+   * {@inheritdoc}
    */
   public function rename($name, $new_name) {
     // If the cache was the first to be deleted, another process might start
@@ -166,14 +166,14 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::encode().
+   * {@inheritdoc}
    */
   public function encode($data) {
     return $this->storage->encode($data);
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::decode().
+   * {@inheritdoc}
    */
   public function decode($raw) {
     return $this->storage->decode($raw);
@@ -215,7 +215,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::deleteAll().
+   * {@inheritdoc}
    */
   public function deleteAll($prefix = '') {
     // If the cache was the first to be deleted, another process might start

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

@@ -111,25 +111,26 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
     }
     else {
       // If the configuration object does not exist in the configuration
-      // storage, create a new object and add it to the static cache.
-      $cache_key = $this->getConfigCacheKey($name, $immutable);
-      $this->cache[$cache_key] = $this->createConfigObject($name, $immutable);
+      // storage, create a new object.
+      $config = $this->createConfigObject($name, $immutable);
 
       if ($immutable) {
         // Get and apply any overrides.
         $overrides = $this->loadOverrides(array($name));
         if (isset($overrides[$name])) {
-          $this->cache[$cache_key]->setModuleOverride($overrides[$name]);
+          $config->setModuleOverride($overrides[$name]);
         }
         // Apply any settings.php overrides.
         if (isset($GLOBALS['config'][$name])) {
-          $this->cache[$cache_key]->setSettingsOverride($GLOBALS['config'][$name]);
+          $config->setSettingsOverride($GLOBALS['config'][$name]);
         }
       }
 
-      $this->propagateConfigOverrideCacheability($cache_key, $name);
+      foreach ($this->configFactoryOverrides as $override) {
+        $config->addCacheableDependency($override->getCacheableMetadata($name));
+      }
 
-      return $this->cache[$cache_key];
+      return $config;
     }
   }
 

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

@@ -454,10 +454,10 @@ class ConfigImporter {
   /**
    * Imports the changelist to the target storage.
    *
-   * @throws \Drupal\Core\Config\ConfigException
-   *
    * @return \Drupal\Core\Config\ConfigImporter
    *   The ConfigImporter instance.
+   *
+   * @throws \Drupal\Core\Config\ConfigException
    */
   public function import() {
     if ($this->hasUnprocessedConfigurationChanges()) {
@@ -828,10 +828,10 @@ class ConfigImporter {
    * @param string $name
    *   The name of the configuration to process.
    *
-   * @throws \Drupal\Core\Config\ConfigImporterException
-   *
    * @return bool
    *   TRUE is to continue processing, FALSE otherwise.
+   *
+   * @throws \Drupal\Core\Config\ConfigImporterException
    */
   protected function checkOp($collection, $op, $name) {
     if ($op == 'rename') {
@@ -939,13 +939,13 @@ class ConfigImporter {
    * @param string $name
    *   The name of the configuration to process.
    *
-   * @throws \Drupal\Core\Entity\EntityStorageException
-   *   Thrown if the data is owned by an entity type, but the entity storage
-   *   does not support imports.
-   *
    * @return bool
    *   TRUE if the configuration was imported as a configuration entity. FALSE
    *   otherwise.
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   *   Thrown if the data is owned by an entity type, but the entity storage
+   *   does not support imports.
    */
   protected function importInvokeOwner($collection, $op, $name) {
     // Renames are handled separately.
@@ -989,14 +989,14 @@ class ConfigImporter {
    *   The rename configuration name, as provided by
    *   \Drupal\Core\Config\StorageComparer::createRenameName().
    *
-   * @throws \Drupal\Core\Entity\EntityStorageException
-   *   Thrown if the data is owned by an entity type, but the entity storage
-   *   does not support imports.
-   *
    * @return bool
    *   TRUE if the configuration was imported as a configuration entity. FALSE
    *   otherwise.
    *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   *   Thrown if the data is owned by an entity type, but the entity storage
+   *   does not support imports.
+   *
    * @see \Drupal\Core\Config\ConfigImporter::createRenameName()
    */
   protected function importInvokeRename($collection, $rename_name) {

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

@@ -67,7 +67,7 @@ class DatabaseStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::exists().
+   * {@inheritdoc}
    */
   public function exists($name) {
     try {
@@ -247,7 +247,7 @@ class DatabaseStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::encode().
+   * {@inheritdoc}
    */
   public function encode($data) {
     return serialize($data);

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

@@ -111,7 +111,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
   protected $trustedData = FALSE;
 
   /**
-   * Overrides Entity::__construct().
+   * {@inheritdoc}
    */
   public function __construct(array $values, $entity_type) {
     parent::__construct($values, $entity_type);

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

@@ -138,7 +138,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
   }
 
   /**
-   * Implements Drupal\Core\Entity\EntityStorageInterface::deleteRevision().
+   * {@inheritdoc}
    */
   public function deleteRevision($revision_id) {
     return NULL;

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

@@ -20,7 +20,7 @@ use Drupal\Core\Entity\Query\QueryException;
 class Condition extends ConditionBase {
 
   /**
-   * Implements \Drupal\Core\Entity\Query\ConditionInterface::compile().
+   * {@inheritdoc}
    */
   public function compile($configs) {
     $and = strtoupper($this->conjunction) == 'AND';
@@ -86,14 +86,14 @@ class Condition extends ConditionBase {
   }
 
   /**
-   * Implements \Drupal\Core\Entity\Query\ConditionInterface::exists().
+   * {@inheritdoc}
    */
   public function exists($field, $langcode = NULL) {
     return $this->condition($field, NULL, 'IS NOT NULL', $langcode);
   }
 
   /**
-   * Implements \Drupal\Core\Entity\Query\ConditionInterface::notExists().
+   * {@inheritdoc}
    */
   public function notExists($field, $langcode = NULL) {
     return $this->condition($field, NULL, 'IS NULL', $langcode);

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

@@ -80,7 +80,7 @@ class Query extends QueryBase implements QueryInterface {
   }
 
   /**
-   * Implements \Drupal\Core\Entity\Query\QueryInterface::execute().
+   * {@inheritdoc}
    */
   public function execute() {
     // Load the relevant config records.

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

@@ -80,7 +80,7 @@ class FileStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::exists().
+   * {@inheritdoc}
    */
   public function exists($name) {
     return file_exists($this->getFilePath($name));
@@ -146,7 +146,7 @@ class FileStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::delete().
+   * {@inheritdoc}
    */
   public function delete($name) {
     if (!$this->exists($name)) {
@@ -160,7 +160,7 @@ class FileStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::rename().
+   * {@inheritdoc}
    */
   public function rename($name, $new_name) {
     $status = @rename($this->getFilePath($name), $this->getFilePath($new_name));
@@ -171,14 +171,14 @@ class FileStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::encode().
+   * {@inheritdoc}
    */
   public function encode($data) {
     return Yaml::encode($data);
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::decode().
+   * {@inheritdoc}
    */
   public function decode($raw) {
     $data = Yaml::decode($raw);
@@ -190,7 +190,7 @@ class FileStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::listAll().
+   * {@inheritdoc}
    */
   public function listAll($prefix = '') {
     $dir = $this->getCollectionDirectory();
@@ -216,7 +216,7 @@ class FileStorage implements StorageInterface {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::deleteAll().
+   * {@inheritdoc}
    */
   public function deleteAll($prefix = '') {
     $success = TRUE;

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

@@ -129,7 +129,7 @@ class InstallStorage extends FileStorage {
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::listAll().
+   * {@inheritdoc}
    */
   public function listAll($prefix = '') {
     $names = array_keys($this->getAllFolders());

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

@@ -24,70 +24,70 @@ namespace Drupal\Core\Config;
 class NullStorage implements StorageInterface {
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::exists().
+   * {@inheritdoc}
    */
   public function exists($name) {
     return FALSE;
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::read().
+   * {@inheritdoc}
    */
   public function read($name) {
     return array();
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::readMultiple().
+   * {@inheritdoc}
    */
   public function readMultiple(array $names) {
     return array();
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::write().
+   * {@inheritdoc}
    */
   public function write($name, array $data) {
     return FALSE;
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::delete().
+   * {@inheritdoc}
    */
   public function delete($name) {
     return FALSE;
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::rename().
+   * {@inheritdoc}
    */
   public function rename($name, $new_name) {
     return FALSE;
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::encode().
+   * {@inheritdoc}
    */
   public function encode($data) {
     return $data;
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::decode().
+   * {@inheritdoc}
    */
   public function decode($raw) {
     return $raw;
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::listAll().
+   * {@inheritdoc}
    */
   public function listAll($prefix = '') {
     return array();
   }
 
   /**
-   * Implements Drupal\Core\Config\StorageInterface::deleteAll().
+   * {@inheritdoc}
    */
   public function deleteAll($prefix = '') {
     return FALSE;

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

@@ -115,7 +115,7 @@ abstract class ArrayElement extends Element implements \IteratorAggregate, Typed
   }
 
   /**
-   * Implements IteratorAggregate::getIterator();
+   * {@inheritdoc}
    */
   public function getIterator() {
     return new \ArrayIterator($this->getElements());

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

@@ -45,11 +45,11 @@ interface TypedConfigInterface extends TraversableTypedDataInterface {
    *   elements can be get using multiple dot delimited names, for example,
    *   'page.front'.
    *
-   * @throws \InvalidArgumentException
-   *   If an invalid property name is given.
-   *
    * @return \Drupal\Core\TypedData\TypedDataInterface
    *   The property object.
+   *
+   * @throws \InvalidArgumentException
+   *   If an invalid property name is given.
    */
   public function get($name);