Fixed tests

Author: drpayyne

tests/Unit/Console/Command/CompareSourceCommandTest/AbstractHtmlTestCaseForHtml.php

@@ -5,6 +5,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\SemanticVersionChecker\Test\Unit\Console\Command\CompareSourceCommandTest;
 
 use DOMDocument;
@@ -33,13 +35,13 @@ abstract class AbstractHtmlTestCaseForHtml extends TestCase
      */
     protected $svcLogPath;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = new CompareSourceCommand();
         $this->svcLogPath = TESTS_TEMP_DIR . '/svc-' . time() . '.html';
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         unlink($this->svcLogPath);
@@ -82,7 +84,7 @@ protected function doTestExecute(
             foreach ($expectedHtmlEntries as $expectedHtmlEntry) {
                 $this->assertHtml($expectedHtmlEntry->xpath, $expectedHtmlEntry->pattern, $svcDom);
             }
-            $this->assertContains($expectedOutput, $commandTester->getDisplay());
+            $this->assertStringContainsString($expectedOutput, $commandTester->getDisplay());
             $this->assertEquals($expectedStatusCode, $commandTester->getStatusCode());
         } catch (Exception $e) {
             if ($shouldSkipTest) {
@@ -137,11 +139,11 @@ public static function assertHtml($xpathQuery, $regex, DOMDocument $docDom)
             }
             if ($regex) {
                 $body = $docDom->saveHTML($nodeList->item(0));
-                static::assertRegExp($regex, $body);
+                static::assertMatchesRegularExpression($regex, $body);
             }
         } else {
             $body = $docXpath->document->saveHTML();
-            static::assertRegExp($regex, $body);
+            static::assertMatchesRegularExpression($regex, $body);
         }
     }
 

tests/Unit/Console/Command/CompareSourceCommandTest/AbstractTestCase.php

@@ -5,6 +5,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\SemanticVersionChecker\Test\Unit\Console\Command\CompareSourceCommandTest;
 
 use Magento\SemanticVersionChecker\Console\Command\CompareSourceCommand;
@@ -27,13 +29,13 @@ abstract class AbstractTestCase extends TestCase
      */
     protected $svcLogPath;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = new CompareSourceCommand();
         $this->svcLogPath = TESTS_TEMP_DIR . '/svc-' . time() . '.log';
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         unlink($this->svcLogPath);
@@ -66,20 +68,20 @@ protected function doTestExecute(
         $preparedSvcLogContents = preg_replace('/\s+/', '', $actualSvcLogContents);
 
         foreach ($expectedLogEntries as $expectedLogEntry) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 preg_replace('/\s+/', '', $expectedLogEntry),
                 $preparedSvcLogContents,
                 'Failed asserting that "' . $actualSvcLogContents . '" contains "' . $expectedLogEntry . '"'
             );
         }
         foreach ($unexpectedLogEntries as $unexpectedLogEntry) {
-            $this->assertNotContains(
+            $this->assertStringNotContainsString(
                 preg_replace('/\s+/', '', $unexpectedLogEntry),
                 $preparedSvcLogContents,
                 'Failed asserting that "' . $actualSvcLogContents . '" doesn\'t contain "' . $unexpectedLogEntry . '"'
             );
         }
-        $this->assertContains($expectedOutput, $commandTester->getDisplay());
+        $this->assertStringContainsString($expectedOutput, $commandTester->getDisplay());
         $this->assertEquals(0, $commandTester->getStatusCode());
     }
 

tests/Unit/Console/Command/CompareSourceCommandTest/AbstractTestCaseWithRegExp.php

@@ -5,6 +5,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\SemanticVersionChecker\Test\Unit\Console\Command\CompareSourceCommandTest;
 
 use Exception;
@@ -28,13 +30,13 @@ abstract class AbstractTestCaseWithRegExp extends TestCase
      */
     protected $svcLogPath;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = new CompareSourceCommand();
         $this->svcLogPath = TESTS_TEMP_DIR . '/svc-' . time() . '.log';
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         unlink($this->svcLogPath);
@@ -67,9 +69,9 @@ protected function doTestExecute(
             $actualSvcLogContents = $this->getActualSvcLogContents();
 
             foreach ($expectedLogEntries as $expectedLogEntry) {
-                $this->assertRegExp($expectedLogEntry, $actualSvcLogContents);
+                $this->assertMatchesRegularExpression($expectedLogEntry, $actualSvcLogContents);
             }
-            $this->assertContains($expectedOutput, $commandTester->getDisplay());
+            $this->assertStringContainsString($expectedOutput, $commandTester->getDisplay());
             $this->assertEquals(0, $commandTester->getStatusCode());
         } catch (Exception $e) {
             if ($shouldSkipTest) {

tests/Unit/Helper/ClassParserTest.php

@@ -32,7 +32,7 @@ public function testImplementsAlias()
         $parser = new ClassParser($path);
         $result = $parser->getImplementedInterfacesNames();
         $this->assertCount(1, $result);
-        $this->assertArraySubset(['Test\VcsA\A\InterfaceA'], $parser->getImplementedInterfacesNames());
+        $this->assertContains('Test\VcsA\A\InterfaceA', $parser->getImplementedInterfacesNames());
     }
 
     public function testImplementsFull()
@@ -41,6 +41,6 @@ public function testImplementsFull()
         $parser = new ClassParser($path);
         $result = $parser->getImplementedInterfacesNames();
         $this->assertCount(1, $result);
-        $this->assertArraySubset(['Test\VcsA\A\InterfaceA'], $parser->getImplementedInterfacesNames());
+        $this->assertContains('Test\VcsA\A\InterfaceA', $parser->getImplementedInterfacesNames());
     }
 }