mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-21 19:47:48 +00:00
Reformat various code.
This commit is contained in:
14
app/User.php
14
app/User.php
@@ -302,9 +302,9 @@ class User extends Authenticatable
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the models LDAP domain.
|
* Get the models LDAP domain.
|
||||||
|
* @return string
|
||||||
* @deprecated
|
* @deprecated
|
||||||
*
|
*
|
||||||
* @return string
|
|
||||||
*/
|
*/
|
||||||
public function getLdapDomain()
|
public function getLdapDomain()
|
||||||
{
|
{
|
||||||
@@ -313,9 +313,9 @@ class User extends Authenticatable
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the database column name of the domain.
|
* Get the database column name of the domain.
|
||||||
|
* @return string
|
||||||
* @deprecated
|
* @deprecated
|
||||||
*
|
*
|
||||||
* @return string
|
|
||||||
*/
|
*/
|
||||||
public function getLdapDomainColumn()
|
public function getLdapDomainColumn()
|
||||||
{
|
{
|
||||||
@@ -324,9 +324,9 @@ class User extends Authenticatable
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the models LDAP GUID.
|
* Get the models LDAP GUID.
|
||||||
|
* @return string
|
||||||
* @deprecated
|
* @deprecated
|
||||||
*
|
*
|
||||||
* @return string
|
|
||||||
*/
|
*/
|
||||||
public function getLdapGuid()
|
public function getLdapGuid()
|
||||||
{
|
{
|
||||||
@@ -335,9 +335,9 @@ class User extends Authenticatable
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the models LDAP GUID database column name.
|
* Get the models LDAP GUID database column name.
|
||||||
|
* @return string
|
||||||
* @deprecated
|
* @deprecated
|
||||||
*
|
*
|
||||||
* @return string
|
|
||||||
*/
|
*/
|
||||||
public function getLdapGuidColumn()
|
public function getLdapGuidColumn()
|
||||||
{
|
{
|
||||||
@@ -456,11 +456,11 @@ class User extends Authenticatable
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the models LDAP domain.
|
* Set the models LDAP domain.
|
||||||
* @deprecated
|
|
||||||
*
|
|
||||||
* @param string $domain
|
* @param string $domain
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
|
* @deprecated
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
public function setLdapDomain($domain)
|
public function setLdapDomain($domain)
|
||||||
{
|
{
|
||||||
@@ -469,10 +469,10 @@ class User extends Authenticatable
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the models LDAP GUID.
|
* Set the models LDAP GUID.
|
||||||
* @deprecated
|
|
||||||
* @param string $guid
|
* @param string $guid
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
|
* @deprecated
|
||||||
*/
|
*/
|
||||||
public function setLdapGuid($guid)
|
public function setLdapGuid($guid)
|
||||||
{
|
{
|
||||||
|
@@ -51,6 +51,7 @@ declare(strict_types=1);
|
|||||||
* For the full copyright and license information, please view the LICENSE
|
* For the full copyright and license information, please view the LICENSE
|
||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use FireflyIII\Support\Twig\AmountFormat;
|
use FireflyIII\Support\Twig\AmountFormat;
|
||||||
use FireflyIII\Support\Twig\General;
|
use FireflyIII\Support\Twig\General;
|
||||||
use FireflyIII\Support\Twig\Rule;
|
use FireflyIII\Support\Twig\Rule;
|
||||||
@@ -194,7 +195,7 @@ return [
|
|||||||
'ExpandedForm' => [
|
'ExpandedForm' => [
|
||||||
'is_safe' => [
|
'is_safe' => [
|
||||||
'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location', 'file', 'staticText',
|
'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location', 'file', 'staticText',
|
||||||
'password', 'nonSelectableAmount', 'number', 'amountNoCurrency', 'percentage','objectGroup'
|
'password', 'nonSelectableAmount', 'number', 'amountNoCurrency', 'percentage', 'objectGroup',
|
||||||
|
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
@@ -34,7 +34,7 @@ return [
|
|||||||
'4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption',
|
'4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption',
|
||||||
'4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.',
|
'4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.',
|
||||||
'4.8.1' => 'This version of Firefly III requires PHP7.3.',
|
'4.8.1' => 'This version of Firefly III requires PHP7.3.',
|
||||||
'5.3.0' => 'This version of Firefly III requires PHP7.4.'
|
'5.3.0' => 'This version of Firefly III requires PHP7.4.',
|
||||||
],
|
],
|
||||||
'install' => [
|
'install' => [
|
||||||
'4.3' => 'Welcome to Firefly! Make sure you follow the installation guide. If you need more help, please check Github or the Firefly III website. The installation guide has a FAQ which you should check out as well.',
|
'4.3' => 'Welcome to Firefly! Make sure you follow the installation guide. If you need more help, please check Github or the Firefly III website. The installation guide has a FAQ which you should check out as well.',
|
||||||
@@ -47,7 +47,7 @@ return [
|
|||||||
'4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption',
|
'4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption',
|
||||||
'4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.',
|
'4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.',
|
||||||
'4.8.1' => 'This version of Firefly III requires PHP7.3.',
|
'4.8.1' => 'This version of Firefly III requires PHP7.3.',
|
||||||
'5.3.0' => 'This version of Firefly III requires PHP7.4.'
|
'5.3.0' => 'This version of Firefly III requires PHP7.4.',
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
@@ -31,6 +31,16 @@ use Illuminate\Support\Facades\Schema;
|
|||||||
*/
|
*/
|
||||||
class CreateLocalPersonalAccessTokensTable extends Migration
|
class CreateLocalPersonalAccessTokensTable extends Migration
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::dropIfExists('personal_access_tokens');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the migrations.
|
* Run the migrations.
|
||||||
*
|
*
|
||||||
@@ -50,14 +60,4 @@ class CreateLocalPersonalAccessTokensTable extends Migration
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Reverse the migrations.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function down()
|
|
||||||
{
|
|
||||||
Schema::dropIfExists('personal_access_tokens');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -46,7 +46,7 @@ class AccountTypeSeeder extends Seeder
|
|||||||
AccountType::RECONCILIATION,
|
AccountType::RECONCILIATION,
|
||||||
AccountType::DEBT,
|
AccountType::DEBT,
|
||||||
AccountType::MORTGAGE,
|
AccountType::MORTGAGE,
|
||||||
AccountType::LIABILITY_CREDIT
|
AccountType::LIABILITY_CREDIT,
|
||||||
];
|
];
|
||||||
foreach ($types as $type) {
|
foreach ($types as $type) {
|
||||||
try {
|
try {
|
||||||
|
@@ -40,7 +40,7 @@ class TransactionTypeSeeder extends Seeder
|
|||||||
TransactionType::OPENING_BALANCE,
|
TransactionType::OPENING_BALANCE,
|
||||||
TransactionType::RECONCILIATION,
|
TransactionType::RECONCILIATION,
|
||||||
TransactionType::INVALID,
|
TransactionType::INVALID,
|
||||||
TransactionType::LIABILITY_CREDIT
|
TransactionType::LIABILITY_CREDIT,
|
||||||
];
|
];
|
||||||
|
|
||||||
foreach ($types as $type) {
|
foreach ($types as $type) {
|
||||||
|
Reference in New Issue
Block a user