diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 3ec7878858..d8a3d489c6 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -180,12 +180,12 @@ class TagController extends Controller $helpHidden = $helpHiddenPref->data; // group years. - $types = ['nothing','balancingAct', 'advancePayment']; + $types = ['nothing', 'balancingAct', 'advancePayment']; // loop each types and get the tags, group them by year. $collection = []; foreach ($types as $type) { - $tags = Auth::user()->tags()->where('tagMode', $type)->orderBy('date','ASC')->get(); + $tags = Auth::user()->tags()->where('tagMode', $type)->orderBy('date', 'ASC')->get(); /** @var Tag $tag */ foreach ($tags as $tag) { $year = is_null($tag->date) ? trans('firefly.no_year') : $tag->date->year; @@ -195,7 +195,7 @@ class TagController extends Controller } - return view('tags.index', compact('title', 'mainTitleIcon','types', 'helpHidden', 'collection')); + return view('tags.index', compact('title', 'mainTitleIcon', 'types', 'helpHidden', 'collection')); } /** @@ -208,7 +208,7 @@ class TagController extends Controller $subTitle = $tag->tag; $subTitleIcon = 'fa-tag'; - return view('tags.show', compact('tag', 'subTitle','types', 'subTitleIcon')); + return view('tags.show', compact('tag', 'subTitle', 'subTitleIcon')); } /** diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 1e2d0ce3c3..279fe60765 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -6,7 +6,7 @@ use Watson\Validating\ValidatingTrait; /** * Class AccountMeta * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 6de461749b..2148b9e961 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class AccountType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 4cc50a19da..76ce0b66ad 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; * FireflyIII\Models\Bill * * @codeCoverageIgnore Class Bill - * @package FireflyIII\Models + * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $updated_at diff --git a/app/Models/Budget.php b/app/Models/Budget.php index ab529f3e62..02f1e46808 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Budget * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 97f2b16dab..42e72dc502 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class BudgetLimit * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Component.php b/app/Models/Component.php index c65a9c8812..84686751be 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Component * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 5f6ea2a6cf..d5fd692dae 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class LimitRepetition * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 98de0f04ef..6b9bdceda1 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankEvent * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 68d2388acc..a24066f2ee 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankRepetition * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 263e7e33bc..56bc6f7cfd 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class Preference * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 43f9928439..26ca48ef45 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -9,7 +9,7 @@ use Watson\Validating\ValidatingTrait; /** * Class Transaction * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 4adad9b216..27b21f36c3 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionCurrency * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 6c980bfac0..bb41749ca2 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionGroup * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/TransactionRelation.php b/app/Models/TransactionRelation.php index 056d61fdd8..aa4d3810af 100644 --- a/app/Models/TransactionRelation.php +++ b/app/Models/TransactionRelation.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class TransactionRelation * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models */ class TransactionRelation extends Model diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 886858bb2c..098d5bcfc7 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 78b59b0585..299b571d63 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -52,8 +52,6 @@ class EventServiceProvider extends ServiceProvider $this->registerCreateEvents(); BudgetLimit::saved( function (BudgetLimit $budgetLimit) { - Log::debug('Saved!'); - $end = Navigation::addPeriod(clone $budgetLimit->startdate, $budgetLimit->repeat_freq, 0); $end->subDay(); $set = $budgetLimit->limitrepetitions() diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index a174005ffd..df29d4f678 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -225,6 +225,7 @@ class AccountRepository implements AccountRepositoryInterface $accountIds = DB::table('piggy_banks')->distinct()->get(['piggy_banks.account_id']); $accounts = new Collection; + /** @var PiggyBank $id */ foreach ($accountIds as $id) { $ids[] = intval($id->account_id); } diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 231b09b60d..903f1f586a 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -119,7 +119,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface $data['remind_me'] = false; $data['reminder_skip'] = 0; - $piggyBank = PiggyBank::create($data); + $piggyBank = PiggyBank::create($data); return $piggyBank; } diff --git a/app/Repositories/PiggyBank/PiggybankPart.php b/app/Repositories/PiggyBank/PiggybankPart.php index 1be6e78d27..79341dffd8 100644 --- a/app/Repositories/PiggyBank/PiggybankPart.php +++ b/app/Repositories/PiggyBank/PiggybankPart.php @@ -29,6 +29,22 @@ class PiggyBankPart /** @var Carbon */ public $targetdate; + /** + * @return PiggyBankRepetition + */ + public function getRepetition() + { + return $this->repetition; + } + + /** + * @param PiggyBankRepetition $repetition + */ + public function setRepetition($repetition) + { + $this->repetition = $repetition; + } + /** * @return Carbon */ @@ -61,22 +77,6 @@ class PiggyBankPart $this->targetdate = $targetdate; } - /** - * @return PiggyBankRepetition - */ - public function getRepetition() - { - return $this->repetition; - } - - /** - * @param PiggyBankRepetition $repetition - */ - public function setRepetition($repetition) - { - $this->repetition = $repetition; - } - /** * @return float|int */ diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 569cbd6b0b..4bae2bcbbb 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -40,7 +40,7 @@ class ExpandedForm $currencies = Amt::getAllCurrencies(); unset($options['currency']); unset($options['placeholder']); - $html = View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); + $html = View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); return $html; @@ -144,7 +144,7 @@ class ExpandedForm $currencies = Amt::getAllCurrencies(); unset($options['currency']); unset($options['placeholder']); - $html = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); + $html = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); return $html; } @@ -186,7 +186,7 @@ class ExpandedForm $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); unset($options['placeholder']); - $html = View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render(); + $html = View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render(); return $html; } @@ -323,7 +323,7 @@ class ExpandedForm $selected = $this->fillFieldValue($name, $selected); unset($options['autocomplete']); unset($options['placeholder']); - $html = View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); + $html = View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); return $html; } diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 2c3f564a61..8089b94b2e 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -142,7 +142,7 @@ class Navigation } /** - * @param Carbon $date + * @param \Carbon\Carbon $date * @param $repeatFrequency * * @return string diff --git a/app/Support/Steam.php b/app/Support/Steam.php index c4043d559d..56e9c40e33 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -35,7 +35,7 @@ class Steam bcscale(2); - $balance = $account->transactions()->leftJoin( + $balance = $account->transactions()->leftJoin( 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id' )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount'); diff --git a/app/User.php b/app/User.php index 4b05eab202..408b621188 100644 --- a/app/User.php +++ b/app/User.php @@ -9,6 +9,7 @@ use Zizaco\Entrust\Traits\EntrustUserTrait; /** * Class User + * * @codeCoverageIgnore * * @package FireflyIII diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index e1739119ac..69cb190426 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -3,16 +3,15 @@ namespace FireflyIII\Validation; use Auth; -use Carbon\Carbon; use Config; use Crypt; use DB; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; +use FireflyIII\Models\PiggyBank; use FireflyIII\User; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Validation\Validator; -use Navigation; use Symfony\Component\Translation\TranslatorInterface; /** @@ -244,6 +243,7 @@ class FireflyValidator extends Validator } $set = $query->get(['piggy_banks.*']); + /** @var PiggyBank $entry */ foreach ($set as $entry) { $fieldValue = $this->tryDecrypt($entry->name); if ($fieldValue == $value) { diff --git a/bootstrap/app.php b/bootstrap/app.php index 5b299a9c83..3eef0b49d7 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -28,7 +28,6 @@ $app = new Illuminate\Foundation\Application( */ - $app->singleton( 'Illuminate\Contracts\Http\Kernel', 'FireflyIII\Http\Kernel' @@ -45,8 +44,6 @@ $app->singleton( ); - - /* |-------------------------------------------------------------------------- | Return The Application diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 2c35b3fc95..0f75195105 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -14,7 +14,7 @@ define('LARAVEL_START', microtime(true)); | */ -require __DIR__.'/../vendor/autoload.php'; +require __DIR__ . '/../vendor/autoload.php'; /* |-------------------------------------------------------------------------- @@ -27,9 +27,8 @@ require __DIR__.'/../vendor/autoload.php'; | */ -$compiledPath = __DIR__.'/cache/compiled.php'; +$compiledPath = __DIR__ . '/cache/compiled.php'; -if (file_exists($compiledPath)) -{ - require $compiledPath; +if (file_exists($compiledPath)) { + require $compiledPath; } diff --git a/config/auth.php b/config/auth.php index feff197837..685437114c 100644 --- a/config/auth.php +++ b/config/auth.php @@ -2,67 +2,67 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Authentication Driver - |-------------------------------------------------------------------------- - | - | This option controls the authentication driver that will be utilized. - | This driver manages the retrieval and authentication of the users - | attempting to get access to protected areas of your application. - | - | Supported: "database", "eloquent" - | - */ + /* + |-------------------------------------------------------------------------- + | Default Authentication Driver + |-------------------------------------------------------------------------- + | + | This option controls the authentication driver that will be utilized. + | This driver manages the retrieval and authentication of the users + | attempting to get access to protected areas of your application. + | + | Supported: "database", "eloquent" + | + */ - 'driver' => 'eloquent', + 'driver' => 'eloquent', - /* - |-------------------------------------------------------------------------- - | Authentication Model - |-------------------------------------------------------------------------- - | - | When using the "Eloquent" authentication driver, we need to know which - | Eloquent model should be used to retrieve your users. Of course, it - | is often just the "User" model but you may use whatever you like. - | - */ + /* + |-------------------------------------------------------------------------- + | Authentication Model + |-------------------------------------------------------------------------- + | + | When using the "Eloquent" authentication driver, we need to know which + | Eloquent model should be used to retrieve your users. Of course, it + | is often just the "User" model but you may use whatever you like. + | + */ - 'model' => 'FireflyIII\User', + 'model' => 'FireflyIII\User', - /* - |-------------------------------------------------------------------------- - | Authentication Table - |-------------------------------------------------------------------------- - | - | When using the "Database" authentication driver, we need to know which - | table should be used to retrieve your users. We have chosen a basic - | default value but you may easily change it to any table you like. - | - */ + /* + |-------------------------------------------------------------------------- + | Authentication Table + |-------------------------------------------------------------------------- + | + | When using the "Database" authentication driver, we need to know which + | table should be used to retrieve your users. We have chosen a basic + | default value but you may easily change it to any table you like. + | + */ - 'table' => 'users', + 'table' => 'users', - /* - |-------------------------------------------------------------------------- - | Password Reset Settings - |-------------------------------------------------------------------------- - | - | Here you may set the options for resetting passwords including the view - | that is your password reset e-mail. You can also set the name of the - | table that maintains all of the reset tokens for your application. - | - | The expire time is the number of minutes that the reset token should be - | considered valid. This security feature keeps tokens short-lived so - | they have less time to be guessed. You may change this as needed. - | - */ + /* + |-------------------------------------------------------------------------- + | Password Reset Settings + |-------------------------------------------------------------------------- + | + | Here you may set the options for resetting passwords including the view + | that is your password reset e-mail. You can also set the name of the + | table that maintains all of the reset tokens for your application. + | + | The expire time is the number of minutes that the reset token should be + | considered valid. This security feature keeps tokens short-lived so + | they have less time to be guessed. You may change this as needed. + | + */ - 'password' => [ - 'email' => 'emails.password', - 'table' => 'password_resets', - 'expire' => 60, - ], - 'allow_register' => true + 'password' => [ + 'email' => 'emails.password', + 'table' => 'password_resets', + 'expire' => 60, + ], + 'allow_register' => true ]; diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index c0ee129b55..aa133d355c 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -2,6 +2,6 @@ return [ - 'view' => 'breadcrumbs::bootstrap3', + 'view' => 'breadcrumbs::bootstrap3', ]; diff --git a/config/cache.php b/config/cache.php index 9ddd5f331c..0a2d218517 100644 --- a/config/cache.php +++ b/config/cache.php @@ -2,78 +2,78 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Cache Store - |-------------------------------------------------------------------------- - | - | This option controls the default cache connection that gets used while - | using this caching library. This connection is used when another is - | not explicitly specified when executing a given caching function. - | - */ + /* + |-------------------------------------------------------------------------- + | Default Cache Store + |-------------------------------------------------------------------------- + | + | This option controls the default cache connection that gets used while + | using this caching library. This connection is used when another is + | not explicitly specified when executing a given caching function. + | + */ - 'default' => env('CACHE_DRIVER', 'file'), + 'default' => env('CACHE_DRIVER', 'file'), - /* - |-------------------------------------------------------------------------- - | Cache Stores - |-------------------------------------------------------------------------- - | - | Here you may define all of the cache "stores" for your application as - | well as their drivers. You may even define multiple stores for the - | same cache driver to group types of items stored in your caches. - | - */ + /* + |-------------------------------------------------------------------------- + | Cache Stores + |-------------------------------------------------------------------------- + | + | Here you may define all of the cache "stores" for your application as + | well as their drivers. You may even define multiple stores for the + | same cache driver to group types of items stored in your caches. + | + */ - 'stores' => [ + 'stores' => [ - 'apc' => [ - 'driver' => 'apc' - ], + 'apc' => [ + 'driver' => 'apc' + ], - 'array' => [ - 'driver' => 'array' - ], + 'array' => [ + 'driver' => 'array' + ], - 'database' => [ - 'driver' => 'database', - 'table' => 'cache', - 'connection' => null, - ], + 'database' => [ + 'driver' => 'database', + 'table' => 'cache', + 'connection' => null, + ], - 'file' => [ - 'driver' => 'file', - 'path' => storage_path().'/framework/cache', - ], + 'file' => [ + 'driver' => 'file', + 'path' => storage_path() . '/framework/cache', + ], - 'memcached' => [ - 'driver' => 'memcached', - 'servers' => [ - [ - 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 - ], - ], - ], + 'memcached' => [ + 'driver' => 'memcached', + 'servers' => [ + [ + 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 + ], + ], + ], - 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - ], + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'default', + ], - ], + ], - /* - |-------------------------------------------------------------------------- - | Cache Key Prefix - |-------------------------------------------------------------------------- - | - | When utilizing a RAM based store such as APC or Memcached, there might - | be other applications utilizing the same cache. So, we'll specify a - | value to get prefixed to all our keys so we can avoid collisions. - | - */ + /* + |-------------------------------------------------------------------------- + | Cache Key Prefix + |-------------------------------------------------------------------------- + | + | When utilizing a RAM based store such as APC or Memcached, there might + | be other applications utilizing the same cache. So, we'll specify a + | value to get prefixed to all our keys so we can avoid collisions. + | + */ - 'prefix' => 'laravel', + 'prefix' => 'laravel', ]; diff --git a/config/compile.php b/config/compile.php index 3a002fcaaa..317efeb092 100644 --- a/config/compile.php +++ b/config/compile.php @@ -2,40 +2,40 @@ return [ - /* - |-------------------------------------------------------------------------- - | Additional Compiled Classes - |-------------------------------------------------------------------------- - | - | Here you may specify additional classes to include in the compiled file - | generated by the `artisan optimize` command. These should be classes - | that are included on basically every request into the application. - | - */ + /* + |-------------------------------------------------------------------------- + | Additional Compiled Classes + |-------------------------------------------------------------------------- + | + | Here you may specify additional classes to include in the compiled file + | generated by the `artisan optimize` command. These should be classes + | that are included on basically every request into the application. + | + */ - 'files' => [ + 'files' => [ - realpath(__DIR__.'/../app/Providers/AppServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/BusServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/ConfigServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/EventServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/RouteServiceProvider.php'), + realpath(__DIR__ . '/../app/Providers/AppServiceProvider.php'), + realpath(__DIR__ . '/../app/Providers/BusServiceProvider.php'), + realpath(__DIR__ . '/../app/Providers/ConfigServiceProvider.php'), + realpath(__DIR__ . '/../app/Providers/EventServiceProvider.php'), + realpath(__DIR__ . '/../app/Providers/RouteServiceProvider.php'), - ], + ], - /* - |-------------------------------------------------------------------------- - | Compiled File Providers - |-------------------------------------------------------------------------- - | - | Here you may list service providers which define a "compiles" function - | that returns additional files that should be compiled, providing an - | easy way to get common files from any packages you are utilizing. - | - */ + /* + |-------------------------------------------------------------------------- + | Compiled File Providers + |-------------------------------------------------------------------------- + | + | Here you may list service providers which define a "compiles" function + | that returns additional files that should be compiled, providing an + | easy way to get common files from any packages you are utilizing. + | + */ - 'providers' => [ - // - ], + 'providers' => [ + // + ], ]; diff --git a/config/database.php b/config/database.php index 5f203d8743..f5334dc581 100644 --- a/config/database.php +++ b/config/database.php @@ -48,7 +48,7 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => __DIR__.'/../storage/database/testing.db', + 'database' => __DIR__ . '/../storage/database/testing.db', 'prefix' => '', ], diff --git a/config/entrust.php b/config/entrust.php index dbc2cc5bdd..b833633587 100644 --- a/config/entrust.php +++ b/config/entrust.php @@ -19,7 +19,7 @@ return [ | the role if it is in a different namespace. | */ - 'role' => 'FireflyIII\Models\Role', + 'role' => 'FireflyIII\Models\Role', /* |-------------------------------------------------------------------------- @@ -29,7 +29,7 @@ return [ | This is the roles table used by Entrust to save roles to the database. | */ - 'roles_table' => 'roles', + 'roles_table' => 'roles', /* |-------------------------------------------------------------------------- @@ -40,7 +40,7 @@ return [ | Update the permission if it is in a different namespace. | */ - 'permission' => 'FireflyIII\Models\Permission', + 'permission' => 'FireflyIII\Models\Permission', /* |-------------------------------------------------------------------------- @@ -51,7 +51,7 @@ return [ | database. | */ - 'permissions_table' => 'permissions', + 'permissions_table' => 'permissions', /* |-------------------------------------------------------------------------- @@ -73,6 +73,6 @@ return [ | database. | */ - 'role_user_table' => 'role_user', + 'role_user_table' => 'role_user', ]; diff --git a/config/filesystems.php b/config/filesystems.php index ad8228f2fa..9765bd1016 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -2,69 +2,69 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Filesystem Disk - |-------------------------------------------------------------------------- - | - | Here you may specify the default filesystem disk that should be used - | by the framework. A "local" driver, as well as a variety of cloud - | based drivers are available for your choosing. Just store away! - | - | Supported: "local", "s3", "rackspace" - | - */ + /* + |-------------------------------------------------------------------------- + | Default Filesystem Disk + |-------------------------------------------------------------------------- + | + | Here you may specify the default filesystem disk that should be used + | by the framework. A "local" driver, as well as a variety of cloud + | based drivers are available for your choosing. Just store away! + | + | Supported: "local", "s3", "rackspace" + | + */ - 'default' => 'local', + 'default' => 'local', - /* - |-------------------------------------------------------------------------- - | Default Cloud Filesystem Disk - |-------------------------------------------------------------------------- - | - | Many applications store files both locally and in the cloud. For this - | reason, you may specify a default "cloud" driver here. This driver - | will be bound as the Cloud disk implementation in the container. - | - */ + /* + |-------------------------------------------------------------------------- + | Default Cloud Filesystem Disk + |-------------------------------------------------------------------------- + | + | Many applications store files both locally and in the cloud. For this + | reason, you may specify a default "cloud" driver here. This driver + | will be bound as the Cloud disk implementation in the container. + | + */ - 'cloud' => 's3', + 'cloud' => 's3', - /* - |-------------------------------------------------------------------------- - | Filesystem Disks - |-------------------------------------------------------------------------- - | - | Here you may configure as many filesystem "disks" as you wish, and you - | may even configure multiple disks of the same driver. Defaults have - | been setup for each driver as an example of the required options. - | - */ + /* + |-------------------------------------------------------------------------- + | Filesystem Disks + |-------------------------------------------------------------------------- + | + | Here you may configure as many filesystem "disks" as you wish, and you + | may even configure multiple disks of the same driver. Defaults have + | been setup for each driver as an example of the required options. + | + */ - 'disks' => [ + 'disks' => [ - 'local' => [ - 'driver' => 'local', - 'root' => storage_path().'/app', - ], + 'local' => [ + 'driver' => 'local', + 'root' => storage_path() . '/app', + ], - 's3' => [ - 'driver' => 's3', - 'key' => 'your-key', - 'secret' => 'your-secret', - 'region' => 'your-region', - 'bucket' => 'your-bucket', - ], + 's3' => [ + 'driver' => 's3', + 'key' => 'your-key', + 'secret' => 'your-secret', + 'region' => 'your-region', + 'bucket' => 'your-bucket', + ], - 'rackspace' => [ - 'driver' => 'rackspace', - 'username' => 'your-username', - 'key' => 'your-key', - 'container' => 'your-container', - 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', - 'region' => 'IAD', - ], + 'rackspace' => [ + 'driver' => 'rackspace', + 'username' => 'your-username', + 'key' => 'your-key', + 'container' => 'your-container', + 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', + 'region' => 'IAD', + ], - ], + ], ]; diff --git a/config/firefly.php b/config/firefly.php index 465303c798..2c8b29ab39 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -1,7 +1,7 @@ '3.4.5', + 'version' => '3.4.5', 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'piggy_bank_periods' => [ @@ -57,7 +57,7 @@ return [ 'asset' => 'Asset accounts', 'expense' => 'Expense accounts', 'revenue' => 'Revenue accounts', - 'cash' => 'Cash accounts', + 'cash' => 'Cash accounts', ], 'subIconsByIdentifier' => [ diff --git a/config/queue.php b/config/queue.php index 9c39a13644..5be8d63bf3 100644 --- a/config/queue.php +++ b/config/queue.php @@ -2,91 +2,91 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Queue Driver - |-------------------------------------------------------------------------- - | - | The Laravel queue API supports a variety of back-ends via an unified - | API, giving you convenient access to each back-end using the same - | syntax for each one. Here you may set the default queue driver. - | - | Supported: "null", "sync", "database", "beanstalkd", - | "sqs", "iron", "redis" - | - */ + /* + |-------------------------------------------------------------------------- + | Default Queue Driver + |-------------------------------------------------------------------------- + | + | The Laravel queue API supports a variety of back-ends via an unified + | API, giving you convenient access to each back-end using the same + | syntax for each one. Here you may set the default queue driver. + | + | Supported: "null", "sync", "database", "beanstalkd", + | "sqs", "iron", "redis" + | + */ - 'default' => env('QUEUE_DRIVER', 'sync'), + 'default' => env('QUEUE_DRIVER', 'sync'), - /* - |-------------------------------------------------------------------------- - | Queue Connections - |-------------------------------------------------------------------------- - | - | Here you may configure the connection information for each server that - | is used by your application. A default configuration has been added - | for each back-end shipped with Laravel. You are free to add more. - | - */ + /* + |-------------------------------------------------------------------------- + | Queue Connections + |-------------------------------------------------------------------------- + | + | Here you may configure the connection information for each server that + | is used by your application. A default configuration has been added + | for each back-end shipped with Laravel. You are free to add more. + | + */ - 'connections' => [ + 'connections' => [ - 'sync' => [ - 'driver' => 'sync', - ], + 'sync' => [ + 'driver' => 'sync', + ], - 'database' => [ - 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', - 'expire' => 60, - ], + 'database' => [ + 'driver' => 'database', + 'table' => 'jobs', + 'queue' => 'default', + 'expire' => 60, + ], - 'beanstalkd' => [ - 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', - 'ttr' => 60, - ], + 'beanstalkd' => [ + 'driver' => 'beanstalkd', + 'host' => 'localhost', + 'queue' => 'default', + 'ttr' => 60, + ], - 'sqs' => [ - 'driver' => 'sqs', - 'key' => 'your-public-key', - 'secret' => 'your-secret-key', - 'queue' => 'your-queue-url', - 'region' => 'us-east-1', - ], + 'sqs' => [ + 'driver' => 'sqs', + 'key' => 'your-public-key', + 'secret' => 'your-secret-key', + 'queue' => 'your-queue-url', + 'region' => 'us-east-1', + ], - 'iron' => [ - 'driver' => 'iron', - 'host' => 'mq-aws-us-east-1.iron.io', - 'token' => 'your-token', - 'project' => 'your-project-id', - 'queue' => 'your-queue-name', - 'encrypt' => true, - ], + 'iron' => [ + 'driver' => 'iron', + 'host' => 'mq-aws-us-east-1.iron.io', + 'token' => 'your-token', + 'project' => 'your-project-id', + 'queue' => 'your-queue-name', + 'encrypt' => true, + ], - 'redis' => [ - 'driver' => 'redis', - 'queue' => 'default', - 'expire' => 60, - ], + 'redis' => [ + 'driver' => 'redis', + 'queue' => 'default', + 'expire' => 60, + ], - ], + ], - /* - |-------------------------------------------------------------------------- - | Failed Queue Jobs - |-------------------------------------------------------------------------- - | - | These options configure the behavior of failed queue job logging so you - | can control which database and table are used to store the jobs that - | have failed. You may change them to any database / table you wish. - | - */ + /* + |-------------------------------------------------------------------------- + | Failed Queue Jobs + |-------------------------------------------------------------------------- + | + | These options configure the behavior of failed queue job logging so you + | can control which database and table are used to store the jobs that + | have failed. You may change them to any database / table you wish. + | + */ - 'failed' => [ - 'database' => 'mysql', 'table' => 'failed_jobs', - ], + 'failed' => [ + 'database' => 'mysql', 'table' => 'failed_jobs', + ], ]; diff --git a/config/services.php b/config/services.php index dddc986601..3ee3eed75e 100644 --- a/config/services.php +++ b/config/services.php @@ -2,36 +2,36 @@ return [ - /* - |-------------------------------------------------------------------------- - | Third Party Services - |-------------------------------------------------------------------------- - | - | This file is for storing the credentials for third party services such - | as Stripe, Mailgun, Mandrill, and others. This file provides a sane - | default location for this type of information, allowing packages - | to have a conventional place to find your various credentials. - | - */ + /* + |-------------------------------------------------------------------------- + | Third Party Services + |-------------------------------------------------------------------------- + | + | This file is for storing the credentials for third party services such + | as Stripe, Mailgun, Mandrill, and others. This file provides a sane + | default location for this type of information, allowing packages + | to have a conventional place to find your various credentials. + | + */ - 'mailgun' => [ - 'domain' => '', - 'secret' => '', - ], + 'mailgun' => [ + 'domain' => '', + 'secret' => '', + ], - 'mandrill' => [ - 'secret' => '', - ], + 'mandrill' => [ + 'secret' => '', + ], - 'ses' => [ - 'key' => '', - 'secret' => '', - 'region' => 'us-east-1', - ], + 'ses' => [ + 'key' => '', + 'secret' => '', + 'region' => 'us-east-1', + ], - 'stripe' => [ - 'model' => 'User', - 'secret' => '', - ], + 'stripe' => [ + 'model' => 'User', + 'secret' => '', + ], ]; diff --git a/config/session.php b/config/session.php index 47470fabc7..466d9ba843 100644 --- a/config/session.php +++ b/config/session.php @@ -2,152 +2,152 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Session Driver - |-------------------------------------------------------------------------- - | - | This option controls the default session "driver" that will be used on - | requests. By default, we will use the lightweight native driver but - | you may specify any of the other wonderful drivers provided here. - | - | Supported: "file", "cookie", "database", "apc", - | "memcached", "redis", "array" - | - */ + /* + |-------------------------------------------------------------------------- + | Default Session Driver + |-------------------------------------------------------------------------- + | + | This option controls the default session "driver" that will be used on + | requests. By default, we will use the lightweight native driver but + | you may specify any of the other wonderful drivers provided here. + | + | Supported: "file", "cookie", "database", "apc", + | "memcached", "redis", "array" + | + */ - 'driver' => env('SESSION_DRIVER', 'file'), + 'driver' => env('SESSION_DRIVER', 'file'), - /* - |-------------------------------------------------------------------------- - | Session Lifetime - |-------------------------------------------------------------------------- - | - | Here you may specify the number of minutes that you wish the session - | to be allowed to remain idle before it expires. If you want them - | to immediately expire on the browser closing, set that option. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Lifetime + |-------------------------------------------------------------------------- + | + | Here you may specify the number of minutes that you wish the session + | to be allowed to remain idle before it expires. If you want them + | to immediately expire on the browser closing, set that option. + | + */ - 'lifetime' => 120, + 'lifetime' => 120, - 'expire_on_close' => false, + 'expire_on_close' => false, - /* - |-------------------------------------------------------------------------- - | Session Encryption - |-------------------------------------------------------------------------- - | - | This option allows you to easily specify that all of your session data - | should be encrypted before it is stored. All encryption will be run - | automatically by Laravel and you can use the Session like normal. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Encryption + |-------------------------------------------------------------------------- + | + | This option allows you to easily specify that all of your session data + | should be encrypted before it is stored. All encryption will be run + | automatically by Laravel and you can use the Session like normal. + | + */ - 'encrypt' => false, + 'encrypt' => false, - /* - |-------------------------------------------------------------------------- - | Session File Location - |-------------------------------------------------------------------------- - | - | When using the native session driver, we need a location where session - | files may be stored. A default has been set for you but a different - | location may be specified. This is only needed for file sessions. - | - */ + /* + |-------------------------------------------------------------------------- + | Session File Location + |-------------------------------------------------------------------------- + | + | When using the native session driver, we need a location where session + | files may be stored. A default has been set for you but a different + | location may be specified. This is only needed for file sessions. + | + */ - 'files' => storage_path().'/framework/sessions', + 'files' => storage_path() . '/framework/sessions', - /* - |-------------------------------------------------------------------------- - | Session Database Connection - |-------------------------------------------------------------------------- - | - | When using the "database" or "redis" session drivers, you may specify a - | connection that should be used to manage these sessions. This should - | correspond to a connection in your database configuration options. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Database Connection + |-------------------------------------------------------------------------- + | + | When using the "database" or "redis" session drivers, you may specify a + | connection that should be used to manage these sessions. This should + | correspond to a connection in your database configuration options. + | + */ - 'connection' => null, + 'connection' => null, - /* - |-------------------------------------------------------------------------- - | Session Database Table - |-------------------------------------------------------------------------- - | - | When using the "database" session driver, you may specify the table we - | should use to manage the sessions. Of course, a sensible default is - | provided for you; however, you are free to change this as needed. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Database Table + |-------------------------------------------------------------------------- + | + | When using the "database" session driver, you may specify the table we + | should use to manage the sessions. Of course, a sensible default is + | provided for you; however, you are free to change this as needed. + | + */ - 'table' => 'sessions', + 'table' => 'sessions', - /* - |-------------------------------------------------------------------------- - | Session Sweeping Lottery - |-------------------------------------------------------------------------- - | - | Some session drivers must manually sweep their storage location to get - | rid of old sessions from storage. Here are the chances that it will - | happen on a given request. By default, the odds are 2 out of 100. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Sweeping Lottery + |-------------------------------------------------------------------------- + | + | Some session drivers must manually sweep their storage location to get + | rid of old sessions from storage. Here are the chances that it will + | happen on a given request. By default, the odds are 2 out of 100. + | + */ - 'lottery' => [2, 100], + 'lottery' => [2, 100], - /* - |-------------------------------------------------------------------------- - | Session Cookie Name - |-------------------------------------------------------------------------- - | - | Here you may change the name of the cookie used to identify a session - | instance by ID. The name specified here will get used every time a - | new session cookie is created by the framework for every driver. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Cookie Name + |-------------------------------------------------------------------------- + | + | Here you may change the name of the cookie used to identify a session + | instance by ID. The name specified here will get used every time a + | new session cookie is created by the framework for every driver. + | + */ - 'cookie' => 'laravel_session', + 'cookie' => 'laravel_session', - /* - |-------------------------------------------------------------------------- - | Session Cookie Path - |-------------------------------------------------------------------------- - | - | The session cookie path determines the path for which the cookie will - | be regarded as available. Typically, this will be the root path of - | your application but you are free to change this when necessary. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Cookie Path + |-------------------------------------------------------------------------- + | + | The session cookie path determines the path for which the cookie will + | be regarded as available. Typically, this will be the root path of + | your application but you are free to change this when necessary. + | + */ - 'path' => '/', + 'path' => '/', - /* - |-------------------------------------------------------------------------- - | Session Cookie Domain - |-------------------------------------------------------------------------- - | - | Here you may change the domain of the cookie used to identify a session - | in your application. This will determine which domains the cookie is - | available to in your application. A sensible default has been set. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Cookie Domain + |-------------------------------------------------------------------------- + | + | Here you may change the domain of the cookie used to identify a session + | in your application. This will determine which domains the cookie is + | available to in your application. A sensible default has been set. + | + */ - 'domain' => null, + 'domain' => null, - /* - |-------------------------------------------------------------------------- - | HTTPS Only Cookies - |-------------------------------------------------------------------------- - | - | By setting this option to true, session cookies will only be sent back - | to the server if the browser has a HTTPS connection. This will keep - | the cookie from being sent to you if it can not be done securely. - | - */ + /* + |-------------------------------------------------------------------------- + | HTTPS Only Cookies + |-------------------------------------------------------------------------- + | + | By setting this option to true, session cookies will only be sent back + | to the server if the browser has a HTTPS connection. This will keep + | the cookie from being sent to you if it can not be done securely. + | + */ - 'secure' => false, + 'secure' => false, ]; diff --git a/config/view.php b/config/view.php index 6e1a698a10..3ea032617f 100644 --- a/config/view.php +++ b/config/view.php @@ -2,32 +2,32 @@ return [ - /* - |-------------------------------------------------------------------------- - | View Storage Paths - |-------------------------------------------------------------------------- - | - | Most templating systems load templates from disk. Here you may specify - | an array of paths that should be checked for your views. Of course - | the usual Laravel view path has already been registered for you. - | - */ + /* + |-------------------------------------------------------------------------- + | View Storage Paths + |-------------------------------------------------------------------------- + | + | Most templating systems load templates from disk. Here you may specify + | an array of paths that should be checked for your views. Of course + | the usual Laravel view path has already been registered for you. + | + */ - 'paths' => [ - realpath(base_path('resources/twig')) - ], + 'paths' => [ + realpath(base_path('resources/twig')) + ], - /* - |-------------------------------------------------------------------------- - | Compiled View Path - |-------------------------------------------------------------------------- - | - | This option determines where all the compiled Blade templates will be - | stored for your application. Typically, this is within the storage - | directory. However, as usual, you are free to change this value. - | - */ + /* + |-------------------------------------------------------------------------- + | Compiled View Path + |-------------------------------------------------------------------------- + | + | This option determines where all the compiled Blade templates will be + | stored for your application. Typically, this is within the storage + | directory. However, as usual, you are free to change this value. + | + */ - 'compiled' => realpath(storage_path().'/framework/views'), + 'compiled' => realpath(storage_path() . '/framework/views'), ]; diff --git a/database/migrations/2015_05_28_041652_entrust_setup_tables.php b/database/migrations/2015_05_28_041652_entrust_setup_tables.php index ecc3235b11..270f46a768 100644 --- a/database/migrations/2015_05_28_041652_entrust_setup_tables.php +++ b/database/migrations/2015_05_28_041652_entrust_setup_tables.php @@ -7,58 +7,6 @@ use Illuminate\Database\Schema\Blueprint; */ class EntrustSetupTables extends Migration { - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - // Create table for storing roles - Schema::create('roles', function (Blueprint $table) { - $table->increments('id'); - $table->string('name')->unique(); - $table->string('display_name')->nullable(); - $table->string('description')->nullable(); - $table->timestamps(); - }); - - // Create table for associating roles to users (Many-to-Many) - Schema::create('role_user', function (Blueprint $table) { - $table->integer('user_id')->unsigned(); - $table->integer('role_id')->unsigned(); - - $table->foreign('user_id')->references('id')->on('users') - ->onUpdate('cascade')->onDelete('cascade'); - $table->foreign('role_id')->references('id')->on('roles') - ->onUpdate('cascade')->onDelete('cascade'); - - $table->primary(['user_id', 'role_id']); - }); - - // Create table for storing permissions - Schema::create('permissions', function (Blueprint $table) { - $table->increments('id'); - $table->string('name')->unique(); - $table->string('display_name')->nullable(); - $table->string('description')->nullable(); - $table->timestamps(); - }); - - // Create table for associating permissions to roles (Many-to-Many) - Schema::create('permission_role', function (Blueprint $table) { - $table->integer('permission_id')->unsigned(); - $table->integer('role_id')->unsigned(); - - $table->foreign('permission_id')->references('id')->on('permissions') - ->onUpdate('cascade')->onDelete('cascade'); - $table->foreign('role_id')->references('id')->on('roles') - ->onUpdate('cascade')->onDelete('cascade'); - - $table->primary(['permission_id', 'role_id']); - }); - } - /** * Reverse the migrations. * @@ -71,4 +19,64 @@ class EntrustSetupTables extends Migration Schema::drop('role_user'); Schema::drop('roles'); } + + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // Create table for storing roles + Schema::create( + 'roles', function (Blueprint $table) { + $table->increments('id'); + $table->string('name')->unique(); + $table->string('display_name')->nullable(); + $table->string('description')->nullable(); + $table->timestamps(); + } + ); + + // Create table for associating roles to users (Many-to-Many) + Schema::create( + 'role_user', function (Blueprint $table) { + $table->integer('user_id')->unsigned(); + $table->integer('role_id')->unsigned(); + + $table->foreign('user_id')->references('id')->on('users') + ->onUpdate('cascade')->onDelete('cascade'); + $table->foreign('role_id')->references('id')->on('roles') + ->onUpdate('cascade')->onDelete('cascade'); + + $table->primary(['user_id', 'role_id']); + } + ); + + // Create table for storing permissions + Schema::create( + 'permissions', function (Blueprint $table) { + $table->increments('id'); + $table->string('name')->unique(); + $table->string('display_name')->nullable(); + $table->string('description')->nullable(); + $table->timestamps(); + } + ); + + // Create table for associating permissions to roles (Many-to-Many) + Schema::create( + 'permission_role', function (Blueprint $table) { + $table->integer('permission_id')->unsigned(); + $table->integer('role_id')->unsigned(); + + $table->foreign('permission_id')->references('id')->on('permissions') + ->onUpdate('cascade')->onDelete('cascade'); + $table->foreign('role_id')->references('id')->on('roles') + ->onUpdate('cascade')->onDelete('cascade'); + + $table->primary(['permission_id', 'role_id']); + } + ); + } } diff --git a/database/migrations/2015_06_23_050233_changes_for_v3451.php b/database/migrations/2015_06_23_050233_changes_for_v3451.php index 0f925b7766..7c2ee2ccaa 100644 --- a/database/migrations/2015_06_23_050233_changes_for_v3451.php +++ b/database/migrations/2015_06_23_050233_changes_for_v3451.php @@ -1,7 +1,6 @@ name = 'owner'; $owner->display_name = 'Site Owner'; $owner->description = 'User runs this instance of FF3'; // optional diff --git a/resources/twig/accounts/index.twig b/resources/twig/accounts/index.twig index 688c6b2060..8b6d64bbed 100644 --- a/resources/twig/accounts/index.twig +++ b/resources/twig/accounts/index.twig @@ -1,58 +1,59 @@ {% extends "./layout/default.twig" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }} {% endblock %} {% block content %} -
-
-

