Update for PHPunit 9.

Rundiz · Dec 13, 2021 · 2e7d7a7 · 2e7d7a7
1 parent 3aaacec
commit 2e7d7a7
Show file tree

Hide file tree

Showing 20 changed files with 967 additions and 968 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="true"
          verbose="true"
 >
 	<testsuites>

diff --git a/tests/phpunit/DateIntervalTest.php b/tests/phpunit/DateIntervalTest.php
@@ -101,7 +101,7 @@ public function testDateInterval2()
             '2016-12-29', 
             '2016-12-31'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2016-09-01';
@@ -154,7 +154,7 @@ public function testDateInterval2()
             '2016-11-27', 
             '2016-11-29'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2016-10-01';
@@ -192,7 +192,7 @@ public function testDateInterval2()
             '2016-11-27', 
             '2016-11-29'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);
@@ -255,7 +255,7 @@ public function testDateInterval4()
             '2016-12-27', 
             '2016-12-31'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2016-09-01';
@@ -286,7 +286,7 @@ public function testDateInterval4()
             '2016-11-25', 
             '2016-11-29'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2016-10-01';
@@ -309,7 +309,7 @@ public function testDateInterval4()
             '2016-11-25', 
             '2016-11-29'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);
@@ -338,7 +338,7 @@ public function testDateInterval31()
             '2016-11-02', 
             '2016-12-03'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2016-09-01';
@@ -349,7 +349,7 @@ public function testDateInterval31()
             '2016-10-02', 
             '2016-11-02'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2016-10-01';
@@ -359,7 +359,7 @@ public function testDateInterval31()
             '2016-10-02', 
             '2016-11-02'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated date interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);

