Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Fix regression where .env file was being deleted erroneously (#3515)

Browse Source 
* Fixes for tests

* Fixes for self updates
This commit is contained in:
David Bomba 2020-03-23 07:45:16 +11:00 committed by GitHub
parent 54f3701cd5
commit c8e3c7ae68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Console/Commands/ArtisanUpgrade.php
View File

@ -41,16 +41,6 @@ class ArtisanUpgrade extends Command
public function handle() public function handle()
{ {
set_time_limit(0); set_time_limit(0);
// Composer\Factory::getHomeDir() method
// needs COMPOSER_HOME environment variable set
putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
// call `composer install` command programmatically
$input = new ArrayInput(array('command' => 'install'));
$application = new Application();
//$application->setAutoExit(false); // prevent `$application->run` method from exitting the script
$application->run($input);
try { try {
Artisan::call('migrate'); Artisan::call('migrate');
@ -69,5 +59,13 @@ class ArtisanUpgrade extends Command
} catch (Exception $e) { } catch (Exception $e) {
\Log::error("I wasn't able to restart the queue"); \Log::error("I wasn't able to restart the queue");
} }
putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
$input = new ArrayInput(array('command' => 'install'));
$application = new Application();
//$application->setAutoExit(false); // prevent `$application->run` method from exitting the script
$application->run($input);
} }
} }

2
app/Models/CompanyGateway.php
View File

@ -196,7 +196,7 @@ class CompanyGateway extends BaseModel
*/ */
public function getPublishableKey() :string public function getPublishableKey() :string
{ {
return $this->getConfigField('publishable_key'); return $this->getConfigField('publishableKey');
} }
/** /**

2
app/PaymentDrivers/StripePaymentDriver.php
View File

@ -59,7 +59,7 @@ class StripePaymentDriver extends BasePaymentDriver
*/ */
public function init() :void public function init() :void
{ {
Stripe::setApiKey($this->company_gateway->getConfigField('23_apiKey')); Stripe::setApiKey($this->company_gateway->getConfigField('apiKey'));
} }
/** /**

2
app/Utils/Ninja.php
View File

@ -64,7 +64,7 @@ class Ninja
$data = trim(CurlUtils::post('https://license.invoiceninja.com/api/check', $data)); $data = trim(CurlUtils::post('https://license.invoiceninja.com/api/check', $data));
$data = json_decode($data); $data = json_decode($data);
if ($data->message == sha1(config('ninja.license'))) { if ($data && property_exists($data, 'message') && $data->message == sha1(config('ninja.license'))) {
return false; return false;
} else { } else {
return true; return true;

4
app/Utils/SystemHealth.php
View File

@ -55,7 +55,6 @@ class SystemHealth
'dbs' => self::dbCheck(), 'dbs' => self::dbCheck(),
'mail' => self::testMailServer(), 'mail' => self::testMailServer(),
'env_writable' => self::checkEnvWritable(), 'env_writable' => self::checkEnvWritable(),
'env_exists'
]; ];
} }
@ -122,6 +121,7 @@ class SystemHealth
private static function checkEnvWritable() private static function checkEnvWritable()
{ {
return @fopen(base_path().'/.env', 'w'); return is_writable(base_path().'/.env');
//return @fopen(base_path().'/.env', 'w');
} }
} }