- {{ ('accountExtraHelp_'~what)|_ }} -

+
+
+

+ {{ ('accountExtraHelp_'~what)|_ }} +

+
-
-
-
-
-
-

{{ subTitle}}

+
+
+
+
+

{{ subTitle }}

- -
- -
- - + +
+ +
+ + +
+ + +
+
+ {% include 'list/accounts.twig' %}
- - -
-
- {% include 'list/accounts.twig' %}
-
{% endblock %} {% block styles %} - + {% endblock %} {% block scripts %} - + - - - - - - + + + + + + {% endblock %} diff --git a/resources/twig/bills/index.twig b/resources/twig/bills/index.twig index c3601d90f1..e8be77cc31 100644 --- a/resources/twig/bills/index.twig +++ b/resources/twig/bills/index.twig @@ -23,7 +23,7 @@
- {% include 'list/bills.twig' %} + {% include 'list/bills.twig' %}
diff --git a/resources/twig/budgets/income.twig b/resources/twig/budgets/income.twig index 632d63b742..501dc93acc 100644 --- a/resources/twig/budgets/income.twig +++ b/resources/twig/budgets/income.twig @@ -1,16 +1,18 @@
- - + +
-
+
- + +
{{ getCurrencySymbol()|raw }}
- +
diff --git a/resources/twig/budgets/noBudget.twig b/resources/twig/budgets/noBudget.twig index 733f52eae4..aa608cebc2 100644 --- a/resources/twig/budgets/noBudget.twig +++ b/resources/twig/budgets/noBudget.twig @@ -5,17 +5,17 @@ {% endblock %} {% block content %} -
-
-
-
-

