Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2124537 by chx: Nuke the Eldritch Abomination EntityManager::addNamespaces.

8.0.x
Alex Pott 2013-11-01 09:06:53 -07:00
parent fa32679489
commit 97fc3d3160
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/lib/Drupal/Core/Entity/EntityManager.php
View File

@ -137,27 +137,12 @@ class EntityManager extends PluginManagerBase implements EntityManagerInterface
$this->namespaces = $namespaces; $this->namespaces = $namespaces;
$this->translationManager = $translation_manager; $this->translationManager = $translation_manager;
$this->doDiscovery($namespaces);
$this->factory = new DefaultFactory($this->discovery);
$this->container = $container;
}
protected function doDiscovery($namespaces) {
$this->discovery = new AnnotatedClassDiscovery('Entity', $namespaces, 'Drupal\Core\Entity\Annotation\EntityType'); $this->discovery = new AnnotatedClassDiscovery('Entity', $namespaces, 'Drupal\Core\Entity\Annotation\EntityType');
$this->discovery = new InfoHookDecorator($this->discovery, 'entity_info'); $this->discovery = new InfoHookDecorator($this->discovery, 'entity_info');
$this->discovery = new AlterDecorator($this->discovery, 'entity_info'); $this->discovery = new AlterDecorator($this->discovery, 'entity_info');
$this->discovery = new CacheDecorator($this->discovery, 'entity_info:' . $this->languageManager->getLanguage(Language::TYPE_INTERFACE)->id, 'cache', CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); $this->discovery = new CacheDecorator($this->discovery, 'entity_info:' . $this->languageManager->getLanguage(Language::TYPE_INTERFACE)->id, 'cache', CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE));
} $this->factory = new DefaultFactory($this->discovery);
$this->container = $container;
/**
* {@inheritdoc}
*/
public function addNamespaces(\Traversable $namespaces) {
reset($this->namespaces);
$iterator = new \AppendIterator;
$iterator->append(new \IteratorIterator($this->namespaces));
$iterator->append($namespaces);
$this->doDiscovery($iterator);
} }
/** /**

14
core/lib/Drupal/Core/Entity/EntityManagerInterface.php
View File

@ -138,20 +138,6 @@ interface EntityManagerInterface extends PluginManagerInterface {
*/ */
public function getAllBundleInfo(); public function getAllBundleInfo();
/**
* Add more namespaces to the entity manager.
*
* This is usually only necessary for uninstall purposes.
*
* @todo Remove this method, along with doDiscovery(), when
* https://drupal.org/node/1199946 is fixed.
*
* @param \Traversable $namespaces
*
* @see comment_uninstall()
*/
public function addNamespaces(\Traversable $namespaces);
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */