kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Small bug fixes.

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-03-14 20:50:19 +01:00
parent 631bafc6ab
commit 79d7f577e4
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Jobs/MailError.php
View File

@@ -26,7 +26,7 @@ class MailError extends Job implements ShouldQueue
/** @var array */ /** @var array */
protected $exception; protected $exception;
/** @var string */ /** @var string */
protected $ip; protected $ipAddress;
/** @var User */ /** @var User */
protected $user; protected $user;
@@ -35,16 +35,16 @@ class MailError extends Job implements ShouldQueue
* *
* @param User $user * @param User $user
* @param string $destination * @param string $destination
* @param string $ip * @param string $ipAddress
* @param array $exceptionData * @param array $exceptionData
* *
* @internal param array $exception * @internal param array $exception
*/ */
public function __construct(User $user, string $destination, string $ip, array $exceptionData) public function __construct(User $user, string $destination, string $ipAddress, array $exceptionData)
{ {
$this->user = $user; $this->user = $user;
$this->destination = $destination; $this->destination = $destination;
$this->ip = $ip; $this->ipAddress = $ipAddress;
$this->exception = $exceptionData; $this->exception = $exceptionData;
Log::debug('In mail job constructor'); Log::debug('In mail job constructor');
@@ -65,7 +65,7 @@ class MailError extends Job implements ShouldQueue
$args = $this->exception; $args = $this->exception;
$args['loggedIn'] = !is_null($this->user->id); $args['loggedIn'] = !is_null($this->user->id);
$args['user'] = $this->user; $args['user'] = $this->user;
$args['ip'] = $this->ip; $args['ip'] = $this->ipAddress;
Mail::send( Mail::send(
['emails.error-html', 'emails.error'], $args, ['emails.error-html', 'emails.error'], $args,

2
database/migrations/2014_12_13_190730_changes_for_v321.php
View File

@@ -81,7 +81,7 @@ class ChangesForV321 extends Migration
$this->renameBudgetLimits(); // 14. $this->renameBudgetLimits(); // 14.
$this->renamePiggyBankEvents(); // 15. $this->renamePiggyBankEvents(); // 15.
$this->renameBudgetLimitToBudgetInRepetitions(); // 16. $this->renameBudgetLimitToBudgetInRepetitions(); // 16.
// 17, 18, 19 // 17 and then 18 and then 19
$this->dropFieldsFromCurrencyTable(); // 20. $this->dropFieldsFromCurrencyTable(); // 20.

1
database/migrations/2016_01_11_193428_changes_for_v370.php
View File

@@ -67,7 +67,6 @@ class ChangesForV370 extends Migration
); );
// new table "rules":
Schema::create( Schema::create(
'rules', function (Blueprint $table) { 'rules', function (Blueprint $table) {
$table->increments('id'); $table->increments('id');

8
tests/TestCase.php
View File

@@ -36,13 +36,13 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
// set period to match? // set period to match?
} }
// if selected "custom", change the session to a weird custom range: // custom is a weird range
// (20 days): // (20 days):
if ($range === "custom") { if ($range === 'custom') {
$this->session( $this->session(
[ [
'start' => Carbon::now(), 'start' => Carbon::now()->subDays(20),
'end' => Carbon::now()->subDays(20), 'end' => Carbon::now(),
] ]
); );
} }

1
tests/acceptance/Controllers/CsvControllerTest.php
View File

@@ -164,7 +164,6 @@ class CsvControllerTest extends TestCase
public function testProcess() public function testProcess()
{ {
$this->be($this->user()); $this->be($this->user());
//$this->session($this->getSessionData());
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-mapped', 'csv-delimiter']; $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-mapped', 'csv-delimiter'];
$wizard = $this->mock('FireflyIII\Helpers\Csv\WizardInterface'); $wizard = $this->mock('FireflyIII\Helpers\Csv\WizardInterface');