Merge pull request #542 from magento-performance/as-store-url

Store Url fixes

Author: andimov

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

@@ -17,6 +17,7 @@
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Url\ModifierInterface;
 use Magento\Framework\Url\ScopeInterface as UrlScopeInterface;
 use Magento\Framework\UrlInterface;
@@ -43,7 +44,8 @@ class Store extends AbstractExtensibleModel implements
     AppScopeInterface,
     UrlScopeInterface,
     IdentityInterface,
-    StoreInterface
+    StoreInterface,
+    ResetAfterRequestInterface
 {
     /**
      * Store Id key name
@@ -466,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;
@@ -1421,4 +1422,17 @@ public function __debugInfo()
     {
         return [];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_baseUrlCache = [];
+        $this->_configCache = null;
+        $this->_configCacheBaseNodes = [];
+        $this->_dirCache = [];
+        $this->_urlCache = [];
+        $this->_baseUrlCache = [];
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoresTest.php

@@ -48,24 +48,13 @@ protected function setUp(): void
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
-     * @magentoApiDataFixture Magento/Store/_files/store.php
-     * @magentoApiDataFixture Magento/Store/_files/inactive_store.php
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
      */
-    public function testDefaultWebsiteAvailableStoreConfigs(): void
+    public function testNonDefaultWebsiteAvailableStoreConfigs(): void
     {
-        $storeConfigs = $this->storeConfigManager->getStoreConfigs();
-
-        $expectedAvailableStores = [];
-        $expectedAvailableStoreCodes = [
-            'default',
-            'test'
-        ];
-
-        foreach ($storeConfigs as $storeConfig) {
-            if (in_array($storeConfig->getCode(), $expectedAvailableStoreCodes)) {
-                $expectedAvailableStores[] = $storeConfig;
-            }
-        }
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs(['fixture_second_store', 'fixture_third_store']);
 
         $query
             = <<<QUERY
@@ -101,21 +90,37 @@ public function testDefaultWebsiteAvailableStoreConfigs(): void
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
 
         $this->assertArrayHasKey('availableStores', $response);
-        foreach ($expectedAvailableStores as $key => $storeConfig) {
+        foreach ($storeConfigs as $key => $storeConfig) {
             $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
         }
     }
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
-     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoApiDataFixture Magento/Store/_files/inactive_store.php
      */
-    public function testNonDefaultWebsiteAvailableStoreConfigs(): void
+    public function testDefaultWebsiteAvailableStoreConfigs(): void
     {
-        $storeConfigs = $this->storeConfigManager->getStoreConfigs(['fixture_second_store', 'fixture_third_store']);
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs();
+
+        $expectedAvailableStores = [];
+        $expectedAvailableStoreCodes = [
+            'default',
+            'test'
+        ];
+
+        foreach ($storeConfigs as $storeConfig) {
+            if (in_array($storeConfig->getCode(), $expectedAvailableStoreCodes)) {
+                $expectedAvailableStores[] = $storeConfig;
+            }
+        }
 
         $query
             = <<<QUERY
@@ -151,11 +156,10 @@ public function testNonDefaultWebsiteAvailableStoreConfigs(): void
   }
 }
 QUERY;
-        $headerMap = ['Store' => 'fixture_second_store'];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlQuery($query);
 
         $this->assertArrayHasKey('availableStores', $response);
-        foreach ($storeConfigs as $key => $storeConfig) {
+        foreach ($expectedAvailableStores as $key => $storeConfig) {
             $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
         }
     }
@@ -209,6 +213,8 @@ private function validateStoreConfig(StoreConfigInterface $storeConfig, array $r
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
      * @magentoApiDataFixture Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
      * @magentoConfigFixture web/url/use_store 1
      */
@@ -270,6 +276,8 @@ public function testAllStoreConfigsWithCodeInUrlEnabled(): void
 
     /**
      * @magentoConfigFixture default_store web/seo/use_rewrites 1
+     * @magentoConfigFixture default_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture default_store web/unsecure/base_link_url http://example.com/
      * @magentoApiDataFixture Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
      */
     public function testCurrentGroupStoreConfigs(): void

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/App/Request/Http.php

@@ -458,5 +458,6 @@ public function _resetState(): void
         $this->headers = null;
         $this->metadata = [];
         $this->content = '';
+        $this->distroBaseUrl = null;
     }
 }

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 = [];
     }
 }