IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-10 23:45:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole 2015-05-05 07:51:02 +02:00
parent e1941daedd
commit 67fdd27499
17 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/TransactionController.php
View File

@ -17,7 +17,6 @@ use Response;
use Session;
use URL;
use View;
use Log;
/**
* Class TransactionController
@ -291,7 +290,6 @@ class TransactionController extends Controller
}
/**
* @param JournalFormRequest $request
* @param JournalRepositoryInterface $repository

2
app/Http/routes.php
View File

@ -177,7 +177,7 @@ Route::get('/register', ['uses' => 'Auth\AuthController@getRegister', 'as' => 'r
Route::controllers(
[
'auth' => 'Auth\AuthController',
'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
]
);

1
app/Repositories/Reminder/ReminderRepositoryInterface.php
View File

@ -1,6 +1,7 @@
<?php
namespace FireflyIII\Repositories\Reminder;
use Illuminate\Support\Collection;

2
app/Support/Amount.php
View File

@ -155,7 +155,7 @@ class Amount
$currencyPreference = Prefs::get('currencyPreference', 'EUR');
$currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
$currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
if ($currency) {
Cache::forever('FFCURRENCYCODE', $currency->code);

2
app/Validation/FireflyValidator.php
View File

@ -203,7 +203,7 @@ class FireflyValidator extends Validator
$alwaysEncrypted = true;
}
if(is_null(Auth::user())) {
if (is_null(Auth::user())) {
// user is not logged in.. weird.
return true;
} else {

1
database/migrations/2014_12_13_190730_changes_for_v321.php
View File

@ -7,6 +7,7 @@ use FireflyIII\Models\Component;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
/**
* @SuppressWarnings(PHPMD.ShortMethodName) // method names are mandated by laravel.
* @SuppressWarnings("TooManyMethods") // I'm fine with this

2
database/migrations/2015_03_29_174140_changes_for_v336.php
View File

@ -134,7 +134,7 @@ class ChangesForV336 extends Migration
// reinstate a long forgotten index:
Schema::table(
'budget_limits', function (Blueprint $table) {
$table->unique(['budget_id', 'startdate'],'unique_limit');
$table->unique(['budget_id', 'startdate'], 'unique_limit');
}
);

6
database/migrations/2015_04_26_054507_changes_for_v3310.php
View File

@ -57,7 +57,8 @@ class ChangesForV3310 extends Migration
);
Schema::create('tag_transaction_journal',function (Blueprint $table) {
Schema::create(
'tag_transaction_journal', function (Blueprint $table) {
$table->increments('id');
$table->integer('tag_id')->unsigned();
$table->integer('transaction_journal_id')->unsigned();
@ -69,7 +70,8 @@ class ChangesForV3310 extends Migration
// add unique.
$table->unique(['tag_id', 'transaction_journal_id'], 'tag_t_joined');
});
}
);
}
}

40
database/migrations/2015_04_28_075317_changes_for_v3310b.php
View File

@ -1,32 +1,32 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
/**
* Class ChangesForV3310b
*/
class ChangesForV3310b extends Migration {
class ChangesForV3310b extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
// set all current entries to be "balance"
DB::table('transaction_groups')->update(['relation' => 'balance']);
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}
}

4
tests/TestCase.php
View File

@ -46,7 +46,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
// create EUR currency
/** @var TransactionCurrency $currency */
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$currency->code = 'EUR';
$currency->save();
Log::debug('Created new EUR currency.');
@ -66,8 +66,6 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
);
}
/**

1
tests/controllers/BillControllerTest.php
View File

@ -191,7 +191,6 @@ class BillControllerTest extends TestCase
Amount::shouldReceive('getCurrencyCode')->andReturn('XX');
$this->call('GET', '/bills/show/' . $bill->id);
}

2
tests/controllers/HelpControllerTest.php
View File

@ -84,7 +84,7 @@ class HelpControllerTest extends TestCase
public function testGetHelpTextNoRoute()
{
// login
$user = FactoryMuffin::create('FireflyIII\User');
$user = FactoryMuffin::create('FireflyIII\User');
$this->be($user);
// mock some stuff.

2
tests/controllers/JsonControllerTest.php
View File

@ -210,7 +210,7 @@ class JsonControllerTest extends TestCase
public function testTransactionJournals()
{
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$type = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$type = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$collection = new Collection([$journal]);
$user = FactoryMuffin::create('FireflyIII\User');
$this->be($user);

3
tests/controllers/PiggyBankControllerTest.php
View File

@ -6,6 +6,7 @@ use FireflyIII\Models\Preference;
use FireflyIII\Models\TransactionCurrency;
use Illuminate\Support\Collection;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Class PiggyBankControllerTest
*/
@ -110,7 +111,7 @@ class PiggyBankControllerTest extends TestCase
public function testEdit()
{
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->targetdate = Carbon::now()->addYear();
$piggyBank->save();
$this->be($piggyBank->account->user);

2
tests/controllers/PreferencesControllerTest.php
View File

@ -65,7 +65,7 @@ class PreferencesControllerTest extends TestCase
public function testPostIndex()
{
$user = FactoryMuffin::create('FireflyIII\User');
$user = FactoryMuffin::create('FireflyIII\User');
$this->be($user);
$data = [

6
tests/controllers/ReminderControllerTest.php
View File

@ -59,7 +59,7 @@ class ReminderControllerTest extends TestCase
public function testIndex()
{
$user = FactoryMuffin::create('FireflyIII\User');
$user = FactoryMuffin::create('FireflyIII\User');
$this->be($user);
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$collection = new Collection([$reminder]);
@ -77,7 +77,7 @@ class ReminderControllerTest extends TestCase
public function testShow()
{
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->notnow = false;
$reminder->save();
$this->be($reminder->remindersable->account->user);
@ -88,7 +88,7 @@ class ReminderControllerTest extends TestCase
public function testShowDismissed()
{
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->notnow = true;
$reminder->save();
$this->be($reminder->remindersable->account->user);

7
tests/controllers/SearchControllerTest.php
View File

@ -1,7 +1,5 @@
<?php
use Carbon\Carbon;
use Illuminate\Support\Collection;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
@ -38,7 +36,8 @@ class SearchControllerTest extends TestCase
parent::tearDown();
}
public function testSearch() {
public function testSearch()
{
$user = FactoryMuffin::create('FireflyIII\User');
$this->be($user);
$words = ['Something'];
@ -50,7 +49,7 @@ class SearchControllerTest extends TestCase
$repository->shouldReceive('searchBudgets')->with($words)->once()->andReturn([]);
$repository->shouldReceive('searchTags')->with($words)->once()->andReturn([]);
$this->call('GET','/search?q=Something');
$this->call('GET', '/search?q=Something');
$this->assertResponseOk();
}
}