Problem/Motivation

$this->assertTrue($output instanceof MarkupInterface || is_string($output), new FormattableMarkup('\Drupal::theme() returns an object that implements MarkupInterface or a string for data type @type.', ['@type' => $type]));

Proposed resolution

Refactor the test to test independently the string and the MarkupInterface cases.

Remaining tasks

Discuss
Review patch

User interface changes

API changes

Data model changes

Release notes snippet

CommentFileSizeAuthor
#19 interdiff-16-19.txt2.55 KBhardik_patel_12
#19 3155495-19.patch2.13 KBhardik_patel_12
#18 3155495-18.patch2.37 KBhardik_patel_12
#18 interdiff-16-18.txt2.1 KBhardik_patel_12
#16 3155495-16.patch3.11 KBnikhil_110
#15 3155495-nr-bot.txt143 bytesneeds-review-queue-bot
#9 3155495-9.patch2.37 KBmondrake
#7 interdiff_06-07.txt981 byteskunalgautam
#7 remove_redundant_message-3155495-07.patch1.07 KBkunalgautam
#6 3155495-6.patch1.26 KBLal_
#4 interdiff.txt1.06 KBLal_
#4 3155495-4.patch1.26 KBLal_
#2 3155495-2.patch1.02 KBhardik_patel_12

Issue fork drupal-3155495

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

Hardik_Patel_12 created an issue. See original summary.

hardik_patel_12’s picture

hardik_patel_12 commented
Status: Active » Needs review
StatusFileSize
new 3155495-2.patch1.02 KB

Kindly review the patch.

Status: Needs review » Needs work

The last submitted patch, 2: 3155495-2.patch, failed testing. View results
- codesniffer_fixes.patch Interdiff of automated coding standards fixes only.

Lal_’s picture

Lal_
He\Him
commented
Status: Needs work » Needs review
StatusFileSize
new 3155495-4.patch1.26 KB
new interdiff.txt1.06 KB

Putting them inside the condition..

Status: Needs review » Needs work

The last submitted patch, 4: 3155495-4.patch, failed testing. View results

Lal_’s picture

Lal_
He\Him
commented
StatusFileSize
new 3155495-6.patch1.26 KB
kunalgautam’s picture

kunalgautam commented
StatusFileSize
new remove_redundant_message-3155495-07.patch1.07 KB
new interdiff_06-07.txt981 bytes
s_bhandari’s picture

s_bhandari commented
Status: Needs work » Needs review
mondrake’s picture

mondrake
Location 🇮🇹
commented
Title: Remove redundant $message from assert(Not)InstanceOf calls » Refactor system/Kernel/Theme/ThemeTest::testThemeDataTypes
Issue summary: View changes
StatusFileSize
new 3155495-9.patch2.37 KB

Umm I'm afraid #7 is not really touching the point:

  1. +++ b/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
@@ -58,8 +58,9 @@ public function testThemeDataTypes() {
+      $this->assertIsString((string) $output);

    this is always true 

  2. +++ b/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
@@ -58,8 +58,9 @@ public function testThemeDataTypes() {
+        $this->assertInstanceOf(MarkupInterface::class, $output);

    this is irrelevant since it's in an if {} block that is executed only if $output is an instance of MarkupInterface...

We now have a MarkupInterfaceComparator that can seamlessly compare strings and MarkupInterface objects through assertEquals, so we can just forget about the casting.

But, I think in this test we want to really assert that when the theme returns an empty string, the renderer returns a string as well. So let's refactor the test to make that explicit.

Not interdiff, it's a new patch.

Version: 9.1.x-dev » 9.2.x-dev

Drupal 9.1.0-alpha1 will be released the week of October 19, 2020, which means new developments and disruptive changes should now be targeted for the 9.2.x-dev branch. For more information see the Drupal 9 minor version schedule and the Allowed changes during the Drupal 9 release cycle.

Version: 9.2.x-dev » 9.3.x-dev

Drupal 9.2.0-alpha1 will be released the week of May 3, 2021, which means new developments and disruptive changes should now be targeted for the 9.3.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.3.x-dev » 9.4.x-dev

Drupal 9.3.0-rc1 was released on November 26, 2021, which means new developments and disruptive changes should now be targeted for the 9.4.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.4.x-dev » 9.5.x-dev

Drupal 9.4.0-alpha1 was released on May 6, 2022, which means new developments and disruptive changes should now be targeted for the 9.5.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.5.x-dev » 10.1.x-dev

Drupal 9.5.0-beta2 and Drupal 10.0.0-beta2 were released on September 29, 2022, which means new developments and disruptive changes should now be targeted for the 10.1.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

needs-review-queue-bot’s picture

needs-review-queue-bot commented
Status: Needs review » Needs work
StatusFileSize
new 3155495-nr-bot.txt143 bytes

The Needs Review Queue Bot tested this issue. It either no longer applies to Drupal core, or fails the Drupal core commit checks. Therefore, this issue status is now "Needs work".

Apart from a re-roll or rebase, this issue may need more work to address feedback in the issue or MR comments. To progress an issue, incorporate this feedback as part of the process of updating the issue. This helps other contributors to know what is outstanding.

Consult the Drupal Contributor Guide to find step-by-step guides for working with issues.

nikhil_110’s picture

nikhil_110 commented
StatusFileSize
new 3155495-16.patch3.11 KB

Attached patch against Drupal 10.1.x

Version: 10.1.x-dev » 11.x-dev

Drupal core is moving towards using a “main” branch. As an interim step, a new 11.x branch has been opened, as Drupal.org infrastructure cannot currently fully support a branch named main. New developments and disruptive changes should now be targeted for the 11.x branch, which currently accepts only minor-version allowed changes. For more information, see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

hardik_patel_12’s picture

hardik_patel_12 commented
Status: Needs work » Needs review
StatusFileSize
new interdiff-16-18.txt2.1 KB
new 3155495-18.patch2.37 KB

Attached patch against Drupal 11.x

hardik_patel_12’s picture

hardik_patel_12 commented
StatusFileSize
new 3155495-19.patch2.13 KB
new interdiff-16-19.txt2.55 KB

Rerolling patch against Drupal 11.x and adding interdiff.

Hardik_Patel_12 opened merge request !6060

smustgrave’s picture

smustgrave commented
Status: Needs review » Reviewed & tested by the community
Issue tags: +Needs Review Queue Initiative

Breaking apart the test seems fine. Not coverage lost.

quietone’s picture

quietone commented
Status: Reviewed & tested by the community » Needs work

@mondrake, thanks for the explanation given in #9. That made this much easier to review.

I think a comment can be improved but it would be fine to add this. However, according to GitLab this can be merged but the diff does not apply to HEAD. Not sure why that is. So, since this needs work I added a suggestion for the comment.

Version: 11.x-dev » main

Drupal core is now using the main branch as the primary development branch. New developments and disruptive changes should now be targeted to the main branch.

Read more in the announcement.