updated core to 7.72

This commit is contained in:
2020-06-23 12:35:08 +02:00
parent 22d0da3413
commit d58e084fe3
208 changed files with 3399 additions and 593 deletions
+4 -3
View File
@@ -33,6 +33,7 @@ files[] = tests/pager.test
files[] = tests/password.test
files[] = tests/path.test
files[] = tests/registry.test
files[] = tests/request_sanitizer.test
files[] = tests/schema.test
files[] = tests/session.test
files[] = tests/tablesort.test
@@ -57,7 +58,7 @@ files[] = tests/upgrade/update.trigger.test
files[] = tests/upgrade/update.field.test
files[] = tests/upgrade/update.user.test
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+8 -2
View File
@@ -1124,9 +1124,15 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
$this->assertEqual($unable_to_parse->code, -1001, 'Returned with "-1001" error code.');
$this->assertEqual($unable_to_parse->error, 'unable to parse URL', 'Returned with "unable to parse URL" error message.');
// Fetch page.
$result = drupal_http_request(url('node', array('absolute' => TRUE)));
// Fetch page and check that the data parameter works with both array and string.
$data_array = array($this->randomName() => $this->randomString() . ' "\'');
$data_string = drupal_http_build_query($data_array);
$result = drupal_http_request(url('node', array('absolute' => TRUE)), array('data' => $data_array));
$this->assertEqual($result->code, 200, 'Fetched page successfully.');
$this->assertTrue(substr($result->request, -strlen($data_string)) === $data_string, 'Request ends with URL-encoded data when drupal_http_request() called using array.');
$result = drupal_http_request(url('node', array('absolute' => TRUE)), array('data' => $data_string));
$this->assertTrue(substr($result->request, -strlen($data_string)) === $data_string, 'Request ends with URL-encoded data when drupal_http_request() called using string.');
$this->drupalSetContent($result->data);
$this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), 'Site title matches.');
+3 -3
View File
@@ -7,7 +7,7 @@ stylesheets[all][] = common_test.css
stylesheets[print][] = common_test.print.css
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -7,7 +7,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -6,7 +6,7 @@ core = 7.x
dependencies[] = entity_cache_test_dependency
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+2 -2
View File
@@ -963,7 +963,7 @@ class FileDirectoryTest extends FileTestCase {
$this->fail('Expected exception not thrown');
}
catch (RuntimeException $e) {
$this->assertEqual("Invalid filename '$filename'", $e->getMessage());
$this->assertEqual("Invalid filename '$filename'", $e->getMessage(), 'The invalid filename has been detected and RuntimeException has been thrown.');
}
// @TODO: Finally we copy a file into a directory several times, to ensure a properly iterating filename suffix.
@@ -1004,7 +1004,7 @@ class FileDirectoryTest extends FileTestCase {
$this->fail('Expected exception not thrown');
}
catch (RuntimeException $e) {
$this->assertEqual("Invalid filename 'a\xFFtest\x80€.txt'", $e->getMessage());
$this->assertEqual("Invalid filename 'a\xFFtest\x80€.txt'", $e->getMessage(), 'The invalid destination has been detected and RuntimeException has been thrown.');
}
}
+3 -3
View File
@@ -6,7 +6,7 @@ core = 7.x
files[] = file_test.module
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+4 -1
View File
@@ -521,6 +521,9 @@ class FormsTestCase extends DrupalWebTestCase {
$form_state['values'] = array();
drupal_prepare_form($form_id, $form, $form_state);
// Set the CSRF token in the user-provided input.
$form_state['input']['form_token'] = $form['form_token']['#default_value'];
// This is the main function we want to test: it is responsible for
// populating user supplied $form_state['input'] to sanitized
// $form_state['values'].
@@ -687,7 +690,7 @@ class FormValidationTestCase extends DrupalWebTestCase {
$this->drupalPost(NULL, $edit, 'Save');
$this->assertNoFieldByName('name', '#value changed by #validate', 'Form element #value was not altered.');
$this->assertNoText('Name value: value changed by form_set_value() in #validate', 'Form element value in $form_state was not altered.');
$this->assertText('The form has become outdated. Copy any unsaved work in the form below');
$this->assertText('The form has become outdated.');
}
/**
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+16 -1
View File
@@ -55,6 +55,22 @@ class PagerFunctionalWebTestCase extends DrupalWebTestCase {
$this->assertPagerItems($current_page);
}
/**
* Tests theme_pager() when an empty quantity is passed.
*/
public function testThemePagerQuantityNotSet() {
$variables = array(
'element' => 0,
'parameters' => array(),
'quantity' => '',
'tags' => '',
);
pager_default_initialize(100, 10);
$rendered_output = theme_pager($variables);
$this->assertNotIdentical(stripos($rendered_output, 'next'), FALSE);
$this->assertNotIdentical(stripos($rendered_output, 'last'), FALSE);
}
/**
* Asserts pager items and links.
*
@@ -156,4 +172,3 @@ class PagerFunctionalWebTestCase extends DrupalWebTestCase {
$this->assertTrue(strpos($element['class'], $class) === FALSE, $message);
}
}
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ core = 7.x
hidden = TRUE
package = Testing
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ core = 7.x
hidden = TRUE
package = Testing
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -0,0 +1,354 @@
<?php
/**
* @file
* Tests for the RequestSanitizer class.
*/
/**
* Tests DrupalRequestSanitizer class.
*/
class RequestSanitizerTest extends DrupalUnitTestCase {
/**
* Log of errors triggered during sanitization.
*
* @var array
*/
protected $errors;
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'DrupalRequestSanitizer',
'description' => 'Test the DrupalRequestSanitizer class',
'group' => 'System',
);
}
/**
* {@inheritdoc}
*/
protected function setUp() {
require_once DRUPAL_ROOT . '/includes/request-sanitizer.inc';
parent::setUp();
set_error_handler(array($this, "sanitizerTestErrorHandler"));
}
/**
* Iterate through all the RequestSanitizerTests.
*/
public function testRequestSanitization() {
foreach ($this->requestSanitizerTests() as $label => $data) {
$this->errors = array();
// Normalize the test parameters.
$test = array(
'request' => $data[0],
'expected' => isset($data[1]) ? $data[1] : array(),
'expected_errors' => isset($data[2]) ? $data[2] : NULL,
'whitelist' => isset($data[3]) ? $data[3] : array(),
);
$this->requestSanitizationTest($test['request'], $test['expected'], $test['expected_errors'], $test['whitelist'], $label);
}
}
/**
* Tests RequestSanitizer class.
*
* @param \SanitizerTestRequest $request
* The request to sanitize.
* @param array $expected
* An array of expected request parameters after sanitization.
* @param array|null $expected_errors
* An array of expected errors. If set to NULL then error logging is
* disabled.
* @param array $whitelist
* An array of keys to whitelist and not sanitize.
* @param string $label
* A descriptive name for each test / group of assertions.
*
* @throws \ReflectionException
*/
public function requestSanitizationTest(SanitizerTestRequest $request, array $expected = array(), array $expected_errors = NULL, array $whitelist = array(), $label = NULL) {
// Set up globals.
$_GET = $request->getQuery();
$_POST = $request->getRequest();
$_COOKIE = $request->getCookies();
$_REQUEST = array_merge($request->getQuery(), $request->getRequest());
$GLOBALS['conf']['sanitize_input_whitelist'] = $whitelist;
$GLOBALS['conf']['sanitize_input_logging'] = is_null($expected_errors) ? FALSE : TRUE;
if ($label !== 'already sanitized request') {
$reflection = new \ReflectionProperty('DrupalRequestSanitizer', 'sanitized');
$reflection->setAccessible(TRUE);
$reflection->setValue(NULL, FALSE);
}
DrupalRequestSanitizer::sanitize();
if (isset($_GET['destination'])) {
DrupalRequestSanitizer::cleanDestination();
}
// Normalise the expected data.
$expected += array(
'cookies' => array(),
'query' => array(),
'request' => array(),
);
// Test PHP globals.
$this->assertEqualLabelled($expected['cookies'], $_COOKIE, NULL, 'Other', $label . ' (COOKIE)');
$this->assertEqualLabelled($expected['query'], $_GET, NULL, 'Other', $label . ' (GET)');
$this->assertEqualLabelled($expected['request'], $_POST, NULL, 'Other', $label . ' (POST)');
$expected_request = array_merge($expected['query'], $expected['request']);
$this->assertEqualLabelled($expected_request, $_REQUEST, NULL, 'Other', $label . ' (REQUEST)');
// Ensure any expected errors have been triggered.
if (!empty($expected_errors)) {
foreach ($expected_errors as $expected_error) {
$this->assertError($expected_error, E_USER_NOTICE, $label . ' (errors)');
}
}
else {
$this->assertEqualLabelled(array(), $this->errors, NULL, 'Other', $label . ' (errors)');
}
}
/**
* Data provider for testRequestSanitization.
*
* @return array
* A list of tests to carry out.
*/
public function requestSanitizerTests() {
$tests = array();
$request = new SanitizerTestRequest(array('q' => 'index.php'));
$tests['no sanitization GET'] = array($request, array('query' => array('q' => 'index.php')));
$request = new SanitizerTestRequest(array(), array('field' => 'value'));
$tests['no sanitization POST'] = array($request, array('request' => array('field' => 'value')));
$request = new SanitizerTestRequest(array(), array(), array(), array('key' => 'value'));
$tests['no sanitization COOKIE'] = array($request, array('cookies' => array('key' => 'value')));
$request = new SanitizerTestRequest(array('q' => 'index.php'), array('field' => 'value'), array(), array('key' => 'value'));
$tests['no sanitization GET, POST, COOKIE'] = array($request, array('query' => array('q' => 'index.php'), 'request' => array('field' => 'value'), 'cookies' => array('key' => 'value')));
$request = new SanitizerTestRequest(array('q' => 'index.php'));
$tests['no sanitization GET log'] = array($request, array('query' => array('q' => 'index.php')), array());
$request = new SanitizerTestRequest(array(), array('field' => 'value'));
$tests['no sanitization POST log'] = array($request, array('request' => array('field' => 'value')), array());
$request = new SanitizerTestRequest(array(), array(), array(), array('key' => 'value'));
$tests['no sanitization COOKIE log'] = array($request, array('cookies' => array('key' => 'value')), array());
$request = new SanitizerTestRequest(array('#q' => 'index.php'));
$tests['sanitization GET'] = array($request);
$request = new SanitizerTestRequest(array(), array('#field' => 'value'));
$tests['sanitization POST'] = array($request);
$request = new SanitizerTestRequest(array(), array(), array(), array('#key' => 'value'));
$tests['sanitization COOKIE'] = array($request);
$request = new SanitizerTestRequest(array('#q' => 'index.php'), array('#field' => 'value'), array(), array('#key' => 'value'));
$tests['sanitization GET, POST, COOKIE'] = array($request);
$request = new SanitizerTestRequest(array('#q' => 'index.php'));
$tests['sanitization GET log'] = array($request, array(), array('Potentially unsafe keys removed from query string parameters (GET): #q'));
$request = new SanitizerTestRequest(array(), array('#field' => 'value'));
$tests['sanitization POST log'] = array($request, array(), array('Potentially unsafe keys removed from request body parameters (POST): #field'));
$request = new SanitizerTestRequest(array(), array(), array(), array('#key' => 'value'));
$tests['sanitization COOKIE log'] = array($request, array(), array('Potentially unsafe keys removed from cookie parameters (COOKIE): #key'));
$request = new SanitizerTestRequest(array('#q' => 'index.php'), array('#field' => 'value'), array(), array('#key' => 'value'));
$tests['sanitization GET, POST, COOKIE log'] = array($request, array(), array('Potentially unsafe keys removed from query string parameters (GET): #q', 'Potentially unsafe keys removed from request body parameters (POST): #field', 'Potentially unsafe keys removed from cookie parameters (COOKIE): #key'));
$request = new SanitizerTestRequest(array('q' => 'index.php', 'foo' => array('#bar' => 'foo')));
$tests['recursive sanitization log'] = array($request, array('query' => array('q' => 'index.php', 'foo' => array())), array('Potentially unsafe keys removed from query string parameters (GET): #bar'));
$request = new SanitizerTestRequest(array('q' => 'index.php', 'foo' => array('#bar' => 'foo')));
$tests['recursive no sanitization whitelist'] = array($request, array('query' => array('q' => 'index.php', 'foo' => array('#bar' => 'foo'))), array(), array('#bar'));
$request = new SanitizerTestRequest(array(), array('#field' => 'value'));
$tests['no sanitization POST whitelist'] = array($request, array('request' => array('#field' => 'value')), array(), array('#field'));
$request = new SanitizerTestRequest(array('q' => 'index.php', 'foo' => array('#bar' => 'foo', '#foo' => 'bar')));
$tests['recursive multiple sanitization log'] = array($request, array('query' => array('q' => 'index.php', 'foo' => array())), array('Potentially unsafe keys removed from query string parameters (GET): #bar, #foo'));
$request = new SanitizerTestRequest(array('#q' => 'index.php'));
$tests['already sanitized request'] = array($request, array('query' => array('#q' => 'index.php')));
$request = new SanitizerTestRequest(array('destination' => 'whatever?%23test=value'));
$tests['destination removal GET'] = array($request);
$request = new SanitizerTestRequest(array('destination' => 'whatever?%23test=value'));
$tests['destination removal GET log'] = array($request, array(), array('Potentially unsafe destination removed from query string parameters (GET) because it contained the following keys: #test'));
$request = new SanitizerTestRequest(array('destination' => 'whatever?q[%23test]=value'));
$tests['destination removal subkey'] = array($request);
$request = new SanitizerTestRequest(array('destination' => 'whatever?q[%23test]=value'));
$tests['destination whitelist'] = array($request, array('query' => array('destination' => 'whatever?q[%23test]=value')), array(), array('#test'));
$request = new SanitizerTestRequest(array('destination' => "whatever?\x00bar=base&%23test=value"));
$tests['destination removal zero byte'] = array($request);
$request = new SanitizerTestRequest(array('destination' => 'whatever?q=value'));
$tests['destination kept'] = array($request, array('query' => array('destination' => 'whatever?q=value')));
$request = new SanitizerTestRequest(array('destination' => 'whatever'));
$tests['destination no query'] = array($request, array('query' => array('destination' => 'whatever')));
return $tests;
}
/**
* Catches and logs errors to $this->errors.
*
* @param int $errno
* The severity level of the error.
* @param string $errstr
* The error message.
*/
public function sanitizerTestErrorHandler($errno, $errstr) {
$this->errors[] = compact('errno', 'errstr');
}
/**
* Asserts that the expected error has been logged.
*
* @param string $errstr
* The error message.
* @param int $errno
* The severity level of the error.
* @param string $label
* The label to include with the message.
*
* @return bool
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertError($errstr, $errno, $label) {
$label = (empty($label)) ? '' : $label . ': ';
foreach ($this->errors as $error) {
if ($error['errstr'] === $errstr && $error['errno'] === $errno) {
return $this->pass($label . "Error with level $errno and message '$errstr' found");
}
}
return $this->fail($label . "Error with level $errno and message '$errstr' not found in " . var_export($this->errors, TRUE));
}
/**
* Asserts two values are equal, includes a label.
*
* @param mixed $first
* The first value to check.
* @param mixed $second
* The second value to check.
* @param string $message
* The message to display along with the assertion.
* @param string $group
* The type of assertion - examples are "Browser", "PHP".
* @param string $label
* The label to include with the message.
*
* @return bool
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertEqualLabelled($first, $second, $message = '', $group = 'Other', $label = '') {
$label = (empty($label)) ? '' : $label . ': ';
$message = $message ? $message : t('Value @first is equal to value @second.', array(
'@first' => var_export($first, TRUE),
'@second' => var_export($second, TRUE),
));
return $this->assert($first == $second, $label . $message, $group);
}
}
/**
* Basic HTTP Request class.
*/
class SanitizerTestRequest {
/**
* The query (GET).
*
* @var array
*/
protected $query;
/**
* The request (POST).
*
* @var array
*/
protected $request;
/**
* The request attributes.
*
* @var array
*/
protected $attributes;
/**
* The request cookies.
*
* @var array
*/
protected $cookies;
/**
* Constructor.
*
* @param array $query
* The GET parameters.
* @param array $request
* The POST parameters.
* @param array $attributes
* The request attributes.
* @param array $cookies
* The COOKIE parameters.
*/
public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array()) {
$this->query = $query;
$this->request = $request;
$this->attributes = $attributes;
$this->cookies = $cookies;
}
/**
* Getter for $query.
*/
public function getQuery() {
return $this->query;
}
/**
* Getter for $request.
*/
public function getRequest() {
return $this->request;
}
/**
* Getter for $attributes.
*/
public function getAttributes() {
return $this->attributes;
}
/**
* Getter for $cookies.
*/
public function getCookies() {
return $this->cookies;
}
}
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -7,7 +7,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -6,7 +6,7 @@ core = 7.x
hidden = TRUE
dependencies[] = _missing_dependency
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -6,7 +6,7 @@ core = 7.x
hidden = TRUE
dependencies[] = system_incompatible_core_version_test
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 5.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -7,7 +7,7 @@ hidden = TRUE
; system_incompatible_module_version_test declares version 1.0
dependencies[] = system_incompatible_module_version_test (>2.0)
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = 1.0
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -6,7 +6,7 @@ core = 7.x
hidden = TRUE
dependencies[] = drupal:filter
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -6,7 +6,7 @@ core = 7.x
files[] = system_test.module
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -6,7 +6,7 @@ core = 7.x
hidden = TRUE
dependencies[] = taxonomy
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+21
View File
@@ -238,6 +238,27 @@ class ThemeTableTestCase extends DrupalWebTestCase {
$this->assertNoRaw('class="odd"', 'Odd/even classes were not added because $no_striping = TRUE.');
$this->assertNoRaw('no_striping', 'No invalid no_striping HTML attribute was printed.');
}
/**
* Test that the 'footer' option works correctly.
*/
function testThemeTableFooter() {
$footer = array(
array(
'data' => array(1),
),
array('Foo'),
);
$table = array(
'rows' => array(),
'footer' => $footer,
);
$this->content = theme('table', $table);
$this->content = preg_replace('@>\s+<@', '><', $this->content);
$this->assertRaw('<tfoot><tr><td>1</td></tr><tr><td>Foo</td></tr></tfoot>', 'Table footer found.');
}
}
/**
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -6,7 +6,7 @@ hidden = TRUE
settings[basetheme_only] = base theme value
settings[subtheme_override] = base theme value
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -6,7 +6,7 @@ hidden = TRUE
settings[subtheme_override] = subtheme value
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -17,7 +17,7 @@ stylesheets[all][] = system.base.css
settings[theme_test_setting] = default value
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -4,7 +4,7 @@ core = 7.x
hidden = TRUE
engine = nyan_cat
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"
+3 -3
View File
@@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2019-04-17
version = "7.66"
; Information added by Drupal.org packaging script on 2020-06-17
version = "7.72"
project = "drupal"
datestamp = "1555533576"
datestamp = "1592419104"