diff vendor/consolidation/output-formatters/src/StructuredData/RenderCellCollectionTrait.php @ 13:5fb285c0d0e3

Update Drupal core to 8.4.7 via Composer. Security update; I *think* we've
been lucky to get away with this so far, as we don't support self-registration
which seems to be used by the so-called "drupalgeddon 2" attack that 8.4.5
was vulnerable to.

--- a/vendor/consolidation/output-formatters/src/StructuredData/RenderCellCollectionTrait.php	Fri Feb 23 15:52:07 2018 +0000
+++ b/vendor/consolidation/output-formatters/src/StructuredData/RenderCellCollectionTrait.php	Mon Apr 23 09:33:26 2018 +0100
@@ -2,9 +2,12 @@
 namespace Consolidation\OutputFormatters\StructuredData;
 
 use Consolidation\OutputFormatters\Options\FormatterOptions;
+use Consolidation\OutputFormatters\Formatters\FormatterAwareInterface;
+use Consolidation\OutputFormatters\Formatters\FormatterAwareTrait;
 
 trait RenderCellCollectionTrait
 {
+    use FormatterAwareTrait;
 
     /** @var RenderCellInterface[] */
     protected $rendererList = [
@@ -49,10 +52,10 @@
         );
 
         foreach ($flattenedRendererList as $renderer) {
+            if ($renderer instanceof FormatterAwareInterface) {
+                $renderer->setFormatter($this->getFormatter());
+            }
             $cellData = $renderer->renderCell($key, $cellData, $options, $rowData);
-            if (is_string($cellData)) {
-                return $cellData;
-            }
         }
         return $cellData;
     }