File tree 1 file changed +5
-4
lines changed
1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -40,18 +40,19 @@ if ($input->hasParameterOption('-vvv', true)) {
40
40
41
41
$ containerFactory = new ContainerFactory ([new ApplicationExtension ()]);
42
42
43
- if (is_file ($ vendorDir . '/../guides.xml ' )) {
43
+ $ projectConfig = realpath ($ vendorDir . '/../guides.xml ' );
44
+ if (is_file ($ projectConfig )) {
44
45
if ($ verbosity === 3 ) {
45
- echo 'Loading guides.xml from ' . $ vendorDir . ' /../guides.xml ' . PHP_EOL ;
46
+ echo 'Loading guides.xml from ' . $ projectConfig . PHP_EOL ;
46
47
}
47
48
// vendor folder was placed directly into the project directory
48
- $ containerFactory ->addConfigFile ($ vendorDir . ' /../guides.xml ' );
49
+ $ containerFactory ->addConfigFile ($ projectConfig );
49
50
}
50
51
51
52
$ workingDir = $ input ->getParameterOption ('--working-dir ' , getcwd (), true );
52
53
$ localConfig = $ input ->getParameterOption ('--config ' , $ workingDir , true ).'/guides.xml ' ;
53
54
54
- if (is_file ($ localConfig )) {
55
+ if (is_file ($ localConfig ) && realpath ( $ localConfig ) !== $ projectConfig ) {
55
56
if ($ verbosity === 3 ) {
56
57
echo 'Loading guides.xml from ' . $ localConfig . PHP_EOL ;
57
58
}
You can’t perform that action at this time.
0 commit comments