Proper generate classes with reset state method

Author: kandy

app/code/Magento/Store/Model/Store.php

@@ -468,7 +468,6 @@ protected function _construct()
     protected function _getSession()
     {
         if (!$this->_session->isSessionExists()) {
-            $this->_session->setName('store_' . $this->getCode());
             $this->_session->start();
         }
         return $this->_session;

dev/tests/integration/framework/Magento/TestFramework/Event/Transaction.php

@@ -110,6 +110,7 @@ function ($errNo, $errStr, $errFile, $errLine) use ($test) {
                 $this->_eventManager->fireEvent('startTransaction', [$test]);
                 restore_error_handler();
             } catch (\Exception $e) {
+                $this->_isTransactionActive = false;
                 $test->getTestResultObject()->addFailure(
                     $test,
                     new \PHPUnit\Framework\AssertionFailedError((string)$e),
@@ -125,8 +126,8 @@ function ($errNo, $errStr, $errFile, $errLine) use ($test) {
     protected function _rollbackTransaction()
     {
         if ($this->_isTransactionActive) {
-            $this->_getConnection()->rollbackTransparentTransaction();
             $this->_isTransactionActive = false;
+            $this->_getConnection()->rollbackTransparentTransaction();
             $this->_eventManager->fireEvent('rollbackTransaction');
             $this->_getConnection()->closeConnection();
         }

lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php

@@ -92,7 +92,7 @@ protected function _getClassMethods()
     protected function isInterceptedMethod(\ReflectionMethod $method)
     {
         return !($method->isConstructor() || $method->isFinal() || $method->isStatic() || $method->isDestructor()) &&
-            !in_array($method->getName(), ['__sleep', '__wakeup', '__clone']);
+            !in_array($method->getName(), ['__sleep', '__wakeup', '__clone', '_resetState']);
     }
 
     /**

lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php

@@ -135,11 +135,21 @@ protected function _getClassMethods()
                 )
                 && !in_array(
                     $method->getName(),
-                    ['__sleep', '__wakeup', '__clone', '__debugInfo']
+                    ['__sleep', '__wakeup', '__clone', '__debugInfo', '_resetState']
                 )
             ) {
                 $methods[] = $this->_getMethodInfo($method);
             }
+            if ($method->getName() === '_resetState') {
+                $methods[] = [
+                    'name' => '_resetState',
+                    'returnType' => 'void',
+                    'body' => "if (\$this->_subject) {\n" .
+                        "    \$this->_subject->_resetState(); \n" .
+                        "}\n",
+                    'docblock' => ['shortDescription' => 'Reset state of proxied instance'],
+                ];
+            }
         }
 
         return $methods;

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

@@ -638,7 +638,13 @@ private function initIniOptions()
      */
     public function _resetState(): void
     {
-        session_write_close();
+        if (session_status() === PHP_SESSION_ACTIVE) {
+            session_write_close();
+            session_id('');
+        }
+        session_name('PHPSESSID');
+        session_unset();
         static::$urlHostCache = [];
+        $_SESSION = [];
     }
 }