Various code cleanup [skip ci]

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

View File

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

View File

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

View File

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

View File

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

View File

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

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->increments('id');
$table->integer('tag_id')->unsigned(); $table->integer('tag_id')->unsigned();
$table->integer('transaction_journal_id')->unsigned(); $table->integer('transaction_journal_id')->unsigned();
@ -69,7 +70,8 @@ class ChangesForV3310 extends Migration
// add unique. // add unique.
$table->unique(['tag_id', 'transaction_journal_id'], 'tag_t_joined'); $table->unique(['tag_id', 'transaction_journal_id'], 'tag_t_joined');
}); }
);
} }
} }

View File

@ -1,12 +1,22 @@
<?php <?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
/** /**
* Class ChangesForV3310b * Class ChangesForV3310b
*/ */
class ChangesForV3310b extends Migration { class ChangesForV3310b extends Migration
{
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
/** /**
* Run the migrations. * Run the migrations.
@ -19,14 +29,4 @@ class ChangesForV3310b extends Migration {
DB::table('transaction_groups')->update(['relation' => 'balance']); DB::table('transaction_groups')->update(['relation' => 'balance']);
} }
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
} }

View File

@ -66,8 +66,6 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
); );
} }
/** /**

View File

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

View File

@ -6,6 +6,7 @@ use FireflyIII\Models\Preference;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use League\FactoryMuffin\Facade as FactoryMuffin; use League\FactoryMuffin\Facade as FactoryMuffin;
/** /**
* Class PiggyBankControllerTest * Class PiggyBankControllerTest
*/ */

View File

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