Fix #26504 - Broken reference errors pilling up logs

Author: Bartlomiejsz

lib/internal/Magento/Framework/View/Layout/GeneratorPool.php

@@ -5,11 +5,15 @@
  */
 namespace Magento\Framework\View\Layout;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\State;
 use Magento\Framework\View\Layout\Condition\ConditionFactory;
+use Psr\Log\LoggerInterface;
 
 /**
  * Pool of generators for structural elements
  * @api
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GeneratorPool
 {
@@ -24,31 +28,39 @@ class GeneratorPool
     protected $generators = [];
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     protected $logger;
 
     /**
-     * @var \Magento\Framework\View\Layout\Condition\ConditionFactory
+     * @var ConditionFactory
      */
     private $conditionFactory;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * @param ScheduledStructure\Helper $helper
      * @param ConditionFactory $conditionFactory
-     * @param \Psr\Log\LoggerInterface $logger
+     * @param LoggerInterface $logger
      * @param array|null $generators
+     * @param State|null $state
      */
     public function __construct(
         ScheduledStructure\Helper $helper,
         ConditionFactory $conditionFactory,
-        \Psr\Log\LoggerInterface $logger,
-        array $generators = null
+        LoggerInterface $logger,
+        array $generators = null,
+        ?State $state = null
     ) {
         $this->helper = $helper;
         $this->conditionFactory = $conditionFactory;
         $this->logger = $logger;
         $this->addGenerators($generators);
+        $this->state = $state ?? ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -226,7 +238,9 @@ protected function moveElementInStructure(
             $structure->setAsChild($element, $destination, $alias);
             $structure->reorderChildElement($destination, $element, $siblingName, $isAfter);
         } catch (\OutOfBoundsException $e) {
-            $this->logger->warning('Broken reference: ' . $e->getMessage());
+            if ($this->state->getMode() === State::MODE_DEVELOPER) {
+                $this->logger->warning('Broken reference: ' . $e->getMessage());
+            }
         }
         $scheduledStructure->unsetElementFromBrokenParentList($element);
         return $this;