Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4393 from turbo124/v5-stable

Browse Source 
Fixes for regression of migration
This commit is contained in:
David Bomba 2020-11-30 08:33:47 +11:00 committed by GitHub
commit fb5a4134c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.0.30 5.0.31

7
app/Http/Controllers/MigrationController.php
View File

@ -320,7 +320,8 @@ class MigrationController extends BaseController
$migration_file = $request->file($company->company_index) $migration_file = $request->file($company->company_index)
->storeAs( ->storeAs(
'migrations', 'migrations',
$request->file($company->company_index)->getClientOriginalName() $request->file($company->company_index)->getClientOriginalName(),
'local'
); );
if (app()->environment() == 'testing') { if (app()->environment() == 'testing') {
@ -328,7 +329,9 @@ class MigrationController extends BaseController
} }
try { try {
StartMigration::dispatch(base_path("storage/app/public/$migration_file"), $user, $fresh_company)->delay(now()->addSeconds(5)); // StartMigration::dispatch(base_path("storage/app/public/$migration_file"), $user, $fresh_company)->delay(now()->addSeconds(5));
info($migration_file);
StartMigration::dispatch($migration_file, $user, $fresh_company);
} catch (\Exception $e) { } catch (\Exception $e) {
info($e->getMessage()); info($e->getMessage());
} }

7
app/Jobs/Util/StartMigration.php
View File

@ -85,8 +85,7 @@ class StartMigration implements ShouldQueue
$this->company->save(); $this->company->save();
$zip = new ZipArchive(); $zip = new ZipArchive();
$archive = $zip->open($this->filepath); $archive = $zip->open(storage_path("app/{$this->filepath}"));
$filename = pathinfo($this->filepath, PATHINFO_FILENAME); $filename = pathinfo($this->filepath, PATHINFO_FILENAME);
try { try {
@ -94,14 +93,14 @@ class StartMigration implements ShouldQueue
throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.'); throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.');
} }
$zip->extractTo(storage_path("migrations/{$filename}")); $zip->extractTo(storage_path("app/migrations/{$filename}"));
$zip->close(); $zip->close();
if (app()->environment() == 'testing') { if (app()->environment() == 'testing') {
return true; return true;
} }
$file = storage_path("migrations/$filename/migration.json"); $file = storage_path("app/migrations/$filename/migration.json");
if (! file_exists($file)) { if (! file_exists($file)) {
throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.'); throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.');

9
app/Utils/Traits/AppSetup.php
View File

@ -128,13 +128,14 @@ trait AppSetup
} }
} }
// This should never happen, but this is login just in case. $words_count = count(explode(' ', trim($value)));
// Variables that will be replaced (updated with different content) should already be in .env file.
if (is_null($position)) { if (is_null($position)) {
$env[] = "{$property}=" . $value . "\n"; $words_count > 1 ? $env[] = "{$property}=" . '"' . $value . '"' . "\n" : $env[] = "{$property}=" . $value . "\n";
} else if ($words_count > 1) {
$env[$position] = "{$property}=" . '"' . $value . '"' . "\n"; // If value of variable is more than one word, surround with quotes.
} else { } else {
$env[$position] = "{$property}=" . $value . "\n"; $env[$position] = "{$property}=" . $value . "\n"; // Just a normal variable update, with prexisting keys.
} }
try { try {

2
config/ninja.php
View File

@ -12,7 +12,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/').'/', 'app_url' => rtrim(env('APP_URL', ''), '/').'/',
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.0.30', 'app_version' => '5.0.31',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),