X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Ftests%2FDrupal%2FTests%2FCore%2FRender%2FBubbleableMetadataTest.php;fp=web%2Fcore%2Ftests%2FDrupal%2FTests%2FCore%2FRender%2FBubbleableMetadataTest.php;h=092525c75d555a057d731f33641dcf9120220789;hp=a881e7c2ce7240a904714741b10ae58e2a031a37;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c diff --git a/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php b/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php index a881e7c2c..092525c75 100644 --- a/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php +++ b/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php @@ -641,7 +641,6 @@ class BubbleableMetadataTest extends UnitTestCase { ]; } - /** * @covers ::addCacheableDependency * @dataProvider providerTestMerge @@ -676,17 +675,17 @@ class BubbleableMetadataTest extends UnitTestCase { 'merge-cacheable-metadata' => [ (new BubbleableMetadata())->setCacheContexts(['foo'])->setCacheTags(['foo'])->setCacheMaxAge(20), (new CacheableMetadata())->setCacheContexts(['bar'])->setCacheTags(['bar'])->setCacheMaxAge(60), - (new BubbleableMetadata())->setCacheContexts(['foo', 'bar'])->setCacheTags(['foo', 'bar'])->setCacheMaxAge(20) + (new BubbleableMetadata())->setCacheContexts(['foo', 'bar'])->setCacheTags(['foo', 'bar'])->setCacheMaxAge(20), ], 'merge-bubbleable-metadata' => [ (new BubbleableMetadata())->setCacheContexts(['foo'])->setCacheTags(['foo'])->setCacheMaxAge(20)->setAttachments(['foo' => []]), (new BubbleableMetadata())->setCacheContexts(['bar'])->setCacheTags(['bar'])->setCacheMaxAge(60)->setAttachments(['bar' => []]), - (new BubbleableMetadata())->setCacheContexts(['foo', 'bar'])->setCacheTags(['foo', 'bar'])->setCacheMaxAge(20)->setAttachments(['foo' => [], 'bar' => []]) + (new BubbleableMetadata())->setCacheContexts(['foo', 'bar'])->setCacheTags(['foo', 'bar'])->setCacheMaxAge(20)->setAttachments(['foo' => [], 'bar' => []]), ], 'merge-attachments-metadata' => [ (new BubbleableMetadata())->setAttachments(['foo' => []]), (new BubbleableMetadata())->setAttachments(['baro' => []]), - (new BubbleableMetadata())->setAttachments(['foo' => [], 'bar' => []]) + (new BubbleableMetadata())->setAttachments(['foo' => [], 'bar' => []]), ], ]; }