Merge remote-tracking branch '37187/patch-14' into blth-del10131-commdashpr

Author: engcom-Dash

dev/tests/integration/framework/Magento/TestFramework/Store/StoreManager.php

@@ -1,17 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\TestFramework\Store;
 
+use Magento\Framework\Interception\InterceptorInterface;
 use Magento\TestFramework\App\Config;
 use Magento\TestFramework\ObjectManager;
 
 /**
  * Integration tests decoration of store manager
- *
- * @package Magento\TestFramework\Store
  */
 class StoreManager implements \Magento\Store\Model\StoreManagerInterface
 {
@@ -43,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCurrentStore($store)
     {
@@ -52,7 +51,7 @@ public function setCurrentStore($store)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsSingleStoreModeAllowed($value)
     {
@@ -61,7 +60,7 @@ public function setIsSingleStoreModeAllowed($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function hasSingleStore()
     {
@@ -71,7 +70,7 @@ public function hasSingleStore()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isSingleStoreMode()
     {
@@ -81,7 +80,7 @@ public function isSingleStoreMode()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStore($storeId = null)
     {
@@ -91,7 +90,7 @@ public function getStore($storeId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStores($withDefault = false, $codeKey = false)
     {
@@ -101,7 +100,7 @@ public function getStores($withDefault = false, $codeKey = false)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getWebsite($websiteId = null)
     {
@@ -111,7 +110,7 @@ public function getWebsite($websiteId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getWebsites($withDefault = false, $codeKey = false)
     {
@@ -121,13 +120,16 @@ public function getWebsites($withDefault = false, $codeKey = false)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function reinitStores()
     {
         //In order to restore configFixture values
         $testAppConfig = ObjectManager::getInstance()->get(Config::class);
         $reflection = new \ReflectionClass($testAppConfig);
+        if ($reflection->implementsInterface(InterceptorInterface::class)) {
+            $reflection = $reflection->getParentClass();
+        }
         $dataProperty = $reflection->getProperty('data');
         $dataProperty->setAccessible(true);
         $savedConfig = $dataProperty->getValue($testAppConfig);
@@ -139,7 +141,7 @@ public function reinitStores()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultStoreView()
     {
@@ -149,7 +151,7 @@ public function getDefaultStoreView()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getGroup($groupId = null)
     {
@@ -159,7 +161,7 @@ public function getGroup($groupId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getGroups($withDefault = false)
     {