Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / lib / Drupal / Core / Render / Placeholder / ChainedPlaceholderStrategy.php

diff --git a/web/core/lib/Drupal/Core/Render/Placeholder/ChainedPlaceholderStrategy.php b/web/core/lib/Drupal/Core/Render/Placeholder/ChainedPlaceholderStrategy.php
index 8e90faae86da7ac3365267fa7f213191a6bb9cfb..7ca41237b431e7387fa15e20848faad8e1f9a428 100644 (file)
--- a/web/core/lib/Drupal/Core/Render/Placeholder/ChainedPlaceholderStrategy.php
+++ b/web/core/lib/Drupal/Core/Render/Placeholder/ChainedPlaceholderStrategy.php
@@ -35,7 +35,7 @@ class ChainedPlaceholderStrategy implements PlaceholderStrategyInterface {
     }
 
     // Assert that there is at least one strategy.
-    assert('!empty($this->placeholderStrategies)', 'At least one placeholder strategy must be present; by default the fallback strategy \Drupal\Core\Render\Placeholder\SingleFlushStrategy is always present.');
+    assert(!empty($this->placeholderStrategies), 'At least one placeholder strategy must be present; by default the fallback strategy \Drupal\Core\Render\Placeholder\SingleFlushStrategy is always present.');
 
     $new_placeholders = [];
 
@@ -44,7 +44,7 @@ class ChainedPlaceholderStrategy implements PlaceholderStrategyInterface {
     // and this uses a variation of the "chain of responsibility" design pattern.
     foreach ($this->placeholderStrategies as $strategy) {
       $processed_placeholders = $strategy->processPlaceholders($placeholders);
-      assert('array_intersect_key($processed_placeholders, $placeholders) === $processed_placeholders', 'Processed placeholders must be a subset of all placeholders.');
+      assert(array_intersect_key($processed_placeholders, $placeholders) === $processed_placeholders, 'Processed placeholders must be a subset of all placeholders.');
       $placeholders = array_diff_key($placeholders, $processed_placeholders);
       $new_placeholders += $processed_placeholders;