Code clean up.

This commit is contained in:
James Cole
2017-11-15 12:25:49 +01:00
parent 57dcdfa0c4
commit ffca858b8d
476 changed files with 2055 additions and 4181 deletions

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Account\AccountRepository;
@@ -32,26 +30,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class AccountServiceProvider
*
* @package FireflyIII\Providers
* Class AccountServiceProvider.
*/
class AccountServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
@@ -32,8 +31,6 @@ class AdminServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
@@ -41,8 +38,6 @@ class AdminServiceProvider extends ServiceProvider
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
@@ -27,16 +26,12 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider;
/**
* Class AppServiceProvider
*
* @package FireflyIII\Providers
* Class AppServiceProvider.
*/
class AppServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
*
* @return void
*/
public function boot()
{
@@ -45,8 +40,6 @@ class AppServiceProvider extends ServiceProvider
/**
* Register any application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Attachment\AttachmentRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class AttachmentServiceProvider
*
* @package FireflyIII\Providers
* Class AttachmentServiceProvider.
*/
class AttachmentServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**
* AuthServiceProvider.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -49,13 +47,9 @@ class AuthServiceProvider extends ServiceProvider
/**
* Register any authentication / authorization services.
*
* @return void
*/
public function boot()
{
$this->registerPolicies();
//
}
}

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Bill\BillRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class BillServiceProvider
*
* @package FireflyIII\Providers
* Class BillServiceProvider.
*/
class BillServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**
* BroadcastServiceProvider.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -40,8 +38,6 @@ class BroadcastServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
*
* @return void
*/
public function boot()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Budget\BudgetRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class BudgetServiceProvider
*
* @package FireflyIII\Providers
* Class BudgetServiceProvider.
*/
class BudgetServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Category\CategoryRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class CategoryServiceProvider
*
* @package FireflyIII\Providers
* Class CategoryServiceProvider.
*/
class CategoryServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Currency\CurrencyRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class CurrencyServiceProvider
*
* @package FireflyIII\Providers
* Class CurrencyServiceProvider.
*/
class CurrencyServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
@@ -33,9 +32,7 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi
use Log;
/**
* Class EventServiceProvider
*
* @package FireflyIII\Providers
* Class EventServiceProvider.
*/
class EventServiceProvider extends ServiceProvider
{
@@ -47,11 +44,10 @@ class EventServiceProvider extends ServiceProvider
protected $listen
= [
// is a User related event.
'FireflyIII\Events\RegisteredUser' =>
[
'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail',
'FireflyIII\Handlers\Events\UserEventHandler@attachUserRole',
],
'FireflyIII\Events\RegisteredUser' => [
'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail',
'FireflyIII\Handlers\Events\UserEventHandler@attachUserRole',
],
// is a User related event.
'FireflyIII\Events\RequestedNewPassword' => [
'FireflyIII\Handlers\Events\UserEventHandler@sendNewPassword',
@@ -66,25 +62,20 @@ class EventServiceProvider extends ServiceProvider
'FireflyIII\Handlers\Events\AdminEventHandler@sendTestMessage',
],
// is a Transaction Journal related event.
'FireflyIII\Events\StoredTransactionJournal' =>
[
'FireflyIII\Handlers\Events\StoredJournalEventHandler@scanBills',
'FireflyIII\Handlers\Events\StoredJournalEventHandler@connectToPiggyBank',
'FireflyIII\Handlers\Events\StoredJournalEventHandler@processRules',
],
'FireflyIII\Events\StoredTransactionJournal' => [
'FireflyIII\Handlers\Events\StoredJournalEventHandler@scanBills',
'FireflyIII\Handlers\Events\StoredJournalEventHandler@connectToPiggyBank',
'FireflyIII\Handlers\Events\StoredJournalEventHandler@processRules',
],
// is a Transaction Journal related event.
'FireflyIII\Events\UpdatedTransactionJournal' =>
[
'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@scanBills',
'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@processRules',
],
'FireflyIII\Events\UpdatedTransactionJournal' => [
'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@scanBills',
'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@processRules',
],
];
/**
* Register any events for your application.
*
* @return void
*/
public function boot()
{
@@ -98,15 +89,14 @@ class EventServiceProvider extends ServiceProvider
*/
protected function registerCreateEvents()
{
// move this routine to a filter
// in case of repeated piggy banks and/or other problems.
PiggyBank::created(
function (PiggyBank $piggyBank) {
$repetition = new PiggyBankRepetition;
$repetition->piggyBank()->associate($piggyBank);
$repetition->startdate = is_null($piggyBank->startdate) ? null : $piggyBank->startdate;
$repetition->targetdate = is_null($piggyBank->targetdate) ? null : $piggyBank->targetdate;
$repetition->startdate = null === $piggyBank->startdate ? null : $piggyBank->startdate;
$repetition->targetdate = null === $piggyBank->targetdate ? null : $piggyBank->targetdate;
$repetition->currentamount = 0;
$repetition->save();
}
@@ -125,7 +115,7 @@ class EventServiceProvider extends ServiceProvider
foreach ($account->transactions()->get() as $transaction) {
Log::debug('Now at transaction #' . $transaction->id);
$journal = $transaction->transactionJournal()->first();
if (!is_null($journal)) {
if (null !== $journal) {
Log::debug('Call for deletion of journal #' . $journal->id);
$journal->delete();
}

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\ExportJob\ExportJobRepository;
@@ -32,16 +30,12 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class ExportJobServiceProvider
*
* @package FireflyIII\Providers
* Class ExportJobServiceProvider.
*/
class ExportJobServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
@@ -49,8 +43,6 @@ class ExportJobServiceProvider extends ServiceProvider
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
@@ -70,9 +69,7 @@ use TwigBridge\Extension\Loader\Functions;
use Validator;
/**
* Class FireflyServiceProvider
*
* @package FireflyIII\Providers
* Class FireflyServiceProvider.
*/
class FireflyServiceProvider extends ServiceProvider
{

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
@@ -31,8 +30,6 @@ class FireflySessionProvider extends ServiceProvider
{
/**
* Register the service provider.
*
* @return void
*/
public function register()
{
@@ -45,8 +42,6 @@ class FireflySessionProvider extends ServiceProvider
/**
* Register the session driver instance.
*
* @return void
*/
protected function registerSessionDriver()
{
@@ -63,8 +58,6 @@ class FireflySessionProvider extends ServiceProvider
/**
* Register the session manager instance.
*
* @return void
*/
protected function registerSessionManager()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Helpers\Collector\JournalCollector;
@@ -34,26 +32,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class JournalServiceProvider
*
* @package FireflyIII\Providers
* Class JournalServiceProvider.
*/
class JournalServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{
@@ -76,7 +67,6 @@ class JournalServiceProvider extends ServiceProvider
$collector->setUser(auth()->user());
}
return $collector;
}
);

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
@@ -27,18 +26,14 @@ use Illuminate\Log\LogServiceProvider as LaravelLogServiceProvider;
use Illuminate\Log\Writer;
/**
* Class LogServiceProvider
*
* @package FireflyIII\Providers
* Class LogServiceProvider.
*/
class LogServiceProvider extends LaravelLogServiceProvider
{
/**
* Configure the Monolog handlers for the application.
*
* @param \Illuminate\Log\Writer $log
*
* @return void
* @param \Illuminate\Log\Writer $log
*/
protected function configureDailyHandler(Writer $log)
{
@@ -52,9 +47,7 @@ class LogServiceProvider extends LaravelLogServiceProvider
/**
* Configure the Monolog handlers for the application.
*
* @param \Illuminate\Log\Writer $log
*
* @return void
* @param \Illuminate\Log\Writer $log
*/
protected function configureSingleHandler(Writer $log)
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class PiggyBankServiceProvider
*
* @package FireflyIII\Providers
* Class PiggyBankServiceProvider.
*/
class PiggyBankServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**
* RouteServiceProvider.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -49,36 +47,26 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define your route model bindings, pattern filters, etc.
*
* @return void
*/
public function boot()
{
//
parent::boot();
}
/**
* Define the routes for the application.
*
* @return void
*/
public function map()
{
$this->mapApiRoutes();
$this->mapWebRoutes();
//
}
/**
* Define the "api" routes for the application.
*
* These routes are typically stateless.
*
* @return void
*/
protected function mapApiRoutes()
{
@@ -92,8 +80,6 @@ class RouteServiceProvider extends ServiceProvider
* Define the "web" routes for the application.
*
* These routes all receive session state, CSRF protection, etc.
*
* @return void
*/
protected function mapWebRoutes()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class RuleGroupServiceProvider
*
* @package FireflyIII\Providers
* Class RuleGroupServiceProvider.
*/
class RuleGroupServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Rule\RuleRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class RuleServiceProvider
*
* @package FireflyIII\Providers
* Class RuleServiceProvider.
*/
class RuleServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Support\Search\Search;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class SearchServiceProvider
*
* @package FireflyIII\Providers
* Class SearchServiceProvider.
*/
class SearchServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
@@ -27,16 +26,12 @@ use FireflyIII\Http\Middleware\StartFireflySession;
use Illuminate\Session\SessionServiceProvider as BaseSessionServiceProvider;
/**
* Class SessionServiceProvider
*
* @package FireflyIII\Providers
* Class SessionServiceProvider.
*/
class SessionServiceProvider extends BaseSessionServiceProvider
{
/**
* Register the service provider.
*
* @return void
*/
public function register()
{

View File

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Repositories\Tag\TagRepository;
@@ -30,26 +28,19 @@ use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class TagServiceProvider
*
* @package FireflyIII\Providers
* Class TagServiceProvider.
*/
class TagServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{