Upgrade to PhpUnit 10.x and code clean up.

PhpPlaisio · Dec 4, 2023 · 045bd81 · 045bd81
1 parent b815ce3
commit 045bd81
Show file tree

Hide file tree

Showing 51 changed files with 220 additions and 215 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
 /.idea/
-/.phpunit.result.cache
+/.phpunit.cache/
 /bin/
 /composer.lock
-/custom.task.properties
-/custom.type.properties
 /doc/
 /node_modules/
 /package-lock.json

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
   "require-dev": {
     "ext-dom": "*",
     "phing/phing": "^3.0.0-RC4",
-    "phpunit/phpunit": "^9.6.3",
+    "phpunit/phpunit": "^10.5.1",
     "plaisio/console-kernel": "^1.0.1",
     "plaisio/console-type-script": "^1.0.0",
     "plaisio/request-core": "^0.13.0"

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-        <exclude>
-            <directory suffix=".php">vendor/setbased</directory>
-        </exclude>
-        <report>
-            <clover outputFile="test/coverage.xml"/>
-            <html outputDirectory="test/report"/>
-        </report>
-    </coverage>
-    <testsuites>
-        <testsuite name="Tests">
-            <directory>test</directory>
-        </testsuite>
-    </testsuites>
-    <logging/>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
+    <report>
+      <clover outputFile="test/coverage.xml"/>
+      <html outputDirectory="test/report"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Tests">
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">vendor/setbased</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/src/Validator/HttpValidator.php b/src/Validator/HttpValidator.php
@@ -59,7 +59,7 @@ public function validate(Control $control): bool
     // Test that the page actually exits. We consider all HTTP 200-399 responses as valid.
     try
     {
-      $headers = get_headers($url);
+      $headers = @get_headers($url);
       $valid   = (is_array($headers) && preg_match('/^HTTP\\/\\d+\\.\\d+\\s+[23]\\d\\d\\s*.*$/', $headers[0]));
     }
     catch (\Exception $e)

diff --git a/test/Cleaner/AmbiguityCleanerTest.php b/test/Cleaner/AmbiguityCleanerTest.php
@@ -87,7 +87,7 @@ public function testValidUtf8Ambiguities(): void
     $property->setAccessible(true);
     $unambiguities = $property->getValue($cleaner);
 
-    foreach ($unambiguities as $unambiguity => $ambiguities)
+    foreach ($unambiguities as $ambiguities)
     {
       foreach ($ambiguities as $ambiguity)
       {

diff --git a/test/Cleaner/IntegerCleanerTest.php b/test/Cleaner/IntegerCleanerTest.php
@@ -17,7 +17,7 @@ class IntegerCleanerTest extends TestCase
    *
    * @return string[][]
    */
-  public function getCases(): array
+  public static function getCases(): array
   {
     return [[null, null],
             ['', null],
@@ -35,10 +35,10 @@ public function getCases(): array
    *
    * @return array
    */
-  public function getNonStrings(): array
+  public static function getNonStrings(): array
   {
     return [[[]],
-            [$this],
+            [new \stdClass()],
             [fopen('php://stdin', 'r')]];
   }
 
@@ -51,7 +51,7 @@ public function getNonStrings(): array
    *
    * @dataProvider getCases
    */
-  public function testClean($value, $expected): void
+  public function testClean(mixed $value, mixed $expected): void
   {
     $cleaner = IntegerCleaner::get();
 
@@ -67,7 +67,7 @@ public function testClean($value, $expected): void
    *
    * @dataProvider getNonStrings
    */
-  public function testNonString($value): void
+  public function testNonString(mixed $value): void
   {
     $this->expectException(\LogicException::class);
 

diff --git a/test/Cleaner/PruneWhitespaceCleanerTest.php b/test/Cleaner/PruneWhitespaceCleanerTest.php
@@ -15,6 +15,17 @@ class PruneWhitespaceCleanerTest extends PlaisioTestCase
   //--------------------------------------------------------------------------------------------------------------------
   use StringCleaner;
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Returns cases with spaces only.
+   *
+   * @return array
+   */
+  public static function whitespaceOnly(): array
+  {
+    return [[''], [null], [' '], ['  '], ["\n"], ["\n \n"], ["\n \t"], [" \t\n\r\0\x0B \t\n\r\0\x0B"]];
+  }
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Returns an instance of PruneWhitespaceCleaner.
@@ -39,6 +50,7 @@ public function testClean(): void
     self::assertEquals('Hello World!', $value);
   }
 
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Test with ambiguous whitespaceOnly only.
@@ -52,7 +64,6 @@ public function testEmpty(): void
     self::assertNull($value);
   }
 
-
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Tests whitespaces only.
@@ -69,17 +80,6 @@ public function testWhitSpaceOnly(?string $string): void
     self::assertNull($clean);
   }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns cases with with spaces only.
-   *
-   * @return array
-   */
-  public function whitespaceOnly(): array
-  {
-    return [[''], [null], [' '], ['  '], ["\n"], ["\n \n"], ["\n \t"], [" \t\n\r\0\x0B \t\n\r\0\x0B"]];
-  }
-
   //--------------------------------------------------------------------------------------------------------------------
 }
 

diff --git a/test/Cleaner/RemoveWhitespaceCleanerTest.php b/test/Cleaner/RemoveWhitespaceCleanerTest.php
@@ -16,6 +16,17 @@ class RemoveWhitespaceCleanerTest extends PlaisioTestCase
   //--------------------------------------------------------------------------------------------------------------------
   use StringCleaner;
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Returns cases with spaces only.
+   *
+   * @return array
+   */
+  public static function whitespaceOnly(): array
+  {
+    return [[''], [null], [' '], ['  '], ["\n"], ["\n \n"], ["\n \t"], [" \t\n\r\0\x0B \t\n\r\0\x0B"]];
+  }
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Returns an instance of RemoveWhitespaceCleaner.
@@ -56,17 +67,6 @@ public function testWhitSpaceOnly(?string $string): void
     self::assertNull($clean);
   }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns cases with with spaces only.
-   *
-   * @return array
-   */
-  public function whitespaceOnly(): array
-  {
-    return [[''], [null], [' '], ['  '], ["\n"], ["\n \n"], ["\n \t"], [" \t\n\r\0\x0B \t\n\r\0\x0B"]];
-  }
-
   //--------------------------------------------------------------------------------------------------------------------
 }
 

diff --git a/test/Cleaner/TidyCleanerTest.php b/test/Cleaner/TidyCleanerTest.php
@@ -17,27 +17,27 @@ class TidyCleanerTest extends PlaisioTestCase
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Returns an instance of TidyCleaner.
+   * Return HTML snippet test cases.
    *
-   * @return TidyCleaner
+   * @return string[][]
    */
-  public function createCleaner(): TidyCleaner
+  public static function snippets(): array
   {
-    return TidyCleaner::get();
+    return [['<h2>subheading</h3>', '<h2>subheading</h2>'],
+            ['<h1>heading', '<h1>heading</h1>'],
+            ['<br>', '<br />'],
+            ['<p>&nbsp;</p>', null]];
   }
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Return HTML snippet test cases.
+   * Returns an instance of TidyCleaner.
    *
-   * @return string[][]
+   * @return TidyCleaner
    */
-  public function snippets(): array
+  public function createCleaner(): TidyCleaner
   {
-    return [['<h2>subheading</h3>', '<h2>subheading</h2>'],
-            ['<h1>heading', '<h1>heading</h1>'],
-            ['<br>', '<br />'],
-            ['<p>&nbsp;</p>', null]];
+    return TidyCleaner::get();
   }
 
   //--------------------------------------------------------------------------------------------------------------------

diff --git a/test/Cleaner/Traits/StringCleaner.php b/test/Cleaner/Traits/StringCleaner.php
@@ -14,10 +14,10 @@ trait StringCleaner
    *
    * @return array
    */
-  public function getNonStrings(): array
+  public static function getNonStrings(): array
   {
     return [[[]],
-            [$this],
+            [new \stdClass()],
             [fopen('php://stdin', 'r')]];
   }
 
@@ -29,7 +29,7 @@ public function getNonStrings(): array
    *
    * @dataProvider getNonStrings
    */
-  public function testNonString($value): void
+  public function testNonString(mixed $value): void
   {
     $this->expectException(\LogicException::class);
 

diff --git a/test/Cleaner/TrimWhitespaceCleanerTest.php b/test/Cleaner/TrimWhitespaceCleanerTest.php
@@ -15,6 +15,17 @@ class TrimWhitespaceCleanerTest extends PlaisioTestCase
   //--------------------------------------------------------------------------------------------------------------------
   use StringCleaner;
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Returns cases with spaces only.
+   *
+   * @return array
+   */
+  public static function whitespaceOnly(): array
+  {
+    return [[''], [null], [' '], ['  '], ["\n"], ["\n \n"], ["\n \t"], [" \t\n\r\0\x0B \t\n\r\0\x0B"]];
+  }
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Returns an instance of TrimWhitespaceCleaner.
@@ -55,17 +66,6 @@ public function testWhitSpaceOnly(?string $string): void
     self::assertNull($clean);
   }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns cases with with spaces only.
-   *
-   * @return array
-   */
-  public function whitespaceOnly(): array
-  {
-    return [[''], [null], [' '], ['  '], ["\n"], ["\n \n"], ["\n \t"], [" \t\n\r\0\x0B \t\n\r\0\x0B"]];
-  }
-
   //--------------------------------------------------------------------------------------------------------------------
 }
 

