Merge branch 'DDC-3756' into 2.5
This commit is contained in:
commit
e4e59d8064
@ -80,7 +80,7 @@ class ConvertDoctrine1Schema
|
|||||||
$schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file)));
|
$schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file)));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file)));
|
$schema = array_merge($schema, (array) Yaml::parse(file_get_contents($path)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user