{{ subTitle }}

-
-
- {% include 'list/journals.twig' with {'journals': list} %} +
+
+
+
+

{{ subTitle }}

+
+
+ {% include 'list/journals.twig' with {'journals': list} %} +
-
{% endblock %} diff --git a/resources/twig/budgets/show.twig b/resources/twig/budgets/show.twig index 2746d10ffc..5dbddf3a04 100644 --- a/resources/twig/budgets/show.twig +++ b/resources/twig/budgets/show.twig @@ -5,107 +5,111 @@ {% endblock %} {% block content %} -
-
-
-
-

{{ 'overview'|_ }}

+
+
+
+
+

{{ 'overview'|_ }}

- -
-
- - -
-
-
-
-
-
-
- -
-
-

{{ 'transactions'|_ }}

-
- {% include 'list/journals.twig' %} -
-
-
- {% if limits|length == 1 %} -

{{ 'showEverything'|_ }}

- {% endif %} - - {% for limit in limits %} - {% for rep in limit.limitRepetitions %} -
-
-

{{rep.startdate.formatLocalized(monthFormat)}}

-
-
-
-
- {{ 'amount'|_ }}: {{ rep.amount|formatAmount }} -
-
- {{ 'spent'|_ }}: {{ spentInRepetitionCorrected(rep)|formatAmount }} -
-
-
-
- {% set overspent = spentInRepetitionCorrected(rep) > rep.amount %} - {% if overspent %} - {% set spent = spentInRepetitionCorrected(rep) %} - {% set pct = (spent != 0 ? (rep.amount / spent)*100 : 0) %} -
-
-
-
- {% else %} - {% set amount = rep.amount %} - {% set pct = (amount != 0 ? (spentInRepetitionCorrected(rep) / amount)*100 : 0) %} -
-
-
- {% endif %} -
+ +
+
+ +
+
+
+
+
+ +
+
+

