From 21574f831d23b83118da778a374e3750271b15c7 Mon Sep 17 00:00:00 2001 From: manumanu Date: Wed, 25 May 2016 09:40:52 +0200 Subject: [PATCH] Replaces \Drupal\Core\Logger\LoggerChannelInterface with \Psr\Log\LoggerInterface. --- search_api_db/src/Plugin/search_api/backend/Database.php | 12 ++++++------ src/Plugin/search_api/processor/ContentAccess.php | 12 ++++++------ src/Plugin/views/row/SearchApiRow.php | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/search_api_db/src/Plugin/search_api/backend/Database.php b/search_api_db/src/Plugin/search_api/backend/Database.php index 0f8fb68..35a3449 100644 --- a/search_api_db/src/Plugin/search_api/backend/Database.php +++ b/search_api_db/src/Plugin/search_api/backend/Database.php @@ -13,7 +13,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\KeyValueStore\KeyValueStoreInterface; -use Drupal\Core\Logger\LoggerChannelInterface; +use Psr\Log\LoggerInterface; use Drupal\Core\Logger\RfcLogLevel; use Drupal\Core\Render\Element; use Drupal\search_api\Backend\BackendPluginBase; @@ -89,7 +89,7 @@ class Database extends BackendPluginBase { /** * The logger to use for logging messages. * - * @var \Drupal\Core\Logger\LoggerChannelInterface|null + * @var \Psr\Log\LoggerInterface|null */ protected $logger; @@ -167,7 +167,7 @@ public static function create(ContainerInterface $container, array $configuratio $data_type_plugin_manager = $container->get('plugin.manager.search_api.data_type'); $backend->setDataTypePluginManager($data_type_plugin_manager); - /** @var \Drupal\Core\Logger\LoggerChannelInterface $logger */ + /** @var \Psr\Log\LoggerInterface $logger */ $logger = $container->get('logger.factory')->get('search_api_db'); $backend->setLogger($logger); @@ -275,7 +275,7 @@ public function setDataTypePluginManager(DataTypePluginManager $data_type_plugin /** * Retrieves the logger to use. * - * @return \Drupal\Core\Logger\LoggerChannelInterface + * @return \Psr\Log\LoggerInterface * The logger to use. */ public function getLogger() { @@ -285,12 +285,12 @@ public function getLogger() { /** * Sets the logger to use. * - * @param \Drupal\Core\Logger\LoggerChannelInterface $logger + * @param \Psr\Log\LoggerInterface $logger * The logger to use. * * @return $this */ - public function setLogger(LoggerChannelInterface $logger) { + public function setLogger(LoggerInterface $logger) { $this->logger = $logger; return $this; } diff --git a/src/Plugin/search_api/processor/ContentAccess.php b/src/Plugin/search_api/processor/ContentAccess.php index ba74dd3..7931134 100644 --- a/src/Plugin/search_api/processor/ContentAccess.php +++ b/src/Plugin/search_api/processor/ContentAccess.php @@ -4,7 +4,7 @@ use Drupal\comment\CommentInterface; use Drupal\Core\Database\Database; -use Drupal\Core\Logger\LoggerChannelInterface; +use Psr\Log\LoggerInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\AnonymousUserSession; use Drupal\Core\TypedData\ComplexDataInterface; @@ -37,7 +37,7 @@ class ContentAccess extends ProcessorPluginBase { /** * The logger to use for logging messages. * - * @var \Drupal\Core\Logger\LoggerChannelInterface|null + * @var \Psr\Log\LoggerInterface|null */ protected $logger; @@ -48,7 +48,7 @@ public static function create(ContainerInterface $container, array $configuratio /** @var static $processor */ $processor = parent::create($container, $configuration, $plugin_id, $plugin_definition); - /** @var \Drupal\Core\Logger\LoggerChannelInterface $logger */ + /** @var \Psr\Log\LoggerInterface $logger */ $logger = $container->get('logger.factory')->get('search_api'); $processor->setLogger($logger); @@ -58,7 +58,7 @@ public static function create(ContainerInterface $container, array $configuratio /** * Retrieves the logger to use. * - * @return \Drupal\Core\Logger\LoggerChannelInterface + * @return \Psr\Log\LoggerInterface * The logger to use. */ public function getLogger() { @@ -68,10 +68,10 @@ public function getLogger() { /** * Sets the logger to use. * - * @param \Drupal\Core\Logger\LoggerChannelInterface $logger + * @param \Psr\Log\LoggerInterface $logger * The logger to use. */ - public function setLogger(LoggerChannelInterface $logger) { + public function setLogger(LoggerInterface $logger) { $this->logger = $logger; } diff --git a/src/Plugin/views/row/SearchApiRow.php b/src/Plugin/views/row/SearchApiRow.php index 384fc34..7d7c9ef 100644 --- a/src/Plugin/views/row/SearchApiRow.php +++ b/src/Plugin/views/row/SearchApiRow.php @@ -5,7 +5,7 @@ use Drupal\Component\Render\FormattableMarkup; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Logger\LoggerChannelInterface; +use Psr\Log\LoggerInterface; use Drupal\Core\TypedData\ComplexDataInterface; use Drupal\search_api\Plugin\views\query\SearchApiQuery; use Drupal\search_api\SearchApiException; @@ -45,7 +45,7 @@ class SearchApiRow extends RowPluginBase { /** * The logger to use for logging messages. * - * @var \Drupal\Core\Logger\LoggerChannelInterface|null + * @var \Psr\Log\LoggerInterface|null */ // @todo Make this into a trait, with an additional logException() method. protected $logger; @@ -61,7 +61,7 @@ public static function create(ContainerInterface $container, array $configuratio $entity_type_manager = $container->get('entity_type.manager'); $row->setEntityTypeManager($entity_type_manager); - /** @var \Drupal\Core\Logger\LoggerChannelInterface $logger */ + /** @var \Psr\Log\LoggerInterface $logger */ $logger = $container->get('logger.factory')->get('search_api'); $row->setLogger($logger); @@ -94,7 +94,7 @@ public function setEntityTypeManager(EntityTypeManagerInterface $entity_type_man /** * Retrieves the logger to use. * - * @return \Drupal\Core\Logger\LoggerChannelInterface + * @return \Psr\Log\LoggerInterface * The logger to use. */ public function getLogger() { @@ -104,10 +104,10 @@ public function getLogger() { /** * Sets the logger to use. * - * @param \Drupal\Core\Logger\LoggerChannelInterface $logger + * @param \Psr\Log\LoggerInterface $logger * The logger to use. */ - public function setLogger(LoggerChannelInterface $logger) { + public function setLogger(LoggerInterface $logger) { $this->logger = $logger; } -- 2.8.2