Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for psalm

Browse Source
This commit is contained in:
David Bomba 2022-07-18 10:26:42 +10:00
parent 5cdb48e7f6
commit 6e4132f08a
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Utils/SystemHealth.php
View File

@ -70,7 +70,7 @@ class SystemHealth
], ],
'env_writable' => self::checkEnvWritable(), 'env_writable' => self::checkEnvWritable(),
//'mail' => self::testMailServer(), //'mail' => self::testMailServer(),
'simple_db_check' => (bool) self::simpleDbCheck(), 'simple_db_check' => self::simpleDbCheck(),
'cache_enabled' => self::checkConfigCache(), 'cache_enabled' => self::checkConfigCache(),
'phantom_enabled' => (bool) config('ninja.phantomjs_pdf_generation'), 'phantom_enabled' => (bool) config('ninja.phantomjs_pdf_generation'),
'exec' => (bool) self::checkExecWorks(), 'exec' => (bool) self::checkExecWorks(),
@ -226,10 +226,10 @@ class SystemHealth
if (! config('ninja.db.multi_db_enabled')) { if (! config('ninja.db.multi_db_enabled')) {
try { try {
$pdo = DB::connection()->getPdo(); $pdo = DB::connection()->getPdo();
$result[] = [DB::connection()->getDatabaseName() => true]; $x = DB::connection()->getDatabaseName();
$result['success'] = true; $result['success'] = true;
} catch (Exception $e) { } catch (Exception $e) {
$result[] = [config('database.connections.'.config('database.default').'.database') => false]; // $x = [config('database.connections.'.config('database.default').'.database') => false];
$result['success'] = false; $result['success'] = false;
$result['message'] = $e->getMessage(); $result['message'] = $e->getMessage();
} }
@ -239,10 +239,10 @@ class SystemHealth
try { try {
$pdo = DB::connection()->getPdo(); $pdo = DB::connection()->getPdo();
$result[] = [DB::connection()->getDatabaseName() => true]; $x = DB::connection()->getDatabaseName();
$result['success'] = true; $result['success'] = true;
} catch (Exception $e) { } catch (Exception $e) {
$result[] = [config('database.connections.'.config('database.default').'.database') => false]; // $x = [config('database.connections.'.config('database.default').'.database') => false];
$result['success'] = false; $result['success'] = false;
$result['message'] = $e->getMessage(); $result['message'] = $e->getMessage();
} }

2
app/Utils/Traits/BulkOptions.php
View File

@ -38,7 +38,6 @@ trait BulkOptions
* Available bulk options - used in requests (eg. BulkClientRequests). * Available bulk options - used in requests (eg. BulkClientRequests).
* *
* @return array * @return array
* @var array
*/ */
public function getBulkOptions() public function getBulkOptions()
{ {
@ -51,7 +50,6 @@ trait BulkOptions
* Shared rules for bulk requests. * Shared rules for bulk requests.
* *
* @return array * @return array
* @var array
*/ */
public function getGlobalRules() public function getGlobalRules()
{ {

6
app/Utils/Traits/GeneratesConvertedQuoteCounter.php
View File

@ -51,7 +51,7 @@ trait GeneratesConvertedQuoteCounter
return $this->getNextEntityNumber($invoice, $client, intval($counter)); return $this->getNextEntityNumber($invoice, $client, intval($counter));
} }
private function getNextEntityNumber($invoice, Client $client, $counter) private function getNextEntityNumber($invoice, Client $client, $counter='')
{ {
$settings = $client->getMergedSettings(); $settings = $client->getMergedSettings();
@ -365,9 +365,9 @@ trait GeneratesConvertedQuoteCounter
return (bool) $client->getSetting('shared_invoice_quote_counter'); return (bool) $client->getSetting('shared_invoice_quote_counter');
} }
if ($type == 'credit') { //if ($type == 'credit') {
return (bool) $client->getSetting('shared_invoice_credit_counter'); return (bool) $client->getSetting('shared_invoice_credit_counter');
}
} }
/** /**