{{ 'transactions'|_ }}

+
+ {% include 'list/journals.twig' %} +
+
+
+ {% if limits|length == 1 %} +

{{ 'showEverything'|_ }}

+ {% endif %} + + {% for limit in limits %} + {% for rep in limit.limitRepetitions %} +
+
+

{{ rep.startdate.formatLocalized(monthFormat) }} +

+
+
+
+
+ {{ 'amount'|_ }}: {{ rep.amount|formatAmount }} +
+
+ {{ 'spent'|_ }}: {{ spentInRepetitionCorrected(rep)|formatAmount }} +
+
+
+
+ {% set overspent = spentInRepetitionCorrected(rep) > rep.amount %} + {% if overspent %} + {% set spent = spentInRepetitionCorrected(rep) %} + {% set pct = (spent != 0 ? (rep.amount / spent)*100 : 0) %} +
+
+
+
+ {% else %} + {% set amount = rep.amount %} + {% set pct = (amount != 0 ? (spentInRepetitionCorrected(rep) / amount)*100 : 0) %} +
+
+
+ {% endif %} +
+
+
+
+ {% endfor %} {% endfor %} - {% endfor %} - {% if limits|length == 1 %} -

{{ 'showEverything'|_ }}

- {% endif %} + {% if limits|length == 1 %} +