diff --git a/tests/phpunit/ErrorTest.php b/tests/phpunit/ErrorTest.php
@@ -29,7 +29,7 @@ public function testNoBeginsDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_NO_DATE_BEGINS'], $errorCodes);
+        $this->assertSame(['RDDINTV_NO_DATE_BEGINS'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
 
@@ -41,7 +41,7 @@ public function testNoBeginsDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_NO_DATE_BEGINS'], $errorCodes);
+        $this->assertSame(['RDDINTV_NO_DATE_BEGINS'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
 
@@ -53,7 +53,7 @@ public function testNoBeginsDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_INCORRECT_DATE_BEGINS'], $errorCodes);
+        $this->assertSame(['RDDINTV_INCORRECT_DATE_BEGINS'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
     }// testNoBeginsDate
@@ -70,7 +70,7 @@ public function testEndDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_DATE_BEGINS_MORE_THAN_DATE_END'], $errorCodes);
+        $this->assertSame(['RDDINTV_DATE_BEGINS_MORE_THAN_DATE_END'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
 
@@ -82,7 +82,7 @@ public function testEndDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_INCORRECT_DATE_END'], $errorCodes);
+        $this->assertSame(['RDDINTV_INCORRECT_DATE_END'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
 
@@ -94,7 +94,7 @@ public function testEndDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_INCORRECT_DATE_END'], $errorCodes);
+        $this->assertSame(['RDDINTV_INCORRECT_DATE_END'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
     }// testEndDate
@@ -110,7 +110,7 @@ public function testNoInterval()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_NO_INTERVAL_RANGE'], $errorCodes);
+        $this->assertSame(['RDDINTV_NO_INTERVAL_RANGE'], $errorCodes);
     }// testNoInterval
 
 
@@ -125,7 +125,7 @@ public function testStartDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_START_DATE_MORE_THAN_DATE_END'], $errorCodes);
+        $this->assertSame(['RDDINTV_START_DATE_MORE_THAN_DATE_END'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
 
@@ -137,7 +137,7 @@ public function testStartDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_START_DATE_MORE_THAN_DATE_END'], $errorCodes);
+        $this->assertSame(['RDDINTV_START_DATE_MORE_THAN_DATE_END'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
 
@@ -149,7 +149,7 @@ public function testStartDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_EXACT_START_DATE_MORE_THAN_DATE_END'], $errorCodes);
+        $this->assertSame(['RDDINTV_EXACT_START_DATE_MORE_THAN_DATE_END'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
 
@@ -161,7 +161,7 @@ public function testStartDate()
         $errorCodes = $DateInterval->getErrorCodes();
         $this->assertCount(1, $errorMessages);
         $this->assertCount(1, $errorCodes);
-        $this->assertArraySubset(['RDDINTV_START_DATE_MORE_THAN_STOP_DATE'], $errorCodes);
+        $this->assertSame(['RDDINTV_START_DATE_MORE_THAN_STOP_DATE'], $errorCodes);
         $DateInterval->reset();
         unset($errorCodes, $errorMessages);
     }// testStartDate

diff --git a/tests/phpunit/MonthIntervalTest.php b/tests/phpunit/MonthIntervalTest.php
@@ -35,7 +35,7 @@ public function testMonthInterval2()
             '2016-10-01', 
             '2016-12-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2016-06-01';
@@ -46,7 +46,7 @@ public function testMonthInterval2()
             '2016-08-01', 
             '2016-10-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2015-08-02';
@@ -62,7 +62,7 @@ public function testMonthInterval2()
             '2016-10-01', 
             '2016-12-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);
@@ -93,7 +93,7 @@ public function testMonthInterval3()
             '2016-07-01', 
             '2016-10-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2015-06-01';
@@ -107,7 +107,7 @@ public function testMonthInterval3()
             '2016-07-01', 
             '2016-10-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2015-07-02';
@@ -120,7 +120,7 @@ public function testMonthInterval3()
             '2016-07-01', 
             '2016-10-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);
@@ -151,7 +151,7 @@ public function testMonthInterval5()
             '2016-05-01', 
             '2016-10-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2014-06-01';
@@ -165,7 +165,7 @@ public function testMonthInterval5()
             '2016-05-01', 
             '2016-10-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2014-07-02';
@@ -179,7 +179,7 @@ public function testMonthInterval5()
             '2016-05-01', 
             '2016-10-01'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated month interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);

diff --git a/tests/phpunit/WeekIntervalTest.php b/tests/phpunit/WeekIntervalTest.php
@@ -44,7 +44,7 @@ public function testWeekInterval2()
             '2016-12-09', 
             '2016-12-23'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2016-06-01';
@@ -65,7 +65,7 @@ public function testWeekInterval2()
             '2016-11-11', 
             '2016-11-25'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2016-08-01';
@@ -84,7 +84,7 @@ public function testWeekInterval2()
             '2016-12-09', 
             '2016-12-23'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);
@@ -122,7 +122,7 @@ public function testWeekInterval3()
             '2016-12-09', 
             '2016-12-30'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2016-06-01';
@@ -139,7 +139,7 @@ public function testWeekInterval3()
             '2016-10-28', 
             '2016-11-18'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2016-08-01';
@@ -155,7 +155,7 @@ public function testWeekInterval3()
             '2016-12-09', 
             '2016-12-30'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);
@@ -187,7 +187,7 @@ public function testWeekInterval5()
             '2016-10-28', 
             '2016-12-02'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($expected_results, $list_dates);
 
         $date_start = '2016-06-01';
@@ -200,7 +200,7 @@ public function testWeekInterval5()
             '2016-09-23', 
             '2016-10-28'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         $date_start = '2016-08-01';
@@ -212,7 +212,7 @@ public function testWeekInterval5()
             '2016-10-28', 
             '2016-12-02'
         );
-        $this->assertArraySubset($expected_results, $list_dates, '', sprintf('Generated week interval does not match the expected results. %s', var_export($list_dates, true)));
+        $this->assertSame($expected_results, $list_dates);
         unset($date_start, $date_stop, $expected_results, $list_dates);
 
         unset($date_begins, $date_end, $DateInterval, $interval_num, $interval_unit);