diff --git a/core/lib/Drupal/Core/Config/Entity/Query/Query.php b/core/lib/Drupal/Core/Config/Entity/Query/Query.php index 6210dac..634009e 100644 --- a/core/lib/Drupal/Core/Config/Entity/Query/Query.php +++ b/core/lib/Drupal/Core/Config/Entity/Query/Query.php @@ -43,6 +43,8 @@ class Query extends QueryBase implements QueryInterface { * The entity manager that stores all meta information. * @param \Drupal\Core\Config\StorageInterface $config_storage * The actual config storage which is used to list all config items. + * @param array $namespaces + * List of potential namespaces of the classes belonging to this query. */ function __construct($entity_type, $conjunction, EntityManager $entity_manager, StorageInterface $config_storage, array $namespaces) { parent::__construct($entity_type, $conjunction, $namespaces); diff --git a/core/lib/Drupal/Core/Entity/Query/QueryBase.php b/core/lib/Drupal/Core/Entity/Query/QueryBase.php index ff564b8..4e9b8ec 100644 --- a/core/lib/Drupal/Core/Entity/Query/QueryBase.php +++ b/core/lib/Drupal/Core/Entity/Query/QueryBase.php @@ -192,8 +192,10 @@ public function range($start = NULL, $length = NULL) { * @return \Drupal\Core\Entity\Query\ConditionInterface * An object holding a group of conditions. */ - protected function conditionGroupFactory($conjunction = 'AND') { - $class = self::getClass($this->namespaces, 'Condition'); + final protected function conditionGroupFactory($conjunction = 'AND') { + // As the factory classes hardwire QueryBase::getClass, it needs to be + // hardwired here too. + $class = QueryBase::getClass($this->namespaces, 'Condition'); return new $class($conjunction, $this, $this->namespaces); }