File tree Expand file tree Collapse file tree 3 files changed +10
-2
lines changed
app/code/Magento/Backend/etc
dev/tests/integration/framework
tests/unit/testsuite/Magento/Test Expand file tree Collapse file tree 3 files changed +10
-2
lines changed Original file line number Diff line number Diff line change 44
44
<seo >
45
45
<use_rewrites >0</use_rewrites >
46
46
</seo >
47
+ <secure >
48
+ <use_in_frontend >1</use_in_frontend >
49
+ <use_in_adminhtml >1</use_in_adminhtml >
50
+ </secure >
47
51
</web >
48
52
</default >
49
53
<stores >
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ class Application
27
27
/**
28
28
* Default application area.
29
29
*/
30
- const DEFAULT_APP_AREA = 'global ' ;
30
+ public const DEFAULT_APP_AREA = 'global ' ;
31
31
32
32
/**
33
33
* DB vendor adapter instance.
@@ -276,6 +276,8 @@ protected function getInstallConfig()
276
276
if (null === $ this ->installConfig ) {
277
277
// phpcs:ignore Magento2.Security.IncludeFile
278
278
$ this ->installConfig = include $ this ->installConfigFile ;
279
+ $ this ->installConfig ['use-secure ' ] = '0 ' ;
280
+ $ this ->installConfig ['use-secure-admin ' ] = '0 ' ;
279
281
}
280
282
return $ this ->installConfig ;
281
283
}
Original file line number Diff line number Diff line change @@ -183,14 +183,16 @@ public function installDataProvider()
183
183
$ installShellCommandExpectation = [
184
184
PHP_BINARY . ' -f %s setup:install -vvv ' .
185
185
'--db-host=%s --db-user=%s --db-password=%s --db-name=%s --db-prefix=%s ' .
186
- '--magento-init-params=%s ' ,
186
+ '--use-secure=%s --use-secure-admin=%s -- magento-init-params=%s ' ,
187
187
[
188
188
BP . '/bin/magento ' ,
189
189
'/tmp/mysql.sock ' ,
190
190
'root ' ,
191
191
'' ,
192
192
'magento_integration_tests ' ,
193
193
'' ,
194
+ '0 ' ,
195
+ '0 ' ,
194
196
$ this ->getInitParamsQuery (sys_get_temp_dir ()),
195
197
]
196
198
];
You can’t perform that action at this time.
0 commit comments