MC-29555: Remove 'getSessionIdQueryParam()' calls

Author: nathanjosiah

app/code/Magento/Customer/Model/Session.php

@@ -108,6 +108,11 @@ class Session extends \Magento\Framework\Session\SessionManager
      */
     protected $response;
 
+    /**
+     * @var AccountConfirmation
+     */
+    private $accountConfirmation;
+
     /**
      * Session constructor.
      *

app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php

@@ -69,9 +69,6 @@ protected function setUp()
         $this->design = $this->getMockBuilder(\Magento\Framework\View\DesignInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->appEmulation = $this->getMockBuilder(\Magento\Store\Model\App\Emulation::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -150,11 +147,11 @@ protected function getModelMock(array $mockedMethods = [], array $data = [])
     }
 
     /**
-     * @param        $variables array
-     * @param        $templateType string
-     * @param        $storeId int
-     * @param        $expectedVariables array
-     * @param        $expectedResult string
+     * @param $variables array
+     * @param $templateType string
+     * @param $storeId int
+     * @param $expectedVariables array
+     * @param $expectedResult string
      * @dataProvider getProcessedTemplateProvider
      */
     public function testGetProcessedTemplate($variables, $templateType, $storeId, $expectedVariables, $expectedResult)

app/code/Magento/Store/Controller/Store/Redirect.php

@@ -16,7 +16,6 @@
 use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreResolver;
 use Magento\Framework\Session\SidResolverInterface;
-use Magento\Framework\Session\Generic as Session;
 
 /**
  * Builds correct url to target store (group) and performs redirect.
@@ -33,36 +32,29 @@ class Redirect extends \Magento\Framework\App\Action\Action implements HttpGetAc
      */
     private $storeResolver;
 
-    /**
-     * @var Session
-     */
-    private $session;
-
     /**
      * @param Context $context
      * @param StoreRepositoryInterface $storeRepository
      * @param StoreResolverInterface $storeResolver
-     * @param Session $session
+     * @param \Magento\Framework\Session\Generic $session
      * @param SidResolverInterface $sidResolver
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Context $context,
         StoreRepositoryInterface $storeRepository,
         StoreResolverInterface $storeResolver,
-        Session $session,
+        \Magento\Framework\Session\Generic $session,
         SidResolverInterface $sidResolver
     ) {
         parent::__construct($context);
         $this->storeRepository = $storeRepository;
         $this->storeResolver = $storeResolver;
-        $this->session = $session;
     }
 
     /**
-     * Builds Redirect Url
+     * @inheritDoc
      *
-     * @return ResponseInterface|\Magento\Framework\Controller\ResultInterface
      * @throws NoSuchEntityException
      */
     public function execute()

lib/internal/Magento/Framework/Session/SidResolver.php

@@ -70,6 +70,7 @@ class SidResolver implements SidResolverInterface
      * @param string $scopeType
      * @param array $sidNameMap
      * @param State|null $appState
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -84,7 +85,6 @@ public function __construct(
         $this->request = $request;
         $this->sidNameMap = $sidNameMap;
         $this->_scopeType = $scopeType;
-        $this->appState = $appState ?: \Magento\Framework\App\ObjectManager::getInstance()->get(State::class);
     }
 
     /**