Index: sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php
===================================================================
--- sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php (revision 6728)
+++ sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php (revision 6806)
@@ -25,14 +25,4 @@
[ 'php_version' => '5.3.2' ]
],
- [
- [
- 'php_version' => '7.0',
- 'ip_address' => '1.2.3.0'
- ],
- [
- 'php_version' => '7.0',
- 'ip_address' => '1.2.3.0'
- ]
- ],
];
}
@@ -55,5 +45,8 @@
// Assert that it's a successful response, and not an error.
- $this->assertArrayHasKey( 'status', $output );
+ $this->assertArrayHasKey( 'recommended_version', $output );
+ $this->assertArrayHasKey( 'is_supported', $output );
+ $this->assertArrayHasKey( 'is_secure', $output );
+ $this->assertArrayHasKey( 'is_acceptable', $output );
}
@@ -92,15 +85,4 @@
]
],
- [
- [
- 'php_version' => '7.0',
- 'ip_address' => '1.2.3.4'
- ],
- [
- 'code' => 'invalid_param',
- 'message' => 'Invalid parameter: ip_address',
- 'status' => 400
- ]
- ],
];
}
@@ -126,35 +108,37 @@
function dataprovider_parse_request_valid() {
- return [
- // Testing Valid IP Address format
- [
- [
- 'php_version' => RECOMMENDED_PHP,
- 'ip_address' => '1.2.3.0',
- ],
- [ 'status' => 'ok' ]
- ],
- // Testing PHP version logic:
+ // Test recommended PHP version is always returned.
+ $data = [
[
[ 'php_version' => RECOMMENDED_PHP ],
- [ 'status' => 'ok' ]
- ],
- [
- [ 'php_version' => RECOMMENDED_PHP + 0.1 ],
- [ 'status' => 'ok' ]
- ],
- [
- [ 'php_version' => PHP_RECEIVING_SECURITY_UPDATES ],
- [ 'status' => 'ok' ]
- ],
- [
- [ 'php_version' => PHP_RECEIVING_SECURITY_UPDATES - 0.1 ],
- [ 'status' => 'no_security_updates' ]
- ],
- [
- [ 'php_version' => TRIGGER_PHP_VERSION - 0.1 ],
- [ 'status' => 'out_of_date' ]
- ],
- ];
+ [ 'recommended_version' => RECOMMENDED_PHP ]
+ ],
+ [
+ [ 'php_version' => '5.2' ],
+ [ 'recommended_version' => RECOMMENDED_PHP ]
+ ],
+ ];
+
+ // Test individual PHP versions.
+ $flags = [
+ 'is_supported' => 'SUPPORTED_PHP',
+ 'is_secure' => 'SECURE_PHP',
+ 'is_acceptable' => 'ACCEPTABLE_PHP'
+ ];
+ foreach ( $flags as $flag => $constant_name ) {
+ $data[] = [
+ [ 'php_version' => constant( $constant_name ) ],
+ [ $flag => true ]
+ ];
+ $data[] = [
+ [ 'php_version' => constant( $constant_name ) + 0.1 ],
+ [ $flag => true ]
+ ];
+ $data[] = [
+ [ 'php_version' => constant( $constant_name ) - 0.1 ],
+ [ $flag => false ]
+ ];
+ }
+ return $data;
}