Change the test

Tests/Utils/MessageHelper/HasNewLineSupportTest.php

@@ -54,16 +54,29 @@ class HasNewLineSupportTest extends UtilityMethodTestCase
      */
     public function testHasNewLineSupport()
     {
-        if (\version_compare(Helper::getVersion(), '3.0.0', '<') === true) {
-            $this->markTestSkipped('PHPCS 2.x: skipping test as new line support won\'t be available anyway.');
+        $result = MessageHelper::hasNewLineSupport();
+
+        if (method_exists($this, 'assertIsBool') === true) {
+            // PHPUnit >= 7.5.
+            $this->assertIsBool($result);
+        } else {
+            // PHPUnit < 7.5.
+            $this->assertInternalType('bool', $result);
+        }
+
+        if ($result === false) {
+            return;
         }
 
+        /*
+         * Test the actual message returned for PHPCS versions which have proper new line support.
+         */
+
         /*
          * Set up the expected output.
          * phpcs:disable Generic.Files.LineLength.TooLong
          */
-        if (MessageHelper::hasNewLineSupport() === true) {
-            $expected = <<<'EOD'
+        $expected = <<<'EOD'
 ------------------------------------------------------------------------------------------------------------------------
 FOUND 1 ERROR AFFECTING 1 LINE
 ------------------------------------------------------------------------------------------------------------------------
@@ -81,36 +94,8 @@ public function testHasNewLineSupport()
 ------------------------------------------------------------------------------------------------------------------------
 EOD;
 
-            // Make sure space on empty line is included (often removed by file editor).
-            $expected = \str_replace("|\n", "| \n", $expected);
-        } else {
-            $expected = <<<'EOD'
-------------------------------------------------------------------------------------------------------------------------
-FOUND 1 ERROR AFFECTING 1 LINE
-------------------------------------------------------------------------------------------------------------------------
- 4 | ERROR | Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-   |       | Aenean felis urna, dictum vitae
-   |       | lobortis vitae, maximus nec enim. Etiam euismod placerat efficitur. Nulla eu felis ipsum.
-   |       |
-   |       | Cras vitae ultrices turpis. Ut consectetur ligula in justo tincidunt mattis.
-   |       |
-   |       |
-   |       | Aliquam fermentum magna id venenatis placerat. Curabitur lobortis nulla sit amet consequat fermentum.
-   |       | Aenean malesuada tristique aliquam. Donec eget placerat nisl.
-   |       |
-   |       | Morbi mollis,
-   |       | risus vel venenatis accumsan, urna dolor faucibus risus, ut congue purus augue vel ipsum.
-   |       |
-   |       | Curabitur nec dolor est. Suspendisse nec quam non ligula aliquam tempus. Donec laoreet maximus leo, in
-   |       | eleifend odio interdum vitae.
-------------------------------------------------------------------------------------------------------------------------
-EOD;
-
-            // Make sure space on select empty lines is included (often removed by file editor).
-            $expected = \str_replace("mattis.\n   |       |\n", "mattis.\n   |       | \n", $expected);
-            $expected = \str_replace("nisl.\n   |       |\n", "nisl.\n   |       | \n", $expected);
-        }
-        // phpcs:enable
+        // Make sure space on empty line is included (often removed by file editor).
+        $expected = \str_replace("|\n", "| \n", $expected);
 
         $this->expectOutputString($expected);
         $this->setOutputCallback([$this, 'normalizeOutput']);