diff -u b/core/composer.lock b/core/composer.lock --- b/core/composer.lock +++ b/core/composer.lock @@ -1,9 +1,9 @@ { - "hash": "2ea132b64c01235b70e9fb16c528ea0e", + "hash": "be2e79923e2be0777a9f60ec185168a8", "packages": [ { "package": "doctrine/common", - "version": "2.2.2" + "version": "2.3.0-RC1" }, { "package": "symfony/class-loader", only in patch2: unchanged: --- a/core/composer.json +++ b/core/composer.json @@ -8,7 +8,7 @@ "symfony/routing": "2.1.*", "symfony/yaml": "2.1.*", "twig/twig": "1.8.*", - "doctrine/common": "2.2.*" + "doctrine/common": "2.3.*" }, "minimum-stability": "beta" } only in patch2: unchanged: --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php @@ -41,6 +41,8 @@ class PageCacheTest extends WebTestBase { // Fill the cache. $this->drupalGet(''); + // Verify the page is not printed twice when the cache is cold. + $this->assertNoPattern('#.*#'); $this->drupalHead(''); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); @@ -57,6 +59,8 @@ class PageCacheTest extends WebTestBase { $this->assertResponse(304, t('Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.')); $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified)); + // Verify the page is not printed twice when the cache is warm. + $this->assertNoPattern('#.*#'); $this->assertResponse(200, t('Conditional request without If-None-Match returned 200 OK.')); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.'));