diff --git a/test/Control/ButtonControlTest.php b/test/Control/ButtonControlTest.php
@@ -9,7 +9,7 @@
 /**
  * Unit tests for class ButtonControl.
  */
-class ButtonControlTest extends PushControlTest
+class ButtonControlTest extends PushControlTestCase
 {
   //--------------------------------------------------------------------------------------------------------------------
   /**

diff --git a/test/Control/CheckboxControlTest.php b/test/Control/CheckboxControlTest.php
@@ -8,7 +8,7 @@
 use Plaisio\Form\Control\ForceSubmitControl;
 use Plaisio\Form\Control\SimpleControl;
 use Plaisio\Form\RawForm;
-use Plaisio\Form\Test\Control\Traits\ImmutableTest;
+use Plaisio\Form\Test\Control\Traits\ImmutableTestCase;
 use Plaisio\Form\Test\Control\Traits\InputElementTest1;
 use Plaisio\Form\Test\PlaisioTestCase;
 
@@ -18,7 +18,7 @@
 class CheckboxControlTest extends PlaisioTestCase
 {
   //--------------------------------------------------------------------------------------------------------------------
-  use ImmutableTest;
+  use ImmutableTestCase;
   use InputElementTest1;
 
   //--------------------------------------------------------------------------------------------------------------------

diff --git a/test/Control/CheckboxesControlTest.php b/test/Control/CheckboxesControlTest.php
@@ -494,7 +494,7 @@ public function testWhiteListed1(): void
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Test labels are casted to strings.
+   * Test labels are cast to strings.
    */
   public function testWithNumericValues(): void
   {

diff --git a/test/Control/DatabaseLabelControlTest.php b/test/Control/DatabaseLabelControlTest.php
@@ -15,7 +15,7 @@ class DatabaseLabelControlTest extends TestCase
   /**
    * Returns invalid label prefixes.
    */
-  public function getInvalidPrefixes(): array
+  public static function getInvalidPrefixes(): array
   {
     return [['123ABC'],
             ['_CMP_ID'],

diff --git a/test/Control/DateControlTest.php b/test/Control/DateControlTest.php
@@ -10,17 +10,17 @@
 use Plaisio\Form\Control\SimpleControl;
 use Plaisio\Form\Formatter\DateFormatter;
 use Plaisio\Form\RawForm;
-use Plaisio\Form\Test\Control\Traits\ImmutableTest;
+use Plaisio\Form\Test\Control\Traits\ImmutableTestCase;
 use Plaisio\Form\Test\Control\Traits\InputElementTest1;
 use Plaisio\Form\Test\Control\Traits\InputElementTest2;
 
 /**
  * Unit tests for class DateControl.
  */
-class DateControlTest extends SimpleControlTest
+class DateControlTest extends SimpleControlTestCase
 {
   //--------------------------------------------------------------------------------------------------------------------
-  use ImmutableTest;
+  use ImmutableTestCase;
   use InputElementTest1;
   use InputElementTest2;
 

diff --git a/test/Control/FileControlTest.php b/test/Control/FileControlTest.php
@@ -3,10 +3,8 @@
 
 namespace Plaisio\Form\Test\Control;
 
-use Plaisio\Form\Control\FieldSet;
 use Plaisio\Form\Control\FileControl;
 use Plaisio\Form\Control\SimpleControl;
-use Plaisio\Form\RawForm;
 use Plaisio\Form\Test\Control\Traits\InputElementTest1;
 use Plaisio\Form\Test\PlaisioTestCase;
 

diff --git a/test/Control/ForceSubmitControlTest.php b/test/Control/ForceSubmitControlTest.php
@@ -10,7 +10,7 @@
 /**
  * Unit tests for class ForceSubmitControl.
  */
-class ForceSubmitControlTest extends PushControlTest
+class ForceSubmitControlTest extends PushControlTestCase
 {
   //--------------------------------------------------------------------------------------------------------------------
   use InputElementTest1;