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

Merge pull request #6746 from turbo124/master

Browse Source 
PHP 7.4 Support
This commit is contained in:
David Bomba 2021-09-29 19:11:57 +10:00 committed by GitHub
commit 136ae88f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 872 additions and 833 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Account.php
View File

@ -1123,7 +1123,11 @@ class Account extends Eloquent
Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT); Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT);
Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT); Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT);
$currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY; //php 7.3
// $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
//php 7.4
$currencyId = ($client && $client->currency_id) ? $client->currency_id : ($this->currency_id ?: DEFAULT_CURRENCY);
$locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE); $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE);
Session::put(SESSION_CURRENCY, $currencyId); Session::put(SESSION_CURRENCY, $currencyId);

7
app/Models/Traits/Inviteable.php
View File

@ -74,7 +74,12 @@ trait Inviteable
} }
} }
return $hasValue ? implode($parts, '<br/>') : false; //php 7.3
// return $hasValue ? implode($parts, '<br/>') : false;
//php 7.4
return $hasValue ? implode('<br/>', $parts) : false;
} }
/** /**

8
composer.json
View File

@ -52,8 +52,8 @@
"league/flysystem-rackspace": "~1.0", "league/flysystem-rackspace": "~1.0",
"league/fractal": "0.13.*", "league/fractal": "0.13.*",
"maatwebsite/excel": "~2.0", "maatwebsite/excel": "~2.0",
"mashape/unirest-php": "^3.0", "mashape/unirest-php": "^3.0.5",
"mpdf/mpdf": "7.1.7", "mpdf/mpdf": "^8.0",
"nesbot/carbon": "^1.26", "nesbot/carbon": "^1.26",
"nwidart/laravel-modules": "2.0.*", "nwidart/laravel-modules": "2.0.*",
"omnipay/authorizenet": "dev-solution-id as 2.5.0", "omnipay/authorizenet": "dev-solution-id as 2.5.0",
@ -187,6 +187,10 @@
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/hillelcoren/omnipay-authorizenet" "url": "https://github.com/hillelcoren/omnipay-authorizenet"
},
{
"type": "vcs",
"url": "https://github.com/loverg-c/unirest-php"
} }
] ]
} }

1684
composer.lock generated
View File

File diff suppressed because it is too large Load Diff