From 14ea687e8a44d275b6a51334c949232592285050 Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Wed, 2 Jul 2014 13:11:57 -0700
Subject: [PATCH] Issue #2286433 by ParisLiakos: Fixed CommentTypeForm and
CommentTypeDeleteForm should typehint the PSR logger interface.
---
core/modules/comment/src/CommentTypeForm.php | 12 ++++++------
.../comment/src/Form/CommentTypeDeleteForm.php | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/core/modules/comment/src/CommentTypeForm.php b/core/modules/comment/src/CommentTypeForm.php
index 1ca8165e2e7c..43367a57928c 100644
--- a/core/modules/comment/src/CommentTypeForm.php
+++ b/core/modules/comment/src/CommentTypeForm.php
@@ -10,7 +10,7 @@
use Drupal\Core\Entity\EntityForm;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Logger\LoggerChannelInterface;
+use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -26,9 +26,9 @@ class CommentTypeForm extends EntityForm {
protected $entityManager;
/**
- * Logger Channel service.
+ * A logger instance.
*
- * @var \Drupal\Core\Logger\LoggerChannelInterface
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -47,10 +47,10 @@ public static function create(ContainerInterface $container) {
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager service.
- * @param \Drupal\Core\Logger\LoggerChannelInterface
- * The logger channel.
+ * @param \Psr\Log\LoggerInterface $logger
+ * A logger instance.
*/
- function __construct(EntityManagerInterface $entity_manager, LoggerChannelInterface $logger) {
+ public function __construct(EntityManagerInterface $entity_manager, LoggerInterface $logger) {
$this->entityManager = $entity_manager;
$this->logger = $logger;
}
diff --git a/core/modules/comment/src/Form/CommentTypeDeleteForm.php b/core/modules/comment/src/Form/CommentTypeDeleteForm.php
index 9c32d2f9f636..d653e5661a8b 100644
--- a/core/modules/comment/src/Form/CommentTypeDeleteForm.php
+++ b/core/modules/comment/src/Form/CommentTypeDeleteForm.php
@@ -11,9 +11,9 @@
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Entity\Query\QueryFactory;
-use Drupal\Core\Logger\LoggerChannelInterface;
use Drupal\Core\Url;
use Drupal\field\Entity\FieldConfig;
+use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -43,9 +43,9 @@ class CommentTypeDeleteForm extends EntityConfirmFormBase {
protected $entityManager;
/**
- * The comment channel logger.
+ * A logger instance.
*
- * @var \Drupal\Core\Logger\LoggerChannelInterface
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -65,10 +65,10 @@ class CommentTypeDeleteForm extends EntityConfirmFormBase {
* The comment manager service.
* @param \Drupal\Core\Entity\EntityManager $entity_manager
* The entity manager service.
- * @param \Drupal\Core\Logger\LoggerChannelInterface $logger
- * The logger channel.
+ * @param \Psr\Log\LoggerInterface $logger
+ * A logger instance.
*/
- public function __construct(QueryFactory $query_factory, CommentManagerInterface $comment_manager, EntityManager $entity_manager, LoggerChannelInterface $logger) {
+ public function __construct(QueryFactory $query_factory, CommentManagerInterface $comment_manager, EntityManager $entity_manager, LoggerInterface $logger) {
$this->queryFactory = $query_factory;
$this->commentManager = $comment_manager;
$this->entityManager = $entity_manager;
--
GitLab