opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2

Browse source
This commit is contained in:
Pantheon Automation 2016-06-02 15:56:09 -07:00 • committed by Greg Anderson
parent 9eae24d844
commit 28556d630e
1322 changed files with 6699 additions and 2064 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/modules/simpletest/src/WebTestBase.php
View file

@ -625,7 +625,7 @@ abstract class WebTestBase extends TestBase {
copy($settings_testing_file, $directory . '/settings.testing.php');
// Add the name of the testing class to settings.php and include the
// testing specific overrides
file_put_contents($directory . '/settings.php', "\n\$test_class = '" . get_class($this) ."';\n" . 'include DRUPAL_ROOT . \'/\' . $site_path . \'/settings.testing.php\';' ."\n", FILE_APPEND);
file_put_contents($directory . '/settings.php', "\n\$test_class = '" . get_class($this) . "';\n" . 'include DRUPAL_ROOT . \'/\' . $site_path . \'/settings.testing.php\';' . "\n", FILE_APPEND);
}
$settings_services_file = DRUPAL_ROOT . '/' . $this->originalSite . '/testing.services.yml';
if (!file_exists($settings_services_file)) {
@ -876,7 +876,7 @@ abstract class WebTestBase extends TestBase {
* To install test modules outside of the testing environment, add
* @code
* $settings['extension_discovery_scan_tests'] = TRUE;
* @encode
* @endcode
* to your settings.php.
*
* @param \Symfony\Component\DependencyInjection\ContainerInterface $container
@ -1302,7 +1302,7 @@ abstract class WebTestBase extends TestBase {
* @param $header
* An header.
*
* @see _drupal_log_error().
* @see _drupal_log_error()
*/
protected function curlHeaderCallback($curlHandler, $header) {
// Header fields can be extended over multiple lines by preceding each
@ -2539,7 +2539,7 @@ abstract class WebTestBase extends TestBase {
* TRUE on pass, FALSE on fail.
*/
protected function assertUrl($path, array $options = array(), $message = '', $group = 'Other') {
if ($path instanceof Url) {
if ($path instanceof Url) {
$url_obj = $path;
}
elseif (UrlHelper::isExternal($path)) {
@ -2631,7 +2631,7 @@ abstract class WebTestBase extends TestBase {
* @param $override_server_vars
* An array of server variables to override.
*
* @return $request
* @return \Symfony\Component\HttpFoundation\Request
* The mocked request object.
*/
protected function prepareRequestForGenerator($clean_urls = TRUE, $override_server_vars = array()) {