Add newlines [skip ci]

This commit is contained in:
James Cole 2017-07-07 08:09:42 +02:00
parent dd508dbc49
commit 71a41bc00d
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
58 changed files with 94 additions and 96 deletions

View File

@ -16,9 +16,7 @@ namespace FireflyIII\Console\Commands;
use FireflyIII\Import\Logging\CommandHandler;
use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
use Log;

View File

@ -53,4 +53,4 @@ class AmountFilter implements FilterInterface
}
);
}
}
}

View File

@ -31,4 +31,4 @@ class EmptyFilter implements FilterInterface
{
return $set;
}
}
}

View File

@ -23,4 +23,4 @@ interface FilterInterface
*/
public function filter(Collection $set): Collection;
}
}

View File

@ -70,4 +70,4 @@ class InternalTransferFilter implements FilterInterface
}
}
}

View File

@ -44,4 +44,4 @@ class NegativeAmountFilter implements FilterInterface
}
);
}
}
}

View File

@ -60,4 +60,4 @@ class OpposingAccountFilter implements FilterInterface
}
);
}
}
}

View File

@ -47,4 +47,4 @@ class PositiveAmountFilter implements FilterInterface
}
);
}
}
}

View File

@ -55,4 +55,4 @@ class TransferFilter implements FilterInterface
return $new;
}
}
}

View File

@ -196,4 +196,4 @@ class PopupReport implements PopupReportInterface
return $journals;
}
}
}

View File

@ -80,4 +80,4 @@ interface PopupReportInterface
* @return Collection
*/
public function byIncome(Account $account, array $attributes): Collection;
}
}

View File

@ -105,7 +105,6 @@ class AttachmentController extends Controller
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
/** @var LaravelResponse $response */
$response = response($content, 200);
$response

View File

@ -364,4 +364,4 @@ class TagReportController extends Controller
return $grouped;
}
}
}

View File

@ -246,7 +246,7 @@ class ImportController extends Controller
/** @var ImportRoutine $routine */
$routine = app(ImportRoutine::class);
$routine->setJob($job);
$result = $routine->run();
$result = $routine->run();
if ($result) {
return Response::json(['run' => 'ok']);
}

View File

@ -62,4 +62,4 @@ class ExchangeController extends Controller
return Response::json($return);
}
}
}

View File

@ -329,8 +329,8 @@ class PiggyBankController extends Controller
Session::flash(
'error', strval(
trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
)
trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
)
);
return redirect(route('piggy-banks.index'));

View File

@ -86,7 +86,7 @@ class TransactionController extends Controller
$first = $repository->first();
$start = $first->date ?? new Carbon;
$end = new Carbon;
$path = '/transactions/'.$what.'/all/';
$path = '/transactions/' . $what . '/all/';
}
// prep for "specific date" view.

View File

@ -34,13 +34,6 @@ interface ConfiguratorInterface
*/
public function configureJob(array $data): bool;
/**
* @param ImportJob $job
*
* @return void
*/
public function setJob(ImportJob $job);
/**
* Return the data required for the next step in the job configuration.
*
@ -62,4 +55,11 @@ interface ConfiguratorInterface
*/
public function isJobConfigured(): bool;
}
/**
* @param ImportJob $job
*
* @return void
*/
public function setJob(ImportJob $job);
}

View File

@ -156,4 +156,4 @@ class CsvConfigurator implements ConfiguratorInterface
return $class;
}
}
}

View File

@ -232,4 +232,4 @@ class CsvProcessor implements FileProcessorInterface
return $row;
}
}
}

View File

@ -39,4 +39,4 @@ interface FileProcessorInterface
* @return FileProcessorInterface
*/
public function setJob(ImportJob $job): FileProcessorInterface;
}
}

View File

@ -296,4 +296,4 @@ class ImportAccount
}
}
}

View File

@ -225,4 +225,4 @@ class ImportBill
return true;
}
}
}

View File

@ -226,4 +226,4 @@ class ImportBudget
}
}
}

View File

@ -30,33 +30,17 @@ class ImportCategory
private $repository;
/** @var User */
private $user;
/**
* @param array $id
*/
public function setId(array $id)
{
$this->id = $id;
}
/**
* ImportCategory constructor.
*/
public function __construct()
{
$this->category = new Category();
$this->category = new Category();
$this->repository = app(CategoryRepositoryInterface::class);
Log::debug('Created ImportCategory.');
}
/**
* @param array $name
*/
public function setName(array $name)
{
$this->name = $name;
}
/**
* @return Category
*/
@ -68,6 +52,23 @@ class ImportCategory
return $this->category;
}
/**
* @param array $id
*/
public function setId(array $id)
{
$this->id = $id;
}
/**
* @param array $name
*/
public function setName(array $name)
{
$this->name = $name;
}
/**
* @param User $user
*/
@ -100,7 +101,7 @@ class ImportCategory
if (count($this->name) === 3) {
/** @var Collection $categories */
$categories = $this->repository->getCategories();
$name = $this->name['value'];
$name = $this->name['value'];
Log::debug(sprintf('Finding category with name %s', $name));
$filtered = $categories->filter(
function (Category $category) use ($name) {
@ -219,4 +220,4 @@ class ImportCategory
}
}
}

