Changeset 49007

Timestamp:

09/20/2020 12:55:07 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Tests: Fix the failures in REST API format keyword validation tests on PHP 8.

The tests ensure that rest_sanitize_value_from_schema() and rest_validate_value_from_schema() throw an "undefined offset" notice when the required type schema keyword is not passed.

In PHP 8, that notice is now a warning, so the tests need to be adjusted accordingly.

Follow-up to [48300], [48993].

See #50913.

Location:

trunk/tests/phpunit/tests/rest-api

Files:

• rest-schema-sanitization.php (modified) (1 diff)
• rest-schema-validation.php (modified) (1 diff)

trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php

@@ -361 +361 @@
          */
         public function test_format_validation_is_applied_if_missing_type() {
-                $this->expectException( 'PHPUnit_Framework_Error_Notice' ); // For the undefined index.
+                if ( PHP_VERSION_ID >= 80000 ) {
+                        $this->expectException( 'PHPUnit_Framework_Error_Warning' ); // For the undefined index.
+                } else {
+                        $this->expectException( 'PHPUnit_Framework_Error_Notice' ); 
+                }
+
                 $this->setExpectedIncorrectUsage( 'rest_sanitize_value_from_schema' );
 

trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php

@@ -157 +157 @@
          */
         public function test_format_validation_is_applied_if_missing_type() {
-                $this->expectException( 'PHPUnit_Framework_Error_Notice' ); // For the undefined index.
+                if ( PHP_VERSION_ID >= 80000 ) {
+                        $this->expectException( 'PHPUnit_Framework_Error_Warning' ); // For the undefined index.
+                } else {
+                        $this->expectException( 'PHPUnit_Framework_Error_Notice' ); 
+                }
+
                 $this->setExpectedIncorrectUsage( 'rest_validate_value_from_schema' );