From 35ff3f0cbf12fcb3398b370a34ec76024de01890 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 3 Mar 2016 10:24:59 +0100 Subject: [PATCH] Some code cleanup. --- config/auth.php | 5 - config/filesystems.php | 9 +- config/firefly.php | 2 +- config/twigbridge.php | 1 - .../2014_12_13_190730_changes_for_v321.php | 10 -- database/seeds/TestDataSeeder.php | 1 - resources/lang/en_US/validation.php | 106 +++++++++--------- 7 files changed, 55 insertions(+), 79 deletions(-) diff --git a/config/auth.php b/config/auth.php index e0ad255263..6144aafde0 100644 --- a/config/auth.php +++ b/config/auth.php @@ -24,11 +24,6 @@ return [ 'driver' => 'eloquent', 'model' => FireflyIII\User::class, ], - - // 'users' => [ - // 'driver' => 'database', - // 'table' => 'users', - // ], ], 'passwords' => [ diff --git a/config/filesystems.php b/config/filesystems.php index 20f5c4d2e3..70e2a2c488 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -52,7 +52,7 @@ return [ 'driver' => 'local', 'root' => storage_path('upload'), ], - 'export' => [ + 'export' => [ 'driver' => 'local', 'root' => storage_path('export'), ], @@ -62,13 +62,6 @@ return [ 'host' => 'ftp.example.com', 'username' => 'your-username', 'password' => 'your-password', - - // Optional FTP Settings... - // 'port' => 21, - // 'root' => '', - // 'passive' => true, - // 'ssl' => true, - // 'timeout' => 30, ], 's3' => [ diff --git a/config/firefly.php b/config/firefly.php index 2e27618889..6cc857a5cd 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -11,7 +11,7 @@ return [ 'export_formats' => [ 'csv' => 'FireflyIII\Export\Exporter\CsvExporter', - //'mt940' => 'FireflyIII\Export\Exporter\MtExporter', + // mt940 FireflyIII Export Exporter MtExporter ], 'default_export_format' => 'csv', diff --git a/config/twigbridge.php b/config/twigbridge.php index c4e6d2c4ba..4eea607b35 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -28,7 +28,6 @@ return [ 'debug' => config('app.debug', false), // The charset used by the templates. - // default: utf-8 'charset' => 'utf-8', // The base template class to use for generated templates. diff --git a/database/migrations/2014_12_13_190730_changes_for_v321.php b/database/migrations/2014_12_13_190730_changes_for_v321.php index d4784673b2..1cf0916e11 100644 --- a/database/migrations/2014_12_13_190730_changes_for_v321.php +++ b/database/migrations/2014_12_13_190730_changes_for_v321.php @@ -359,7 +359,6 @@ class ChangesForV321 extends Migration ]; $budget = Budget::firstOrCreate($entry); - Log::debug('Migrated budget #' . $budget->id . ': ' . $budget->name); // create entry in budget_transaction_journal $connections = DB::table('component_transaction_journal')->where('component_id', $c->id)->get(); /** @var \stdClass $connection */ @@ -400,7 +399,6 @@ class ChangesForV321 extends Migration ]; $category = Category::firstOrCreate($entry); - Log::debug('Migrated category #' . $category->id . ': ' . $category->name); // create entry in category_transaction_journal $connections = DB::table('component_transaction_journal')->where('component_id', $c->id)->get(); /** @var \stdClass $connection */ @@ -435,21 +433,13 @@ class ChangesForV321 extends Migration { BudgetLimit::get()->each( function (BudgetLimit $bl) { - Log::debug('Now at budgetLimit #' . $bl->id . ' with component_id: ' . $bl->component_id); $component = Component::find($bl->component_id); if ($component) { - Log::debug('Found component with id #' . $component->id . ' and name ' . $component->name); $budget = Budget::whereName($component->name)->whereUserId($component->user_id)->first(); if ($budget) { - Log::debug('Found a budget with ID #' . $budget->id . ' and name ' . $budget->name); $bl->budget_id = $budget->id; $bl->save(); - Log::debug('Connected budgetLimit #' . $bl->id . ' to budget_id' . $budget->id); - } else { - Log::debug('Could not find a matching budget with name ' . $component->name); } - } else { - Log::debug('Could not find a component with id ' . $bl->component_id); } } ); diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php index 0983894137..ffa2dd627f 100644 --- a/database/seeds/TestDataSeeder.php +++ b/database/seeds/TestDataSeeder.php @@ -88,7 +88,6 @@ class TestDataSeeder extends Seeder TestData::createBudgetLimit($user, $current, 'Bills', '1000'); TestData::createBudgetLimit($user, $current, 'Car', '100'); - Log::info('Created test data for ' . $month); $current->addMonth(); } } diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php index 799a1802e5..5be1b8d145 100644 --- a/resources/lang/en_US/validation.php +++ b/resources/lang/en_US/validation.php @@ -10,62 +10,62 @@ return [ 'file_attached' => 'Succesfully uploaded file ":name".', 'file_invalid_mime' => 'File ":name" is of type ":mime" which is not accepted as a new upload.', 'file_too_large' => 'File ":name" is too large.', - "accepted" => "The :attribute must be accepted.", - "active_url" => "The :attribute is not a valid URL.", - "after" => "The :attribute must be a date after :date.", - "alpha" => "The :attribute may only contain letters.", - "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", - "alpha_num" => "The :attribute may only contain letters and numbers.", - "array" => "The :attribute must be an array.", - "unique_for_user" => "There already is an entry with this :attribute.", - "before" => "The :attribute must be a date before :date.", + 'accepted' => 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'unique_for_user' => 'There already is an entry with this :attribute.', + 'before' => 'The :attribute must be a date before :date.', 'unique_object_for_user' => 'This name is already in use', 'unique_account_for_user' => 'This account name is already in use', - "between.numeric" => "The :attribute must be between :min and :max.", - "between.file" => "The :attribute must be between :min and :max kilobytes.", - "between.string" => "The :attribute must be between :min and :max characters.", - "between.array" => "The :attribute must have between :min and :max items.", - "boolean" => "The :attribute field must be true or false.", - "confirmed" => "The :attribute confirmation does not match.", - "date" => "The :attribute is not a valid date.", - "date_format" => "The :attribute does not match the format :format.", - "different" => "The :attribute and :other must be different.", - "digits" => "The :attribute must be :digits digits.", - "digits_between" => "The :attribute must be between :min and :max digits.", - "email" => "The :attribute must be a valid email address.", - "filled" => "The :attribute field is required.", - "exists" => "The selected :attribute is invalid.", - "image" => "The :attribute must be an image.", - "in" => "The selected :attribute is invalid.", - "integer" => "The :attribute must be an integer.", - "ip" => "The :attribute must be a valid IP address.", + 'between.numeric' => 'The :attribute must be between :min and :max.', + 'between.file' => 'The :attribute must be between :min and :max kilobytes.', + 'between.string' => 'The :attribute must be between :min and :max characters.', + 'between.array' => 'The :attribute must have between :min and :max items.', + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'email' => 'The :attribute must be a valid email address.', + 'filled' => 'The :attribute field is required.', + 'exists' => 'The selected :attribute is invalid.', + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', 'json' => 'The :attribute must be a valid JSON string.', - "max.numeric" => "The :attribute may not be greater than :max.", - "max.file" => "The :attribute may not be greater than :max kilobytes.", - "max.string" => "The :attribute may not be greater than :max characters.", - "max.array" => "The :attribute may not have more than :max items.", - "mimes" => "The :attribute must be a file of type: :values.", - "min.numeric" => "The :attribute must be at least :min.", - "min.file" => "The :attribute must be at least :min kilobytes.", - "min.string" => "The :attribute must be at least :min characters.", - "min.array" => "The :attribute must have at least :min items.", - "not_in" => "The selected :attribute is invalid.", - "numeric" => "The :attribute must be a number.", - "regex" => "The :attribute format is invalid.", - "required" => "The :attribute field is required.", - "required_if" => "The :attribute field is required when :other is :value.", + 'max.numeric' => 'The :attribute may not be greater than :max.', + 'max.file' => 'The :attribute may not be greater than :max kilobytes.', + 'max.string' => 'The :attribute may not be greater than :max characters.', + 'max.array' => 'The :attribute may not have more than :max items.', + 'mimes' => 'The :attribute must be a file of type: :values.', + 'min.numeric' => 'The :attribute must be at least :min.', + 'min.file' => 'The :attribute must be at least :min kilobytes.', + 'min.string' => 'The :attribute must be at least :min characters.', + 'min.array' => 'The :attribute must have at least :min items.', + 'not_in' => 'The selected :attribute is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', - "required_with" => "The :attribute field is required when :values is present.", - "required_with_all" => "The :attribute field is required when :values is present.", - "required_without" => "The :attribute field is required when :values is not present.", - "required_without_all" => "The :attribute field is required when none of :values are present.", - "same" => "The :attribute and :other must match.", - "size.numeric" => "The :attribute must be :size.", - "size.file" => "The :attribute must be :size kilobytes.", - "size.string" => "The :attribute must be :size characters.", - "size.array" => "The :attribute must contain :size items.", - "unique" => "The :attribute has already been taken.", + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', + 'required_without' => 'The :attribute field is required when :values is not present.', + 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'same' => 'The :attribute and :other must match.', + 'size.numeric' => 'The :attribute must be :size.', + 'size.file' => 'The :attribute must be :size kilobytes.', + 'size.string' => 'The :attribute must be :size characters.', + 'size.array' => 'The :attribute must contain :size items.', + 'unique' => 'The :attribute has already been taken.', 'string' => 'The :attribute must be a string.', - "url" => "The :attribute format is invalid.", - "timezone" => "The :attribute must be a valid zone.", + 'url' => 'The :attribute format is invalid.', + 'timezone' => 'The :attribute must be a valid zone.', ];