mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-19 02:45:58 +00:00
Various code cleanup.
This commit is contained in:
@@ -77,7 +77,6 @@ class ExportData extends Command
|
|||||||
{--force : Force overwriting of previous exports if found.}';
|
{--force : Force overwriting of previous exports if found.}';
|
||||||
private AccountRepositoryInterface $accountRepository;
|
private AccountRepositoryInterface $accountRepository;
|
||||||
private JournalRepositoryInterface $journalRepository;
|
private JournalRepositoryInterface $journalRepository;
|
||||||
private User $user;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
@@ -85,6 +84,7 @@ class ExportData extends Command
|
|||||||
* @return int
|
* @return int
|
||||||
* @throws CannotInsertRecord
|
* @throws CannotInsertRecord
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \League\Csv\Exception
|
||||||
*/
|
*/
|
||||||
public function handle(): int
|
public function handle(): int
|
||||||
{
|
{
|
||||||
@@ -96,9 +96,9 @@ class ExportData extends Command
|
|||||||
}
|
}
|
||||||
// set up repositories.
|
// set up repositories.
|
||||||
$this->stupidLaravel();
|
$this->stupidLaravel();
|
||||||
$this->user = $this->getUser();
|
$user = $this->getUser();
|
||||||
$this->journalRepository->setUser($this->user);
|
$this->journalRepository->setUser($user);
|
||||||
$this->accountRepository->setUser($this->user);
|
$this->accountRepository->setUser($user);
|
||||||
// get the options.
|
// get the options.
|
||||||
try {
|
try {
|
||||||
$options = $this->parseOptions();
|
$options = $this->parseOptions();
|
||||||
@@ -110,7 +110,7 @@ class ExportData extends Command
|
|||||||
// make export object and configure it.
|
// make export object and configure it.
|
||||||
/** @var ExportDataGenerator $exporter */
|
/** @var ExportDataGenerator $exporter */
|
||||||
$exporter = app(ExportDataGenerator::class);
|
$exporter = app(ExportDataGenerator::class);
|
||||||
$exporter->setUser($this->user);
|
$exporter->setUser($user);
|
||||||
|
|
||||||
$exporter->setStart($options['start']);
|
$exporter->setStart($options['start']);
|
||||||
$exporter->setEnd($options['end']);
|
$exporter->setEnd($options['end']);
|
||||||
|
@@ -74,7 +74,7 @@ class RemoteUserProvider implements UserProvider
|
|||||||
public function retrieveByToken($identifier, $token)
|
public function retrieveByToken($identifier, $token)
|
||||||
{
|
{
|
||||||
Log::debug(sprintf('Now at %s', __METHOD__));
|
Log::debug(sprintf('Now at %s', __METHOD__));
|
||||||
throw new FireflyException(sprintf('Did not implement %s', __METHOD__));
|
throw new FireflyException(sprintf('A) Did not implement %s', __METHOD__));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -83,7 +83,7 @@ class RemoteUserProvider implements UserProvider
|
|||||||
public function updateRememberToken(Authenticatable $user, $token)
|
public function updateRememberToken(Authenticatable $user, $token)
|
||||||
{
|
{
|
||||||
Log::debug(sprintf('Now at %s', __METHOD__));
|
Log::debug(sprintf('Now at %s', __METHOD__));
|
||||||
throw new FireflyException(sprintf('Did not implement %s', __METHOD__));
|
throw new FireflyException(sprintf('B) Did not implement %s', __METHOD__));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -92,6 +92,6 @@ class RemoteUserProvider implements UserProvider
|
|||||||
public function validateCredentials(Authenticatable $user, array $credentials)
|
public function validateCredentials(Authenticatable $user, array $credentials)
|
||||||
{
|
{
|
||||||
Log::debug(sprintf('Now at %s', __METHOD__));
|
Log::debug(sprintf('Now at %s', __METHOD__));
|
||||||
throw new FireflyException(sprintf('Did not implement %s', __METHOD__));
|
throw new FireflyException(sprintf('C) Did not implement %s', __METHOD__));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
59
config/sentry.php
Normal file
59
config/sentry.php
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return [
|
||||||
|
|
||||||
|
// this is not about security per se, but about making this string less obvious to bots
|
||||||
|
// although they could simply parse the value lol
|
||||||
|
'dsn' => base64_decode(strrev('=IzLnJ3bukWap1SesZWZylmZuknc05WZzB0NmRDNhFWM1EzNlNWY3IWOkRzN0EjYygDM0UzMhBjYi9yL6MHc0RHa')),
|
||||||
|
|
||||||
|
// capture release as git sha
|
||||||
|
// 'release' => trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')),
|
||||||
|
|
||||||
|
// When left empty or `null` the Laravel environment will be used
|
||||||
|
'environment' => env('SENTRY_ENVIRONMENT'),
|
||||||
|
|
||||||
|
'breadcrumbs' => [
|
||||||
|
// Capture Laravel logs in breadcrumbs
|
||||||
|
'logs' => true,
|
||||||
|
|
||||||
|
// Capture SQL queries in breadcrumbs
|
||||||
|
'sql_queries' => true,
|
||||||
|
|
||||||
|
// Capture bindings on SQL queries logged in breadcrumbs
|
||||||
|
'sql_bindings' => true,
|
||||||
|
|
||||||
|
// Capture queue job information in breadcrumbs
|
||||||
|
'queue_info' => true,
|
||||||
|
|
||||||
|
// Capture command information in breadcrumbs
|
||||||
|
'command_info' => true,
|
||||||
|
],
|
||||||
|
|
||||||
|
'tracing' => [
|
||||||
|
// Trace queue jobs as their own transactions
|
||||||
|
'queue_job_transactions' => env('SENTRY_TRACE_QUEUE_ENABLED', false),
|
||||||
|
|
||||||
|
// Capture queue jobs as spans when executed on the sync driver
|
||||||
|
'queue_jobs' => true,
|
||||||
|
|
||||||
|
// Capture SQL queries as spans
|
||||||
|
'sql_queries' => true,
|
||||||
|
|
||||||
|
// Try to find out where the SQL query originated from and add it to the query spans
|
||||||
|
'sql_origin' => true,
|
||||||
|
|
||||||
|
// Capture views as spans
|
||||||
|
'views' => true,
|
||||||
|
|
||||||
|
// Indicates if the tracing integrations supplied by Sentry should be loaded
|
||||||
|
'default_integrations' => true,
|
||||||
|
],
|
||||||
|
|
||||||
|
// @see: https://docs.sentry.io/platforms/php/configuration/options/#send-default-pii
|
||||||
|
'send_default_pii' => false,
|
||||||
|
|
||||||
|
'traces_sample_rate' => (float)(env('SENTRY_TRACES_SAMPLE_RATE', 0.0)),
|
||||||
|
|
||||||
|
'controllers_base_namespace' => env('SENTRY_CONTROLLERS_BASE_NAMESPACE', 'App\\Http\\Controllers'),
|
||||||
|
|
||||||
|
];
|
Reference in New Issue
Block a user