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

1
core/modules/statistics/src/StatisticsSettingsForm.php
View file

@ -96,4 +96,5 @@ class StatisticsSettingsForm extends ConfigFormBase {
parent::submitForm($form, $form_state);
}
}

7
core/modules/statistics/src/Tests/StatisticsAdminTest.php
View file

@ -75,7 +75,7 @@ class StatisticsAdminTest extends WebTestBase {
$nid = $this->testNode->id();
$post = array('nid' => $nid);
global $base_url;
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
$this->client->post($stats_path, array('form_params' => $post));
// Hit the node again (the counter is incremented after the hit, so
@ -110,7 +110,7 @@ class StatisticsAdminTest extends WebTestBase {
$nid = $this->testNode->id();
$post = array('nid' => $nid);
global $base_url;
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
$this->client->post($stats_path, array('form_params' => $post));
$result = db_select('node_counter', 'n')
@ -144,7 +144,7 @@ class StatisticsAdminTest extends WebTestBase {
$nid = $this->testNode->id();
$post = array('nid' => $nid);
global $base_url;
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
$this->client->post($stats_path, array('form_params' => $post));
$this->drupalGet('node/' . $this->testNode->id());
$this->client->post($stats_path, array('form_params' => $post));
@ -167,4 +167,5 @@ class StatisticsAdminTest extends WebTestBase {
->fetchField();
$this->assertFalse($result, 'Daycounter is zero.');
}
}

2
core/modules/statistics/src/Tests/StatisticsReportsTest.php
View file

@ -24,7 +24,7 @@ class StatisticsReportsTest extends StatisticsTestBase {
$post = http_build_query(array('nid' => $nid));
$headers = array('Content-Type' => 'application/x-www-form-urlencoded');
global $base_url;
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
$client = \Drupal::service('http_client_factory')
->fromOptions(['config/curl' => [CURLOPT_TIMEOUT => 10]]);
$client->post($stats_path, array('headers' => $headers, 'body' => $post));

1
core/modules/statistics/src/Tests/StatisticsTestBase.php
View file

@ -47,4 +47,5 @@ abstract class StatisticsTestBase extends WebTestBase {
->set('count_content_views', 1)
->save();
}
}

3
core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
View file

@ -27,7 +27,7 @@ class StatisticsTokenReplaceTest extends StatisticsTestBase {
$post = http_build_query(array('nid' => $nid));
$headers = array('Content-Type' => 'application/x-www-form-urlencoded');
global $base_url;
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
$client = \Drupal::service('http_client_factory')
->fromOptions(['config/curl' => [CURLOPT_TIMEOUT => 10]]);
$client->post($stats_path, array('headers' => $headers, 'body' => $post));
@ -48,4 +48,5 @@ class StatisticsTokenReplaceTest extends StatisticsTestBase {
$this->assertEqual($output, $expected, format_string('Statistics token %token replaced.', array('%token' => $input)));
}
}
}

2
core/modules/statistics/src/Tests/Views/IntegrationTest.php
View file

@ -70,7 +70,7 @@ class IntegrationTest extends ViewTestBase {
// Manually calling statistics.php, simulating ajax behavior.
// @see \Drupal\statistics\Tests\StatisticsLoggingTest::testLogging().
global $base_url;
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
$stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
$client = \Drupal::service('http_client_factory')->fromOptions(['config/curl', array(CURLOPT_TIMEOUT => 10)]);
$client->post($stats_path, array('form_params' => array('nid' => $this->node->id())));
$this->drupalGet('test_statistics_integration');