tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUG Fix upgrade-code doctor with public path

Browse Source
This commit is contained in:
Damian Mooyman 2018-01-16 15:38:12 +13:00
parent 5a18c3c405
commit 20348b5f42
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Dev/Upgrade/UpgradeBootstrap.php
View File

@ -36,11 +36,13 @@ class UpgradeBootstrap
*/ */
public function __invoke(InputInterface $input, OutputInterface $output, $basePath) public function __invoke(InputInterface $input, OutputInterface $output, $basePath)
{ {
$publicPath = file_exists("{$basePath}/public") ? "{$basePath}/public" : $basePath;
// Fail if destination isn't writable // Fail if destination isn't writable
$this->ensureWritable($basePath); $this->ensureWritable($publicPath);
// Check source // Check source
$source = $basePath . '/vendor/silverstripe/recipe-core'; $source = $basePath . '/vendor/silverstripe/recipe-core/public';
if (!is_dir($source)) { if (!is_dir($source)) {
throw new BadMethodCallException("silverstripe/recipe-core is not installed."); throw new BadMethodCallException("silverstripe/recipe-core is not installed.");
} }
@ -49,7 +51,7 @@ class UpgradeBootstrap
$output->writeln("Upgrading project bootstrapping files:"); $output->writeln("Upgrading project bootstrapping files:");
foreach ($this->files as $file => $canCreate) { foreach ($this->files as $file => $canCreate) {
$fileSource = $source . '/' . $file; $fileSource = $source . '/' . $file;
$fileDest = $basePath . '/' . $file; $fileDest = $publicPath . '/' . $file;
// Skip if we should only upgrade existing files // Skip if we should only upgrade existing files
if (!$canCreate && !file_exists($fileDest)) { if (!$canCreate && !file_exists($fileDest)) {