Issue #3469824 by catch, smustgrave: CommentTestBase/CommentTestTrait methods should be protected

(cherry picked from commit 5d987941)

core/modules/comment/src/Tests/CommentTestTrait.php

@@ -33,7 +33,7 @@ trait CommentTestTrait {
    *   (optional) The comment view mode to be used in comment field formatter.
    *   Defaults to 'full'.
    */
-  public function addDefaultCommentField($entity_type, $bundle, $field_name = 'comment', $default_value = CommentItemInterface::OPEN, $comment_type_id = 'comment', $comment_view_mode = 'full') {
+  protected function addDefaultCommentField($entity_type, $bundle, $field_name = 'comment', $default_value = CommentItemInterface::OPEN, $comment_type_id = 'comment', $comment_view_mode = 'full') {
     $entity_type_manager = \Drupal::entityTypeManager();
     $entity_display_repository = \Drupal::service('entity_display.repository');
     /** @var \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager */

core/modules/comment/tests/src/Functional/CommentTestBase.php

@@ -120,7 +120,7 @@ protected function setUp(): void {
    * @return \Drupal\comment\CommentInterface|null
    *   The posted comment or NULL when posted comment was not found.
    */
-  public function postComment($entity, $comment, $subject = '', $contact = NULL, $field_name = 'comment') {
+  protected function postComment($entity, $comment, $subject = '', $contact = NULL, $field_name = 'comment') {
     $edit = [];
     $edit['comment_body[0][value]'] = $comment;
 
@@ -201,7 +201,7 @@ public function postComment($entity, $comment, $subject = '', $contact = NULL, $
    * @return bool
    *   Boolean indicating whether the comment was found.
    */
-  public function commentExists(?CommentInterface $comment = NULL, $reply = FALSE) {
+  protected function commentExists(?CommentInterface $comment = NULL, $reply = FALSE) {
     if ($comment) {
       $comment_element = $this->cssSelect(($reply ? '.indented ' : '') . 'article#comment-' . $comment->id());
       if (empty($comment_element)) {
@@ -231,7 +231,7 @@ public function commentExists(?CommentInterface $comment = NULL, $reply = FALSE)
    * @param \Drupal\comment\CommentInterface $comment
    *   Comment to delete.
    */
-  public function deleteComment(CommentInterface $comment) {
+  protected function deleteComment(CommentInterface $comment) {
     $this->drupalGet('comment/' . $comment->id() . '/delete');
     $this->submitForm([], 'Delete');
     $this->assertSession()->pageTextContains('The comment and all its replies have been deleted.');
@@ -243,7 +243,7 @@ public function deleteComment(CommentInterface $comment) {
    * @param bool $enabled
    *   Boolean specifying whether the subject field should be enabled.
    */
-  public function setCommentSubject($enabled) {
+  protected function setCommentSubject($enabled) {
     $form_display = $this->container->get('entity_display.repository')
       ->getFormDisplay('comment', 'comment');
 
@@ -267,7 +267,7 @@ public function setCommentSubject($enabled) {
    *   (optional) Field name through which the comment should be posted.
    *   Defaults to 'comment'.
    */
-  public function setCommentPreview($mode, $field_name = 'comment') {
+  protected function setCommentPreview($mode, $field_name = 'comment') {
     switch ($mode) {
       case DRUPAL_DISABLED:
         $mode_text = 'disabled';
@@ -294,7 +294,7 @@ public function setCommentPreview($mode, $field_name = 'comment') {
    *   (optional) Field name through which the comment should be posted.
    *   Defaults to 'comment'.
    */
-  public function setCommentForm($enabled, $field_name = 'comment') {
+  protected function setCommentForm($enabled, $field_name = 'comment') {
     $this->setCommentSettings('form_location', ($enabled ? CommentItemInterface::FORM_BELOW : CommentItemInterface::FORM_SEPARATE_PAGE), 'Comment controls ' . ($enabled ? 'enabled' : 'disabled') . '.', $field_name);
   }
 
@@ -307,7 +307,7 @@ public function setCommentForm($enabled, $field_name = 'comment') {
    *   - 1: Contact information allowed but not required.
    *   - 2: Contact information required.
    */
-  public function setCommentAnonymous($level) {
+  protected function setCommentAnonymous($level) {
     $this->setCommentSettings('anonymous', $level, new FormattableMarkup('Anonymous commenting set to level @level.', ['@level' => $level]));
   }
 
@@ -320,7 +320,7 @@ public function setCommentAnonymous($level) {
    *   (optional) Field name through which the comment should be posted.
    *   Defaults to 'comment'.
    */
-  public function setCommentsPerPage($number, $field_name = 'comment') {
+  protected function setCommentsPerPage($number, $field_name = 'comment') {
     $this->setCommentSettings('per_page', $number, new FormattableMarkup('Number of comments per page set to @number.', ['@number' => $number]), $field_name);
   }
 
@@ -337,7 +337,7 @@ public function setCommentsPerPage($number, $field_name = 'comment') {
    *   (optional) Field name through which the comment should be posted.
    *   Defaults to 'comment'.
    */
-  public function setCommentSettings($name, $value, $message, $field_name = 'comment') {
+  protected function setCommentSettings($name, $value, $message, $field_name = 'comment') {
     $field = FieldConfig::loadByName('node', 'article', $field_name);
     $field->setSetting($name, $value);
     $field->save();
@@ -349,7 +349,7 @@ public function setCommentSettings($name, $value, $message, $field_name = 'comme
    * @return bool
    *   Contact info is available.
    */
-  public function commentContactInfoAvailable() {
+  protected function commentContactInfoAvailable() {
     return (bool) preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->getSession()->getPage()->getContent());
   }
 
@@ -363,7 +363,7 @@ public function commentContactInfoAvailable() {
    * @param bool $approval
    *   Operation is found on approval page.
    */
-  public function performCommentOperation(CommentInterface $comment, $operation, $approval = FALSE) {
+  protected function performCommentOperation(CommentInterface $comment, $operation, $approval = FALSE) {
     $edit = [];
     $edit['operation'] = $operation;
     $edit['comments[' . $comment->id() . ']'] = TRUE;
@@ -388,7 +388,7 @@ public function performCommentOperation(CommentInterface $comment, $operation, $
    * @return int
    *   Comment id.
    */
-  public function getUnapprovedComment($subject) {
+  protected function getUnapprovedComment($subject) {
     $this->drupalGet('admin/content/comment/approval');
     preg_match('/href="(.*?)#comment-([^"]+)"(.*?)>(' . $subject . ')/', $this->getSession()->getPage()->getContent(), $match);