diff options
| -rw-r--r-- | CHANGELOG.txt | 1 | ||||
| -rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 18 |
2 files changed, 18 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 947a8e2b1..89c12caff 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,7 @@ Drupal 7.25, xxxx-xx-xx (development version) ----------------------- +- Fixed broken tests on PHP 5.5. - Made the File and Image modules more robust when saving entities that have deleted files attached. The code in file_field_presave() will now remove the record of the deleted file from the entity before saving (minor data diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index cb15a6367..6d0e59a4a 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -541,6 +541,15 @@ abstract class DrupalTestCase { E_RECOVERABLE_ERROR => 'Recoverable error', ); + // PHP 5.3 adds new error logging constants. Add these conditionally for + // backwards compatibility with PHP 5.2. + if (defined('E_DEPRECATED')) { + $error_map += array( + E_DEPRECATED => 'Deprecated', + E_USER_DEPRECATED => 'User deprecated', + ); + } + $backtrace = debug_backtrace(); $this->error($message, $error_map[$severity], _drupal_get_last_caller($backtrace)); } @@ -2046,7 +2055,14 @@ class DrupalWebTestCase extends DrupalTestCase { foreach ($upload as $key => $file) { $file = drupal_realpath($file); if ($file && is_file($file)) { - $post[$key] = '@' . $file; + // Use the new CurlFile class for file uploads when using PHP + // 5.5 or higher. + if (class_exists('CurlFile')) { + $post[$key] = curl_file_create($file); + } + else { + $post[$key] = '@' . $file; + } } } } |