{{ 'showEverything'|_ }}

+ {% endif %} +
-
{% endblock %} {% block scripts %} - + - - - - - + + + + + {% endblock %} diff --git a/resources/twig/categories/create.twig b/resources/twig/categories/create.twig index aa9b3967f5..c12f377cd5 100644 --- a/resources/twig/categories/create.twig +++ b/resources/twig/categories/create.twig @@ -29,14 +29,14 @@
{{ ExpandedForm.optionsList('create','category') }}
-
- +
+ +
-
{{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/categories/delete.twig b/resources/twig/categories/delete.twig index d1124631ad..de9fc3b65a 100644 --- a/resources/twig/categories/delete.twig +++ b/resources/twig/categories/delete.twig @@ -16,9 +16,11 @@

{{ trans('form.permDeleteWarning') }}

+

{{ trans('form.category_areYouSure', {'name': category.name}) }}

+

{% if category.transactionjournals|length > 0 %} {{ Lang.choice('form.category_keep_transactions', category.transactionjournals|length, {count: category.transactionjournals|length}) }} diff --git a/resources/twig/categories/index.twig b/resources/twig/categories/index.twig index 2ea6311f83..430075db65 100644 --- a/resources/twig/categories/index.twig +++ b/resources/twig/categories/index.twig @@ -5,39 +5,39 @@ {% endblock %} {% block content %} -

-
-
-
-

{{ 'categories'|_ }}

+
+
+
+
+

{{ 'categories'|_ }}

- -
- -
- - + +
+ +
+ + +
-
-
-
- {% include 'list/categories.twig' %} +
+
+ {% include 'list/categories.twig' %} +
-
{% endblock %} {% block styles %} - + {% endblock %} {% block scripts %} - - - - - + + + + + {% endblock %} diff --git a/resources/twig/categories/noCategory.twig b/resources/twig/categories/noCategory.twig index 498a339b79..4a47621664 100644 --- a/resources/twig/categories/noCategory.twig +++ b/resources/twig/categories/noCategory.twig @@ -5,18 +5,18 @@ {% endblock %} {% block content %} -
-
-
-
- {{ subTitle }} -
-
- {% include 'list/journals.twig' with {'journals': list} %} +
+
+
+
+ {{ subTitle }} +
+
+ {% include 'list/journals.twig' with {'journals': list} %} +
-
{% endblock %} diff --git a/resources/twig/categories/show.twig b/resources/twig/categories/show.twig index 15ae1ebacb..7ae7dff99a 100644 --- a/resources/twig/categories/show.twig +++ b/resources/twig/categories/show.twig @@ -5,51 +5,51 @@ {% endblock %} {% block content %} -
-
-
-
-

{{ 'overview'|_ }} (month)

+
+
+
+
+

{{ 'overview'|_ }} (month)

+
+
+
+
-
-
+
+
+
+
+

{{ 'overview'|_ }} (all)

+
+
+
+
-
-
-
-

{{ 'overview'|_ }} (all)

-
-
-
-
-
-
-
-
-
+
+
-
-
-

{{ 'transactions'|_ }}

-
-
- {% include 'list/journals' %} +
+
+

{{ 'transactions'|_ }}

+
+
+ {% include 'list/journals' %} +
-
{% endblock %} {% block scripts %} - - - - - - + + + + + + {% endblock %} diff --git a/resources/twig/currency/delete.twig b/resources/twig/currency/delete.twig index 7097eb7573..69d1d7bacf 100644 --- a/resources/twig/currency/delete.twig +++ b/resources/twig/currency/delete.twig @@ -6,29 +6,30 @@ {% block content %} -{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('currency.destroy',currency.id)}) }} -
-
-
-
-