View File

@ -53,7 +53,7 @@ class ImportCurrency
}
Log::debug('In createCurrency()');
// check if any of them is mapped:
$mapped = $this->findMappedObject();
$mapped = $this->findMappedObject();
if (!is_null($mapped->id)) {
@ -215,4 +215,4 @@ class ImportCurrency
}
}
}

View File

@ -272,4 +272,4 @@ class ImportJournal
break;
}
}
}
}

View File

@ -154,4 +154,4 @@ class ImportTransaction
return round(floatval($value), 12);
}
}
}

View File

@ -44,15 +44,6 @@ class ImportRoutine
$this->errors = new Collection;
}
/**
* @param ImportJob $job
*/
public function setJob(ImportJob $job)
{
$this->job = $job;
}
/**
*
*/
@ -90,6 +81,14 @@ class ImportRoutine
return true;
}
/**
* @param ImportJob $job
*/
public function setJob(ImportJob $job)
{
$this->job = $job;
}
/**
* @return Collection
*/
@ -164,4 +163,4 @@ class ImportRoutine
return $storage;
}
}
}

View File

@ -379,4 +379,4 @@ class ImportStorage
}
}
}
}

View File

@ -22,8 +22,8 @@ class RegisteredUser extends Mailable
*/
public function __construct(string $address, string $ipAddress)
{
$this->address = $address;
$this->ipAddress = $ipAddress;
$this->address = $address;
$this->ipAddress = $ipAddress;
}
/**

View File

@ -50,4 +50,4 @@ class CurrencyExchangeRate extends Model
return $this->belongsTo(User::class);
}
}
}

View File

@ -86,7 +86,7 @@ class ImportJob extends Model
*/
public function addStepsDone(int $count)
{
$status = $this->extended_status;
$status = $this->extended_status;
$status['done'] += $count;
$this->extended_status = $status;
$this->save();

View File

@ -133,9 +133,10 @@ class Tag extends Model
*/
public function getTagAttribute($value)
{
if(is_null($value)) {
if (is_null($value)) {
return null;
}
return Crypt::decrypt($value);
}

View File

@ -212,4 +212,4 @@ trait FindAccountsTrait
return $account;
}
}
}

View File

@ -188,4 +188,4 @@ trait CreateJournalsTrait
}
}
}

View File

@ -243,4 +243,4 @@ trait SupportJournalsTrait
return $data;
}
}
}

View File

@ -153,4 +153,4 @@ trait UpdateJournalsTrait
return true;
}
}
}

View File

@ -58,4 +58,4 @@ class HasAttachment extends AbstractTrigger implements TriggerInterface
return false;
}
}
}

View File

@ -35,4 +35,4 @@ interface ExchangeRateInterface
*/
public function setUser(User $user);
}
}

View File

@ -68,4 +68,4 @@ class FixerIO implements ExchangeRateInterface
{
$this->user = $user;
}
}
}

View File

@ -36,4 +36,4 @@ class CurrencyCode implements BinderInterface
}
throw new NotFoundHttpException;
}
}
}

View File

@ -43,4 +43,4 @@ interface ConfigurationInterface
*/
public function storeConfiguration(array $data): bool;
}
}

View File

@ -121,4 +121,4 @@ class Initial implements ConfigurationInterface
return true;
}
}
}

View File

@ -265,4 +265,4 @@ class Map implements ConfigurationInterface
return $column;
}
}
}

View File

@ -264,4 +264,4 @@ class Roles implements ConfigurationInterface
return true;
}
}
}

View File

@ -208,4 +208,4 @@ class Modifier
return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search);
}
}
}

View File

@ -53,7 +53,7 @@ class Search implements SearchInterface
public function __construct()
{
$this->modifiers = new Collection;
$this->validModifiers = (array) config('firefly.search_modifiers');
$this->validModifiers = (array)config('firefly.search_modifiers');
}
/**

View File

@ -13,7 +13,7 @@ declare(strict_types=1);
namespace FireflyIII\Support;
use \Amount as GlobalAmount;
use Amount as GlobalAmount;
use Carbon\Carbon;
use Crypt;
use DB;

View File

@ -265,4 +265,4 @@ class AmountFormat extends Twig_Extension
);
}
}
}

View File

@ -244,4 +244,4 @@ $factory->define(
'foreign_currency_symbol' => null,
];
}
);
);

View File

@ -31,4 +31,4 @@
</div>
</div>
{% endif %}
{% endblock %}
{% endblock %}

View File

@ -20,4 +20,4 @@
</div>
</div>
</div>
</div>

View File

@ -48,4 +48,4 @@ class ForgotPasswordControllerTest extends TestCase
$response = $this->post(route('password.email'), $data);
$response->assertStatus(302);
}
}
}

View File

@ -118,4 +118,4 @@ class BudgetReportControllerTest extends TestCase
$response->assertStatus(200);
}
}
}

View File

@ -85,4 +85,4 @@ class UserEventHandlerTest extends TestCase
$this->assertTrue(true);
}
}
}

View File

@ -133,4 +133,4 @@ class AttachmentHelperTest extends TestCase
}
}
}

View File

@ -208,4 +208,4 @@ class MetaPieChartTest extends TestCase
return $set;
}
}
}