Revert "Fixed static test failures"

This reverts commit c8abbb9.

Author: engcom-Charlie

lib/internal/Magento/Framework/Message/Manager.php

@@ -1,15 +1,14 @@
 <?php
 /**
- * Copyright 2017 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Message;
 
 use Magento\Framework\Event;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Debug;
-use Magento\Framework\Message\ExceptionMessageLookupFactory;
 
 /**
  * Message manager model
@@ -22,7 +21,7 @@ class Manager implements ManagerInterface
     /**
      * Default message group
      */
-    public const DEFAULT_GROUP = 'default';
+    const DEFAULT_GROUP = 'default';
 
     /**
      * @var Session
@@ -64,10 +63,6 @@ class Manager implements ManagerInterface
      */
     private $exceptionMessageFactory;
 
-    /**
-     * @var ExceptionMessageLookupFactory
-     */
-    private $exceptionMessageLookupFactory;
     /**
      * @param Session $session
      * @param Factory $messageFactory
@@ -76,7 +71,6 @@ class Manager implements ManagerInterface
      * @param LoggerInterface $logger
      * @param string $defaultGroup
      * @param ExceptionMessageFactoryInterface|null $exceptionMessageFactory
-     * @param ExceptionMessageLookupFactory|null $exceptionMessageLookupFactory
      */
     public function __construct(
         Session $session,
@@ -85,18 +79,16 @@ public function __construct(
         Event\ManagerInterface $eventManager,
         LoggerInterface $logger,
         $defaultGroup = self::DEFAULT_GROUP,
-        ?ExceptionMessageFactoryInterface $exceptionMessageFactory = null,
-        ?ExceptionMessageLookupFactory $exceptionMessageLookupFactory = null
+        ExceptionMessageFactoryInterface $exceptionMessageFactory = null
     ) {
         $this->session = $session;
         $this->messageFactory = $messageFactory;
         $this->messagesFactory = $messagesFactory;
         $this->eventManager = $eventManager;
         $this->logger = $logger;
         $this->defaultGroup = $defaultGroup;
-        $this->exceptionMessageFactory = $exceptionMessageFactory ?:
-            ($this->exceptionMessageLookupFactory = $exceptionMessageLookupFactory ?:
-                ObjectManager::getInstance()->get(ExceptionMessageLookupFactory::class));
+        $this->exceptionMessageFactory = $exceptionMessageFactory ?: ObjectManager::getInstance()
+            ->get(ExceptionMessageLookupFactory::class);
     }
 
     /**

lib/internal/Magento/Framework/Message/ManagerInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2017 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Message;