{{ trans('form.delete_currency', {'name': currency.name}) }}

-
-
-

- {{ trans('form.permDeleteWarning') }} -

-

- {{ trans('form.currency_areYouSure', {'name': currency.name}) }} -

-
-
- - {{ trans('form.cancel') }} + {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('currency.destroy',currency.id)}) }} +
+
+
+
+

{{ trans('form.delete_currency', {'name': currency.name}) }}

+
+
+

+ {{ trans('form.permDeleteWarning') }} +

+ +

+ {{ trans('form.currency_areYouSure', {'name': currency.name}) }} +

+
+
+ + {{ trans('form.cancel') }} +
-
-{{ Form.close|raw }} + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/emails/registered-html.twig b/resources/twig/emails/registered-html.twig index b075f81888..712dbcf45c 100644 --- a/resources/twig/emails/registered-html.twig +++ b/resources/twig/emails/registered-html.twig @@ -5,39 +5,39 @@ -

- Hey there, -

-

- Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay! +

+ Hey there, +

+ +

+ Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay! - -

+

-
    -
  • - If you have forgotten your password already, please reset it using - the password reset tool. -
    • -
  • - There is a help-icon in the top right corner of each page. If you need help, click it! -
    • -
  • - If you haven't already, please read the - first use guide and the - full description. -
    • +
      +
    • + If you have forgotten your password already, please reset it using + the password reset tool. +
      • +
    • + There is a help-icon in the top right corner of each page. If you need help, click it! +
      • +
    • + If you haven't already, please read the + first use guide and the + full description. +
      • -
    +
