@@ -79,8 +79,8 @@ public function tearDown()
79
79
*/
80
80
private function getModel ($ uri = null , $ mockAppConfig = true )
81
81
{
82
-
83
- $ model = $ this -> objectManager ->getObject (
82
+ $ testFrameworkObjectManager = new \ Magento \ Framework \ TestFramework \ Unit \ Helper \ ObjectManager ( $ this );
83
+ $ model = $ testFrameworkObjectManager ->getObject (
84
84
'Magento\Framework\App\Request\Http ' ,
85
85
[
86
86
'routeConfig ' => $ this ->_routerListMock ,
@@ -93,7 +93,7 @@ private function getModel($uri = null, $mockAppConfig = true)
93
93
94
94
if ($ mockAppConfig ) {
95
95
$ mockConfig = $ this ->getMock (\Magento \Framework \App \Config::class, [], [], '' , false );
96
- $ this -> objectManager ->setBackwardCompatibleProperty ($ model , 'appConfig ' , $ mockConfig );
96
+ $ testFrameworkObjectManager ->setBackwardCompatibleProperty ($ model , 'appConfig ' , $ mockConfig );
97
97
}
98
98
99
99
return $ model ;
@@ -346,9 +346,9 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header
346
346
->method ('getValue ' )
347
347
->with (\Magento \Framework \App \Request \Http::XML_PATH_OFFLOADER_HEADER , ScopeConfigInterface::SCOPE_TYPE_DEFAULT )
348
348
->willReturn ($ configOffloadHeader );
349
-
350
- $ this -> objectManager ->setBackwardCompatibleProperty ($ this ->_model , 'appConfig ' , $ configMock );
351
- $ this -> objectManager ->setBackwardCompatibleProperty ($ this ->_model , 'SSLOffloadHeader ' , null );
349
+ $ testFrameworkObjectManager = new \ Magento \ Framework \ TestFramework \ Unit \ Helper \ ObjectManager ( $ this );
350
+ $ testFrameworkObjectManager ->setBackwardCompatibleProperty ($ this ->_model , 'appConfig ' , $ configMock );
351
+ $ testFrameworkObjectManager ->setBackwardCompatibleProperty ($ this ->_model , 'SSLOffloadHeader ' , null );
352
352
353
353
$ this ->_model ->getServer ()->set ($ headerOffloadKey , $ headerOffloadValue );
354
354
$ this ->_model ->getServer ()->set ('HTTPS ' , $ serverHttps );
0 commit comments