kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:43:43 +01:00
parent 56b9b66352
commit 5b8e01fbfb
240 changed files with 8059 additions and 7895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/Api/Models/Recurrence/StoreControllerTest.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1);
namespace Tests\Api\Models\Recurrence;
use Laravel\Passport\Passport;
use Log;
use Tests\Objects\Field;
@@ -36,7 +37,8 @@ use Tests\Traits\TestHelpers;
*/
class StoreControllerTest extends TestCase
{
use TestHelpers, CollectsValues;
use TestHelpers;
use CollectsValues;
/**
* @return array
@@ -44,7 +46,6 @@ class StoreControllerTest extends TestCase
public function emptyDataProvider(): array
{
return [[[]]];
}
/**
@@ -63,7 +64,7 @@ class StoreControllerTest extends TestCase
public function storeDataProvider(): array
{
// some test configs:
$configuration = new TestConfiguration;
$configuration = new TestConfiguration();
// default test set:
$defaultSet = new FieldSet();
@@ -122,44 +123,44 @@ class StoreControllerTest extends TestCase
$configuration->addMandatoryFieldSet($defaultSet);
// add optional set
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('description', 'uuid'));
$configuration->addOptionalFieldSet('description', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('apply_rules', 'boolean'));
$configuration->addOptionalFieldSet('apply_rules', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('notes', 'uuid'));
$configuration->addOptionalFieldSet('notes', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('active', 'boolean'));
$configuration->addOptionalFieldSet('active', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('repetitions/0/skip', 'random-skip'));
$configuration->addOptionalFieldSet('skip', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('transactions/0/foreign_amount', 'random-amount'));
$fieldSet->addField(Field::createBasic('transactions/0/foreign_currency_id', 'random-currency-id'));
$configuration->addOptionalFieldSet('foreign1', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('transactions/0/budget_id', 'random-budget-id'));
$configuration->addOptionalFieldSet('budget', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('transactions/0/category_id', 'random-category-id'));
$configuration->addOptionalFieldSet('category', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('transactions/0/tags', 'random-tags'));
$configuration->addOptionalFieldSet('tags', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->addField(Field::createBasic('transactions/0/piggy_bank_id', 'random-piggy-id'));
$configuration->addOptionalFieldSet('piggy', $fieldSet);
@@ -185,7 +186,5 @@ class StoreControllerTest extends TestCase
// run account store with a minimal data set:
$address = route('api.v1.recurrences.store');
$this->assertPOST($address, $submission);
}
}

37
tests/Api/Models/Recurrence/UpdateControllerTest.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1);
namespace Tests\Api\Models\Recurrence;
use Laravel\Passport\Passport;
use Log;
use Tests\Objects\Field;
@@ -36,7 +37,8 @@ use Tests\Traits\TestHelpers;
*/
class UpdateControllerTest extends TestCase
{
use TestHelpers, CollectsValues;
use TestHelpers;
use CollectsValues;
/**
*
@@ -63,107 +65,106 @@ class UpdateControllerTest extends TestCase
$route = route('api.v1.recurrences.update', $submission['parameters']);
$this->assertPUT($route, $submission);
}
/**
* @return array
*/
public function updateDataProvider(): array
{
$configuration = new TestConfiguration;
$configuration = new TestConfiguration();
// optional fields
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('title', 'uuid');
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('title', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('description', 'uuid');
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('description', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('first_date', 'random-past-date');
$field->ignorableFields = ['repetitions'];
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('first_date', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('apply_rules', 'boolean');
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('apply_rules', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('active', 'boolean');
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('active', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('repetitions/0/type', 'static-ndom');
$field->ignorableFields = ['repetitions/0/description', 'repetitions/0/occurrences'];
$fieldSet->addField($field);
$fieldSet->addField(Field::createBasic('repetitions/0/moment', 'moment-ndom'));
$configuration->addOptionalFieldSet('ndom', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('repetitions/0/type', 'static-monthly');
$field->ignorableFields = ['repetitions/0/description', 'repetitions/0/occurrences'];
$fieldSet->addField($field);
$fieldSet->addField(Field::createBasic('repetitions/0/moment', 'moment-monthly'));
$configuration->addOptionalFieldSet('monthly', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('repetitions/0/type', 'static-yearly');
$field->ignorableFields = ['repetitions/0/description', 'repetitions/0/occurrences'];
$fieldSet->addField($field);
$fieldSet->addField(Field::createBasic('repetitions/0/moment', 'random-past-date'));
$configuration->addOptionalFieldSet('yearly', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('repetitions/0/skip', 'random-skip');
$field->ignorableFields = ['repetitions/0/description', 'repetitions/0/occurrences'];
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('skip', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('repetitions/0/weekend', 'weekend');
$field->ignorableFields = ['repetitions/0/description', 'repetitions/0/occurrences'];
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('weekend', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$fieldSet->addField(Field::createBasic('transactions/0/foreign_amount', 'random-amount'));
$field = Field::createBasic('transactions/0/foreign_currency_id', 'random-currency-id');
$field->ignorableFields = ['transactions/0/foreign_currency_code', 'transactions/0/foreign_currency_symbol'];
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('foreign1', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('transactions/0/budget_id', 'random-budget-id');
$field->ignorableFields = ['transactions/0/budget_name'];
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('budget', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('transactions/0/category_id', 'random-category-id');
$field->ignorableFields = ['transactions/0/category_name'];
$fieldSet->addField($field);
$configuration->addOptionalFieldSet('category', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$fieldSet->addField(Field::createBasic('transactions/0/tags', 'random-tags'));
$configuration->addOptionalFieldSet('tags', $fieldSet);
$fieldSet = new FieldSet;
$fieldSet = new FieldSet();
$fieldSet->parameters = [1];
$field = Field::createBasic('transactions/0/piggy_bank_id', 'random-piggy-id');
$field->ignorableFields = ['transactions/0/piggy_bank_name'];