-

- Enjoy! -

+

+ Enjoy! +

- diff --git a/resources/twig/error.twig b/resources/twig/error.twig index edbee43c63..e0621f17d8 100644 --- a/resources/twig/error.twig +++ b/resources/twig/error.twig @@ -2,17 +2,17 @@ {% block content %} -
-
-

Firefly
- Error -

+
+
+

Firefly
+ Error +

+
-
-
-
- {{ message |default('General unknown errror') }} +
+
+ {{ message |default('General unknown errror') }} +
-
{% endblock %} diff --git a/resources/twig/errors/404.twig b/resources/twig/errors/404.twig index 41e88394a5..c80eb8402f 100644 --- a/resources/twig/errors/404.twig +++ b/resources/twig/errors/404.twig @@ -1,63 +1,244 @@ - - - + + - - -
-
-
Be right back.
-
-
+ .title { + font-size: 72px; + margin-bottom: 40px; + } + + + +
+
+
Be right back.
+
+
- - + + diff --git a/resources/twig/form/amount.twig b/resources/twig/form/amount.twig index 21cffad8c8..88eea41b08 100644 --- a/resources/twig/form/amount.twig +++ b/resources/twig/form/amount.twig @@ -1,5 +1,6 @@ -
+
+
@@ -8,16 +9,17 @@
- {{ Form.input('number', name, value, options) }} + {{ Form.input('number', name, value, options) }}
{% include 'form/feedback.twig' %}
- +
diff --git a/resources/twig/form/balance.twig b/resources/twig/form/balance.twig index f53f12428b..aef25ff15b 100644 --- a/resources/twig/form/balance.twig +++ b/resources/twig/form/balance.twig @@ -1,5 +1,6 @@ -
+
+
@@ -8,15 +9,16 @@
- {{ Form.input('number', name, value, options) }} + {{ Form.input('number', name, value, options) }}
{% include 'form/feedback.twig' %}
- +
diff --git a/resources/twig/form/checkbox.twig b/resources/twig/form/checkbox.twig index 448986aa03..bea165b856 100644 --- a/resources/twig/form/checkbox.twig +++ b/resources/twig/form/checkbox.twig @@ -1,5 +1,6 @@ -
+
+